From f1fe73d1909a2448a004a88362a1a532d0d4f7c3 Mon Sep 17 00:00:00 2001 From: sanine Date: Sun, 12 Feb 2023 23:53:22 -0600 Subject: switch to tinyobj and nanovg from assimp and cairo --- .../port/iOS/IPHONEOS_ARM64E_TOOLCHAIN.cmake | 17 -- .../assimp/port/iOS/IPHONEOS_ARM64_TOOLCHAIN.cmake | 17 -- .../assimp/port/iOS/IPHONEOS_ARMV6_TOOLCHAIN.cmake | 17 -- .../port/iOS/IPHONEOS_ARMV7S_TOOLCHAIN.cmake | 17 -- .../assimp/port/iOS/IPHONEOS_ARMV7_TOOLCHAIN.cmake | 17 -- libs/assimp/port/iOS/IPHONEOS_I386_TOOLCHAIN.cmake | 17 -- .../port/iOS/IPHONEOS_X86_64_TOOLCHAIN.cmake | 17 -- libs/assimp/port/iOS/README.md | 39 ---- libs/assimp/port/iOS/build.sh | 205 --------------------- 9 files changed, 363 deletions(-) delete mode 100644 libs/assimp/port/iOS/IPHONEOS_ARM64E_TOOLCHAIN.cmake delete mode 100644 libs/assimp/port/iOS/IPHONEOS_ARM64_TOOLCHAIN.cmake delete mode 100644 libs/assimp/port/iOS/IPHONEOS_ARMV6_TOOLCHAIN.cmake delete mode 100644 libs/assimp/port/iOS/IPHONEOS_ARMV7S_TOOLCHAIN.cmake delete mode 100644 libs/assimp/port/iOS/IPHONEOS_ARMV7_TOOLCHAIN.cmake delete mode 100644 libs/assimp/port/iOS/IPHONEOS_I386_TOOLCHAIN.cmake delete mode 100644 libs/assimp/port/iOS/IPHONEOS_X86_64_TOOLCHAIN.cmake delete mode 100644 libs/assimp/port/iOS/README.md delete mode 100755 libs/assimp/port/iOS/build.sh (limited to 'libs/assimp/port/iOS') diff --git a/libs/assimp/port/iOS/IPHONEOS_ARM64E_TOOLCHAIN.cmake b/libs/assimp/port/iOS/IPHONEOS_ARM64E_TOOLCHAIN.cmake deleted file mode 100644 index 0cf2b6b..0000000 --- a/libs/assimp/port/iOS/IPHONEOS_ARM64E_TOOLCHAIN.cmake +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE(CMakeForceCompiler) - -SET (CMAKE_CROSSCOMPILING TRUE) -SET (CMAKE_SYSTEM_NAME "Darwin") -SET (CMAKE_SYSTEM_PROCESSOR "arm64e") -SET (IOS TRUE) - -SET (IOS_SDK_DEVICE iPhoneOS) - -SET (SDKVER "${IOS_SDK_VERSION}") -SET (DEVROOT "${XCODE_ROOT_DIR}/Platforms/${IOS_SDK_DEVICE}.platform/Developer") - - -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/libs/assimp/port/iOS/IPHONEOS_ARM64_TOOLCHAIN.cmake b/libs/assimp/port/iOS/IPHONEOS_ARM64_TOOLCHAIN.cmake deleted file mode 100644 index 0f476f1..0000000 --- a/libs/assimp/port/iOS/IPHONEOS_ARM64_TOOLCHAIN.cmake +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE(CMakeForceCompiler) - -SET (CMAKE_CROSSCOMPILING TRUE) -SET (CMAKE_SYSTEM_NAME "Darwin") -SET (CMAKE_SYSTEM_PROCESSOR "arm64") -SET (IOS TRUE) - -SET (IOS_SDK_DEVICE iPhoneOS) - -SET (SDKVER "${IOS_SDK_VERSION}") -SET (DEVROOT "${XCODE_ROOT_DIR}/Platforms/${IOS_SDK_DEVICE}.platform/Developer") - - -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/libs/assimp/port/iOS/IPHONEOS_ARMV6_TOOLCHAIN.cmake b/libs/assimp/port/iOS/IPHONEOS_ARMV6_TOOLCHAIN.cmake deleted file mode 100644 index 2f5d969..0000000 --- a/libs/assimp/port/iOS/IPHONEOS_ARMV6_TOOLCHAIN.cmake +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE(CMakeForceCompiler) - -SET (CMAKE_CROSSCOMPILING TRUE) -SET (CMAKE_SYSTEM_NAME "Darwin") -SET (CMAKE_SYSTEM_PROCESSOR "armv6") -SET (IOS TRUE) - -SET (IOS_SDK_DEVICE iPhoneOS) - -SET (SDKVER "${IOS_SDK_VERSION}") -SET (DEVROOT "${XCODE_ROOT_DIR}/Platforms/${IOS_SDK_DEVICE}.platform/Developer") - - -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/libs/assimp/port/iOS/IPHONEOS_ARMV7S_TOOLCHAIN.cmake b/libs/assimp/port/iOS/IPHONEOS_ARMV7S_TOOLCHAIN.cmake deleted file mode 100644 index 325d483..0000000 --- a/libs/assimp/port/iOS/IPHONEOS_ARMV7S_TOOLCHAIN.cmake +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE(CMakeForceCompiler) - -SET (CMAKE_CROSSCOMPILING TRUE) -SET (CMAKE_SYSTEM_NAME "Darwin") -SET (CMAKE_SYSTEM_PROCESSOR "armv7s") -SET (IOS TRUE) - -SET (IOS_SDK_DEVICE iPhoneOS) - -SET (SDKVER "${IOS_SDK_VERSION}") -SET (DEVROOT "${XCODE_ROOT_DIR}/Platforms/${IOS_SDK_DEVICE}.platform/Developer") - - -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/libs/assimp/port/iOS/IPHONEOS_ARMV7_TOOLCHAIN.cmake b/libs/assimp/port/iOS/IPHONEOS_ARMV7_TOOLCHAIN.cmake deleted file mode 100644 index 73087e0..0000000 --- a/libs/assimp/port/iOS/IPHONEOS_ARMV7_TOOLCHAIN.cmake +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE(CMakeForceCompiler) - -SET (CMAKE_CROSSCOMPILING TRUE) -SET (CMAKE_SYSTEM_NAME "Darwin") -SET (CMAKE_SYSTEM_PROCESSOR "armv7") -SET (IOS TRUE) - -SET (IOS_SDK_DEVICE iPhoneOS) - -SET (SDKVER "${IOS_SDK_VERSION}") -SET (DEVROOT "${XCODE_ROOT_DIR}/Platforms/${IOS_SDK_DEVICE}.platform/Developer") - - -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/libs/assimp/port/iOS/IPHONEOS_I386_TOOLCHAIN.cmake b/libs/assimp/port/iOS/IPHONEOS_I386_TOOLCHAIN.cmake deleted file mode 100644 index dc35d37..0000000 --- a/libs/assimp/port/iOS/IPHONEOS_I386_TOOLCHAIN.cmake +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE(CMakeForceCompiler) - -SET (CMAKE_CROSSCOMPILING TRUE) -SET (CMAKE_SYSTEM_NAME "Darwin") -SET (CMAKE_SYSTEM_PROCESSOR "i386") -SET (IOS TRUE) - -SET (IOS_SDK_DEVICE iPhoneSimulator) - -SET (SDKVER "${IOS_SDK_VERSION}") -SET (DEVROOT "${XCODE_ROOT_DIR}/Platforms/${IOS_SDK_DEVICE}.platform/Developer") - - -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/libs/assimp/port/iOS/IPHONEOS_X86_64_TOOLCHAIN.cmake b/libs/assimp/port/iOS/IPHONEOS_X86_64_TOOLCHAIN.cmake deleted file mode 100644 index a9ed2b8..0000000 --- a/libs/assimp/port/iOS/IPHONEOS_X86_64_TOOLCHAIN.cmake +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE(CMakeForceCompiler) - -SET (CMAKE_CROSSCOMPILING TRUE) -SET (CMAKE_SYSTEM_NAME "Darwin") -SET (CMAKE_SYSTEM_PROCESSOR "x86_64") -SET (IOS TRUE) - -SET (IOS_SDK_DEVICE iPhoneSimulator) - -SET (SDKVER "${IOS_SDK_VERSION}") -SET (DEVROOT "${XCODE_ROOT_DIR}/Platforms/${IOS_SDK_DEVICE}.platform/Developer") - - -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/libs/assimp/port/iOS/README.md b/libs/assimp/port/iOS/README.md deleted file mode 100644 index ca5632a..0000000 --- a/libs/assimp/port/iOS/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# assimp for iOS -(deployment target 6.0+, 32/64bit) - -Builds assimp libraries for several iOS CPU architectures at once, and outputs a fat binary from the result. - -Run the **build.sh** script from the ```./port/iOS/``` directory. See **./build.sh --help** for information about command line options. - -```bash -shadeds-Mac:iOS arul$ ./build.sh --help -[!] ./build.sh - assimp iOS build script - - don't build fat library (--no-fat) - - supported architectures(--archs): armv7, armv7s, arm64, i386, x86_64 - - supported C++ STD libs.(--stdlib): libc++, libstdc++ -``` -Example: -```bash -cd ./port/iOS/ -./build.sh --stdlib=libc++ --archs="armv7 arm64 i386" -``` -Supported architectures/devices: - -### Simulator -- i386 -- x86_64 - -### Device -- ~~ARMv6 (dropped after iOS 6.0)~~ -- ARMv7 -- ARMv7-s -- ARM64 - -### Building with older iOS SDK versions -The script should work out of the box for the iOS 8.x SDKs and probably newer releases as well. -If you are using SDK version 7.x or older, you need to specify the exact SDK version inside **build.sh**, for example: -``` -IOS_SDK_VERSION=7.1 -``` -### Optimization -By default, no compiler optimizations are specified inside the build script. For an optimized build, add the corresponding flags to the CFLAGS definition inside **build.sh**. diff --git a/libs/assimp/port/iOS/build.sh b/libs/assimp/port/iOS/build.sh deleted file mode 100755 index 335b450..0000000 --- a/libs/assimp/port/iOS/build.sh +++ /dev/null @@ -1,205 +0,0 @@ -#!/bin/bash - -# -# Written and maintained by the.arul@gmail.com (2014) -# - -BUILD_DIR="./lib/iOS" - -################################### -# SDK Version -################################### -IOS_SDK_VERSION=$(xcodebuild -version -sdk iphoneos | grep SDKVersion | cut -f2 -d ':' | tr -d '[[:space:]]') -################################### - -################################### -# BUILD Configuration -################################### - -BUILD_SHARED_LIBS=OFF -BUILD_TYPE=Release - -################################################ -# Minimum iOS deployment target version -################################################ -MIN_IOS_VERSION="10.0" - -IOS_SDK_TARGET=$MIN_IOS_VERSION -XCODE_ROOT_DIR=$(xcode-select --print-path) -TOOLCHAIN=$XCODE_ROOT_DIR/Toolchains/XcodeDefault.xctoolchain - -CMAKE_C_COMPILER=$(xcrun -find cc) -CMAKE_CXX_COMPILER=$(xcrun -find c++) - -BUILD_ARCHS_DEVICE="arm64e arm64 armv7s armv7" -BUILD_ARCHS_SIMULATOR="x86_64 i386" -BUILD_ARCHS_ALL=($BUILD_ARCHS_DEVICE $BUILD_ARCHS_SIMULATOR) - -CPP_DEV_TARGET_LIST=(miphoneos-version-min mios-simulator-version-min) -CPP_DEV_TARGET= -CPP_STD_LIB_LIST=(libc++ libstdc++) -CPP_STD_LIB= -CPP_STD_LIST=(c++11 c++14) -CPP_STD=c++11 - -function join { local IFS="$1"; shift; echo "$*"; } - -build_arch() -{ - IOS_SDK_DEVICE=iPhoneOS - CPP_DEV_TARGET=${CPP_DEV_TARGET_LIST[0]} - - if [[ "$BUILD_ARCHS_SIMULATOR" =~ "$1" ]] - then - echo '[!] Target SDK set to SIMULATOR.' - IOS_SDK_DEVICE=iPhoneSimulator - CPP_DEV_TARGET=${CPP_DEV_TARGET_LIST[1]} - else - echo '[!] Target SDK set to DEVICE.' - fi - - unset DEVROOT SDKROOT CFLAGS LDFLAGS CPPFLAGS CXXFLAGS CMAKE_CLI_INPUT - - export CC="$(xcrun -sdk iphoneos -find clang)" - export CPP="$CC -E" - export DEVROOT=$XCODE_ROOT_DIR/Platforms/$IOS_SDK_DEVICE.platform/Developer - export SDKROOT=$DEVROOT/SDKs/$IOS_SDK_DEVICE$IOS_SDK_VERSION.sdk - export CFLAGS="-arch $1 -pipe -no-cpp-precomp -stdlib=$CPP_STD_LIB -isysroot $SDKROOT -I$SDKROOT/usr/include/ -miphoneos-version-min=$IOS_SDK_TARGET" - if [[ "$BUILD_TYPE" =~ "Debug" ]]; then - export CFLAGS="$CFLAGS -Og" - else - export CFLAGS="$CFLAGS -O3" - fi - export LDFLAGS="-arch $1 -isysroot $SDKROOT -L$SDKROOT/usr/lib/" - export CPPFLAGS="$CFLAGS" - export CXXFLAGS="$CFLAGS -std=$CPP_STD" - - rm CMakeCache.txt - - CMAKE_CLI_INPUT="-DCMAKE_C_COMPILER=$CMAKE_C_COMPILER -DCMAKE_CXX_COMPILER=$CMAKE_CXX_COMPILER -DCMAKE_TOOLCHAIN_FILE=./port/iOS/IPHONEOS_$(echo $1 | tr '[:lower:]' '[:upper:]')_TOOLCHAIN.cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DENABLE_BOOST_WORKAROUND=ON -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS" - - echo "[!] Running CMake with -G 'Unix Makefiles' $CMAKE_CLI_INPUT" - - cmake -G 'Unix Makefiles' ${CMAKE_CLI_INPUT} - - echo "[!] Building $1 library" - - xcrun -run make clean - xcrun -run make assimp -j 8 -l - - if [[ "$BUILD_SHARED_LIBS" =~ "ON" ]]; then - echo "[!] Moving built dynamic libraries into: $BUILD_DIR/$1/" - mv ./lib/*.dylib $BUILD_DIR/$1/ - fi - - echo "[!] Moving built static libraries into: $BUILD_DIR/$1/" - mv ./lib/*.a $BUILD_DIR/$1/ -} - -echo "[!] $0 - assimp iOS build script" - -CPP_STD_LIB=${CPP_STD_LIB_LIST[0]} -CPP_STD=${CPP_STD_LIST[0]} -DEPLOY_ARCHS=${BUILD_ARCHS_ALL[*]} -DEPLOY_FAT=1 - -for i in "$@"; do - case $i in - -s=*|--std=*) - CPP_STD=`echo $i | sed 's/[-a-zA-Z0-9]*=//'` - echo "[!] Selecting c++ standard: $CPP_STD" - ;; - -l=*|--stdlib=*) - CPP_STD_LIB=`echo $i | sed 's/[-a-zA-Z0-9]*=//'` - echo "[!] Selecting c++ std lib: $CPP_STD_LIB" - ;; - -a=*|--archs=*) - DEPLOY_ARCHS=`echo $i | sed 's/[-a-zA-Z0-9]*=//'` - echo "[!] Selecting architectures: $DEPLOY_ARCHS" - ;; - --debug) - BUILD_TYPE=Debug - echo "[!] Selecting build type: Debug" - ;; - --shared-lib) - BUILD_SHARED_LIBS=ON - echo "[!] Will generate dynamic libraries" - ;; - -n|--no-fat) - DEPLOY_FAT=0 - echo "[!] Fat binary will not be created." - ;; - -h|--help) - echo " - don't build fat library (--no-fat)." - echo " - Include debug information and symbols, no compiler optimizations (--debug)." - echo " - generate dynamic libraries rather than static ones (--shared-lib)." - echo " - supported architectures (--archs): $(echo $(join , ${BUILD_ARCHS_ALL[*]}) | sed 's/,/, /g')" - echo " - supported C++ STD libs (--stdlib): $(echo $(join , ${CPP_STD_LIB_LIST[*]}) | sed 's/,/, /g')" - echo " - supported C++ standards (--std): $(echo $(join , ${CPP_STD_LIST[*]}) | sed 's/,/, /g')" - exit - ;; - *) - ;; - esac -done - -cd ../../ -rm -rf $BUILD_DIR - -for ARCH_TARGET in $DEPLOY_ARCHS; do - echo "Creating folder: $BUILD_DIR/$ARCH_TARGET" - mkdir -p $BUILD_DIR/$ARCH_TARGET - echo "Building for arc: $ARCH_TARGET" - build_arch $ARCH_TARGET - #rm ./lib/libassimp.a -done - - -make_fat_static_or_shared_binary() -{ - LIB_NAME=$1 - LIPO_ARGS='' - for ARCH_TARGET in $DEPLOY_ARCHS; do - if [[ "$BUILD_SHARED_LIBS" =~ "ON" ]]; then - LIPO_ARGS="$LIPO_ARGS-arch $ARCH_TARGET $BUILD_DIR/$ARCH_TARGET/$LIB_NAME.dylib " - else - LIPO_ARGS="$LIPO_ARGS-arch $ARCH_TARGET $BUILD_DIR/$ARCH_TARGET/$LIB_NAME.a " - fi - done - if [[ "$BUILD_SHARED_LIBS" =~ "ON" ]]; then - LIPO_ARGS="$LIPO_ARGS -create -output $BUILD_DIR/$LIB_NAME-fat.dylib" - else - LIPO_ARGS="$LIPO_ARGS -create -output $BUILD_DIR/$LIB_NAME-fat.a" - fi - lipo $LIPO_ARGS -} - -make_fat_static_binary() -{ - LIB_NAME=$1 - LIPO_ARGS='' - for ARCH_TARGET in $DEPLOY_ARCHS; do - LIPO_ARGS="$LIPO_ARGS-arch $ARCH_TARGET $BUILD_DIR/$ARCH_TARGET/$LIB_NAME.a " - done - LIPO_ARGS="$LIPO_ARGS -create -output $BUILD_DIR/$LIB_NAME-fat.a" - lipo $LIPO_ARGS -} - -if [[ "$DEPLOY_FAT" -eq 1 ]]; then - echo '[+] Creating fat binaries ...' - - if [[ "$BUILD_TYPE" =~ "Debug" ]]; then - make_fat_static_or_shared_binary 'libassimpd' - make_fat_static_binary 'libIrrXMLd' - make_fat_static_binary 'libzlibstaticd' - else - make_fat_static_or_shared_binary 'libassimp' - make_fat_static_binary 'libIrrXML' - make_fat_static_binary 'libzlibstatic' - fi - - echo "[!] Done! The fat binaries can be found at $BUILD_DIR" -fi - - - -- cgit v1.2.1