Changeset 54f8fd2b8b3a86cbd99df45220352d0fd95b41d1

Show
Ignore:
Timestamp:
02/06/08 15:41:57 (5 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1202308917 +0000
git-parent:

[ca2e14dc230e6b5b69adb65220eef4eab0d539e9]

git-author:
Pierre d'Herbemont <pdherbemont@videolan.org> 1202308917 +0000
Message:

macosx/framework: Use cmake because we can.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • projects/macosx/framework/Pre-Compile.sh

    rb3372f1 r54f8fd2  
    2222 
    2323if test "${ACTION}" = "build"; then     
    24     vlc_config="${VLC_SRC_DIR}/vlc-config" 
    2524    lib="lib" 
    2625    modules="modules" 
    …… 
    7574                name=`basename ${linked_lib}` 
    7675                case "${linked_lib}" in 
    77                     */vlc_install_dir/lib/* | */extras/contrib/lib/*) 
     76                    */vlc_build_dir/lib/*  | *vlc* | */extras/contrib/lib/*) 
    7877                        if test -e ${linked_lib}; then 
    7978                            install_name_tool -change ${linked_lib} "${lib_install_prefix}/${name}" ${lib_dest} 
    …… 
    9392 
    9493    ########################## 
     94    # Hack for VLC-release.app 
     95    if [ "$FULL_PRODUCT_NAME" = "VLC-release.app" ] ; then 
     96        install_library "${VLC_BUILD_DIR}/${prefix}vlc" "${target}" "bin" "@loader_path/lib" 
     97        prefix=".libs/" 
     98    else 
     99        prefix="" 
     100    fi 
     101 
     102    ########################## 
    95103    # Build the modules folder (Same as VLCKit.framework/modules in Makefile) 
    96104    echo "Building modules folder..." 
    97105    # Figure out what modules are available to install 
    98     for module in `top_builddir="${VLC_BUILD_DIR}" ${vlc_config} --target plugin` ; do 
     106    for module in `find ${VLC_BUILD_DIR}/modules -name *.so` ; do 
    99107        # Check to see that the reported module actually exists 
    100108        if test -n ${module}; then 
    101             module_src="`dirname ${module}`/.libs/`basename ${module}`.dylib" 
    102             install_library ${module_src} ${target_modules} "module" 
     109            install_library ${module} ${target_modules} "module" 
    103110        fi 
    104111    done 
    …… 
    123130    ########################## 
    124131    # Build the library folder 
    125     echo "Building library folder..." 
     132    echo "Building library folder... ${linked_libs}" 
    126133    for linked_lib in ${linked_libs} ; do 
    127134        case "${linked_lib}" in 
    …… 
    139146    done 
    140147 
    141     install_library "${VLC_BUILD_DIR}/src/.libs/libvlc-control.dylib" ${target_lib} "library" 
    142     install_library "${VLC_BUILD_DIR}/src/.libs/libvlc.dylib" ${target_lib} "library" 
    143148 
    144     ########################## 
    145     # Hack for VLC-release.app 
    146     if [ "$FULL_PRODUCT_NAME" = "VLC-release.app" ] ; then 
    147         install_library "${VLC_BUILD_DIR}/.libs/vlc" "${target}" "bin" "@loader_path/lib" 
    148     fi 
     149    install_library "${VLC_BUILD_DIR}/src/${prefix}libvlc-control.dylib" ${target_lib} "library" 
     150    install_library "${VLC_BUILD_DIR}/src/${prefix}libvlc.dylib" ${target_lib} "library" 
    149151 
    150152    ########################## 
    …… 
    153155    pbxcp="/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp -exclude .DS_Store -exclude CVS -exclude .svn -resolve-src-symlinks" 
    154156    mkdir -p ${target_share} 
    155     $pbxcp ${VLC_BUILD_DIR}/share/luameta ${target_share} 
    156     $pbxcp ${VLC_BUILD_DIR}/share/luaplaylist ${target_share} 
     157    $pbxcp ${VLC_SRC_DIR}/share/luameta ${target_share} 
     158    $pbxcp ${VLC_SRC_DIR}/share/luaplaylist ${target_share} 
    157159fi 

  • projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj

    rdb56787 r54f8fd2  
    353353            ); 
    354354            buildToolPath = /usr/bin/make; 
    355             buildWorkingDirectory = ../../..; 
     355            buildWorkingDirectory = "$(SYMROOT)/vlc_build_dir"; 
    356356            dependencies = ( 
    357357            ); 
    …… 
    454454            inputPaths = ( 
    455455                $SRCROOT/../../../bootstrap, 
    456                 $SRCROOT/../../../configure.ac, 
     456                $SRCROOT/../../../CMakeLists.txt, 
    457457            ); 
    458458            outputPaths = ( 
    459                 $SRCROOT/../../../configure, 
    460459            ); 
    461460            runOnlyForDeploymentPostprocessing = 0; 
    462461            shellPath = /bin/sh; 
    463             shellScript = "if test $ACTION = \"clean\"\nthen\n    exit 0\nfi\ncd ../../.. && ./bootstrap && ./configure --enable-debug --disable-nls\n"; 
     462            shellScript = "if test $ACTION = \"clean\"\nthen\n    exit 0\nfi\ntop_srcdir=`pwd`/../../..\nmkdir -p $SYMROOT/vlc_build_dir\nrm -Rf $top_srcdir/CMakeCache.txt\ncd $SYMROOT/vlc_build_dir && cmake $top_srcdir"; 
    464463            showEnvVarsInLog = 0; 
    465464        }; 
    …… 
    566565                PRODUCT_NAME = VLCKit; 
    567566                SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; 
    568                 VLC_BUILD_DIR = "$(VLC_SRC_DIR)"; 
     567                VLC_BUILD_DIR = "$(SYMROOT)/vlc_build_dir"; 
    569568                VLC_FRAMEWORK = "$(TARGET_BUILD_DIR)/$(PROJECT_NAME).framework"; 
    570569                VLC_SRC_DIR = ../../..;