From 2dc5a46e996f9f8953951fea11a42fca83fce05d Mon Sep 17 00:00:00 2001 From: shaded enmity Date: Thu, 20 Mar 2014 16:25:07 -0700 Subject: [PATCH] Zombie Removal Signed-off-by: shaded enmity --- port/iOS/IPHONEOS_ARM6_TOOLCHAIN.cmake | 19 ----- port/iOS/IPHONEOS_ARM7_TOOLCHAIN.cmake | 19 ----- port/iOS/IPHONEOS_i386_TOOLCHAIN.cmake | 19 ----- port/iOS/README.txt | 13 ---- port/iOS/build_ios.sh | 104 ------------------------- 5 files changed, 174 deletions(-) delete mode 100644 port/iOS/IPHONEOS_ARM6_TOOLCHAIN.cmake delete mode 100644 port/iOS/IPHONEOS_ARM7_TOOLCHAIN.cmake delete mode 100644 port/iOS/IPHONEOS_i386_TOOLCHAIN.cmake delete mode 100644 port/iOS/README.txt delete mode 100755 port/iOS/build_ios.sh diff --git a/port/iOS/IPHONEOS_ARM6_TOOLCHAIN.cmake b/port/iOS/IPHONEOS_ARM6_TOOLCHAIN.cmake deleted file mode 100644 index 0d443b798..000000000 --- a/port/iOS/IPHONEOS_ARM6_TOOLCHAIN.cmake +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE(CMakeForceCompiler) - -SET (CMAKE_CROSSCOMPILING TRUE) -SET (CMAKE_SYSTEM_NAME "Darwin") -SET (CMAKE_SYSTEM_PROCESSOR "armv6") - -SET (SDKVER "5.0") -SET (DEVROOT "/Developer/Platforms/iPhoneOS.platform/Developer") -SET (SDKROOT "/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS${SDKVER}.sdk") -SET (CC "${DEVROOT}/usr/bin/llvm-gcc") -SET (CXX "${DEVROOT}/usr/bin/llvm-g++") - -CMAKE_FORCE_C_COMPILER (${CC} LLVM) -CMAKE_FORCE_CXX_COMPILER (${CXX} LLVM) - -SET (CMAKE_FIND_ROOT_PATH "${SDKROOT}" "${DEVROOT}") -SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) \ No newline at end of file diff --git a/port/iOS/IPHONEOS_ARM7_TOOLCHAIN.cmake b/port/iOS/IPHONEOS_ARM7_TOOLCHAIN.cmake deleted file mode 100644 index 211ee71d4..000000000 --- a/port/iOS/IPHONEOS_ARM7_TOOLCHAIN.cmake +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE(CMakeForceCompiler) - -SET (CMAKE_CROSSCOMPILING TRUE) -SET (CMAKE_SYSTEM_NAME "Darwin") -SET (CMAKE_SYSTEM_PROCESSOR "armv7") - -SET (SDKVER "5.0") -SET (DEVROOT "/Developer/Platforms/iPhoneOS.platform/Developer") -SET (SDKROOT "/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS${SDKVER}.sdk") -SET (CC "${DEVROOT}/usr/bin/llvm-gcc") -SET (CXX "${DEVROOT}/usr/bin/llvm-g++") - -CMAKE_FORCE_C_COMPILER (${CC} LLVM) -CMAKE_FORCE_CXX_COMPILER (${CXX} LLVM) - -SET (CMAKE_FIND_ROOT_PATH "${SDKROOT}" "${DEVROOT}") -SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) \ No newline at end of file diff --git a/port/iOS/IPHONEOS_i386_TOOLCHAIN.cmake b/port/iOS/IPHONEOS_i386_TOOLCHAIN.cmake deleted file mode 100644 index 375d64074..000000000 --- a/port/iOS/IPHONEOS_i386_TOOLCHAIN.cmake +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE(CMakeForceCompiler) - -SET (CMAKE_CROSSCOMPILING TRUE) -SET (CMAKE_SYSTEM_NAME "Darwin") -SET (CMAKE_SYSTEM_PROCESSOR "i386") - -SET (SDKVER "5.0") -SET (DEVROOT "/Developer/Platforms/iPhoneOS.platform/Developer") -SET (SDKROOT "/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS${SDKVER}.sdk") -SET (CC "${DEVROOT}/usr/bin/llvm-gcc") -SET (CXX "${DEVROOT}/usr/bin/llvm-g++") - -CMAKE_FORCE_C_COMPILER (${CC} LLVM) -CMAKE_FORCE_CXX_COMPILER (${CXX} LLVM) - -SET (CMAKE_FIND_ROOT_PATH "${SDKROOT}" "${DEVROOT}") -SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) \ No newline at end of file diff --git a/port/iOS/README.txt b/port/iOS/README.txt deleted file mode 100644 index ce13faa05..000000000 --- a/port/iOS/README.txt +++ /dev/null @@ -1,13 +0,0 @@ -To build for iOS simply execute "./build_ios.sh" from this folder. Currently this script requires the latest SDK (5.0) from Apple in order to build properly. In the future I will add support for specifying the SDK version on the command line. - -Once the build is completed you will see a "ios" folder under /lib. This folder has sub folders for each of the following architectures: - -* armv6 (Older Devices) -* armv7 (New Devices) -* i386 (Simulator) - -Each of these folders contains a single static library for that architecture. In addition the libassimp.a file in the root of this folder is a combined archive (fat binary) library for all of the above architectures. - -This port is being maintained by Matt Mathias please contact him with any questions or comments. - - diff --git a/port/iOS/build_ios.sh b/port/iOS/build_ios.sh deleted file mode 100755 index 9c8cc363a..000000000 --- a/port/iOS/build_ios.sh +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh -# build.sh - -####################### -# BUILD ASSIMP for iOS and iOS Simulator -####################### - -BUILD_DIR="./lib/ios" - -IOS_BASE_SDK="5.0" -IOS_DEPLOY_TGT="3.2" - -setenv_all() -{ - # Add internal libs - export CFLAGS="$CFLAGS" - export CPP="$DEVROOT/usr/bin/llvm-cpp-4.2" - export CXX="$DEVROOT/usr/bin/llvm-g++-4.2" - export CXXCPP="$DEVROOT/usr/bin/llvm-cpp-4.2" - export CC="$DEVROOT/usr/bin/llvm-gcc-4.2" - export LD=$DEVROOT/usr/bin/ld - export AR=$DEVROOT/usr/bin/ar - export AS=$DEVROOT/usr/bin/as - export NM=$DEVROOT/usr/bin/nm - export RANLIB=$DEVROOT/usr/bin/ranlib - export LDFLAGS="-L$SDKROOT/usr/lib/" - - export CPPFLAGS=$CFLAGS - export CXXFLAGS=$CFLAGS -} - -setenv_arm6() -{ - unset DEVROOT SDKROOT CFLAGS CC LD CPP CXX AR AS NM CXXCPP RANLIB LDFLAGS CPPFLAGS CXXFLAGS - export DEVROOT=/Developer/Platforms/iPhoneOS.platform/Developer - export SDKROOT=$DEVROOT/SDKs/iPhoneOS$IOS_BASE_SDK.sdk - export CFLAGS="-arch armv6 -pipe -no-cpp-precomp -isysroot $SDKROOT -miphoneos-version-min=$IOS_DEPLOY_TGT -I$SDKROOT/usr/include/" - setenv_all - rm CMakeCache.txt - cmake -G 'Unix Makefiles' -DCMAKE_TOOLCHAIN_FILE=./port/iOS/IPHONEOS_ARM6_TOOLCHAIN.cmake -DENABLE_BOOST_WORKAROUND=ON -DBUILD_STATIC_LIB=ON -} - -setenv_arm7() -{ - unset DEVROOT SDKROOT CFLAGS CC LD CPP CXX AR AS NM CXXCPP RANLIB LDFLAGS CPPFLAGS CXXFLAGS - export DEVROOT=/Developer/Platforms/iPhoneOS.platform/Developer - export SDKROOT=$DEVROOT/SDKs/iPhoneOS$IOS_BASE_SDK.sdk - export CFLAGS="-arch armv7 -pipe -no-cpp-precomp -isysroot $SDKROOT -miphoneos-version-min=$IOS_DEPLOY_TGT -I$SDKROOT/usr/include/" - setenv_all - rm CMakeCache.txt - cmake -G 'Unix Makefiles' -DCMAKE_TOOLCHAIN_FILE=./port/iOS/IPHONEOS_ARM7_TOOLCHAIN.cmake -DENABLE_BOOST_WORKAROUND=ON -DBUILD_STATIC_LIB=ON -} - -setenv_i386() -{ - unset DEVROOT SDKROOT CFLAGS CC LD CPP CXX AR AS NM CXXCPP RANLIB LDFLAGS CPPFLAGS CXXFLAGS - export DEVROOT=/Developer/Platforms/iPhoneSimulator.platform/Developer - export SDKROOT=$DEVROOT/SDKs/iPhoneSimulator$IOS_BASE_SDK.sdk - export CFLAGS="-arch i386 -pipe -no-cpp-precomp -isysroot $SDKROOT -miphoneos-version-min=$IOS_DEPLOY_TGT" - setenv_all - rm CMakeCache.txt - cmake -G 'Unix Makefiles' -DCMAKE_TOOLCHAIN_FILE=./port/iOS/IPHONEOS_i386_TOOLCHAIN.cmake -DENABLE_BOOST_WORKAROUND=ON -DBUILD_STATIC_LIB=ON -} - -create_outdir() -{ - for lib_i386 in `find $BUILD_DIR/i386 -name "lib*\.a"`; do - lib_arm6=`echo $lib_i386 | sed "s/i386/arm6/g"` - lib_arm7=`echo $lib_i386 | sed "s/i386/arm7/g"` - lib=`echo $lib_i386 | sed "s/i386\///g"` - echo 'Creating fat binary...' - lipo -arch armv6 $lib_arm6 -arch armv7 $lib_arm7 -arch i386 $lib_i386 -create -output $lib - done - echo 'Done! You will find the libaries and fat binary library in /lib/ios' -} -cd ../../ - -rm -rf $BUILD_DIR -mkdir -p $BUILD_DIR/arm6 $BUILD_DIR/arm7 $BUILD_DIR/i386 - -setenv_arm6 -echo 'Building armv6 library' -make clean -make assimp -j 8 -l -cp ./lib/libassimp.a $BUILD_DIR/arm6/ - -setenv_arm7 -echo 'Building armv7 library' -make clean -make assimp -j 8 -l -cp ./lib/libassimp.a $BUILD_DIR/arm7/ - - -setenv_i386 -echo 'Building i386 library' -make clean -make assimp -j 8 -l -cp ./lib/libassimp.a $BUILD_DIR/i386/ - -rm ./lib/libassimp.a - -create_outdir - -