Merge branch 'ios-port-update' of https://github.com/615IO/assimp into 615IO-ios-port-update
commit
0b628a0ebb
|
@ -116,3 +116,6 @@ tools/assimp_qt_viewer/moc_glview.cpp_parameters
|
||||||
tools/assimp_qt_viewer/moc_mainwindow.cpp
|
tools/assimp_qt_viewer/moc_mainwindow.cpp
|
||||||
tools/assimp_qt_viewer/moc_mainwindow.cpp_parameters
|
tools/assimp_qt_viewer/moc_mainwindow.cpp_parameters
|
||||||
tools/assimp_qt_viewer/ui_mainwindow.h
|
tools/assimp_qt_viewer/ui_mainwindow.h
|
||||||
|
|
||||||
|
#Generated directory
|
||||||
|
generated/*
|
|
@ -22,7 +22,7 @@ BUILD_TYPE=Release
|
||||||
################################################
|
################################################
|
||||||
# Minimum iOS deployment target version
|
# Minimum iOS deployment target version
|
||||||
################################################
|
################################################
|
||||||
MIN_IOS_VERSION="6.0"
|
MIN_IOS_VERSION="10.0"
|
||||||
|
|
||||||
IOS_SDK_TARGET=$MIN_IOS_VERSION
|
IOS_SDK_TARGET=$MIN_IOS_VERSION
|
||||||
XCODE_ROOT_DIR=$(xcode-select --print-path)
|
XCODE_ROOT_DIR=$(xcode-select --print-path)
|
||||||
|
@ -60,8 +60,8 @@ build_arch()
|
||||||
|
|
||||||
unset DEVROOT SDKROOT CFLAGS LDFLAGS CPPFLAGS CXXFLAGS CMAKE_CLI_INPUT
|
unset DEVROOT SDKROOT CFLAGS LDFLAGS CPPFLAGS CXXFLAGS CMAKE_CLI_INPUT
|
||||||
|
|
||||||
#export CC="$(xcrun -sdk iphoneos -find clang)"
|
export CC="$(xcrun -sdk iphoneos -find clang)"
|
||||||
#export CPP="$CC -E"
|
export CPP="$CC -E"
|
||||||
export DEVROOT=$XCODE_ROOT_DIR/Platforms/$IOS_SDK_DEVICE.platform/Developer
|
export DEVROOT=$XCODE_ROOT_DIR/Platforms/$IOS_SDK_DEVICE.platform/Developer
|
||||||
export SDKROOT=$DEVROOT/SDKs/$IOS_SDK_DEVICE$IOS_SDK_VERSION.sdk
|
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"
|
export CFLAGS="-arch $1 -pipe -no-cpp-precomp -stdlib=$CPP_STD_LIB -isysroot $SDKROOT -I$SDKROOT/usr/include/ -miphoneos-version-min=$IOS_SDK_TARGET"
|
||||||
|
|
Loading…
Reference in New Issue