mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
adapt config to new dependencies
This commit is contained in:
parent
9dc5f3ed8b
commit
fb32dd0ffc
@ -187,7 +187,7 @@ if(WIN32)
|
||||
target_compile_definitions(vcmiclient PRIVATE WINDOWS_IGNORE_PACKING_MISMATCH)
|
||||
elseif(APPLE_IOS)
|
||||
target_link_libraries(vcmiclient PRIVATE
|
||||
"-framework Foundation -framework UIKit -framework QuartzCore -framework CoreGraphics -framework CoreServices -framework ImageIO -framework Metal -framework OpenGLES -framework AVFoundation -framework GameController -framework CoreMotion" # SDL2_image
|
||||
"-framework Foundation -framework UIKit -framework QuartzCore -framework CoreGraphics -framework CoreServices -framework ImageIO -framework Metal -framework OpenGLES -framework AVFoundation -framework GameController -framework CoreMotion -weak_framework CoreHaptics"
|
||||
)
|
||||
|
||||
set(ENTITLEMENTS_OUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/VCMI.entitlements)
|
||||
|
@ -1,16 +1,13 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
boostPrefix=~/dev/other/Apple-Boost-BuildScript/build-static/boost/1.75.0/ios/debug/prefix
|
||||
ffmpegDir=~/dev/ios/vcmi-ios-deps/mobile-ffmpeg-min-universal-4.4
|
||||
sdlLibsDir=~/dev/ios/vcmi-ios-deps/SDL2-lib
|
||||
platform=OS64
|
||||
globalPrefix=~/dev/vcmi/vcmi-ios-depends/build/iphoneos
|
||||
qtDir=~/dev/Qt-libs/5.15.2/ios
|
||||
tbbDir=~/dev/ios/vcmi-ios-deps/oneTBB-2021.4.0/build/install
|
||||
luajitDir=~/dev/ios/vcmi-ios-deps/LuaJIT-2.1/ios64
|
||||
if [[ "$1" ]]; then
|
||||
tbbDir=~/dev/ios/vcmi-ios-deps/oneTBB-2021.4.0/build-sim/install
|
||||
luajitDir=~/dev/ios/vcmi-ios-deps/LuaJIT-2.1/sim64
|
||||
platform=SIMULATOR64
|
||||
globalPrefix=~/dev/vcmi/vcmi-ios-depends/build/iphonesimulator
|
||||
fi
|
||||
prefixPath="$boostPrefix;$ffmpegDir;$sdlLibsDir;$qtDir;$tbbDir;$luajitDir"
|
||||
prefixPath="$globalPrefix;$qtDir"
|
||||
|
||||
# prefixPath="$boostPrefix;$sdlLibsDir"
|
||||
# xcodeMajorVersion=$(xcodebuild -version | fgrep Xcode | cut -d ' ' -f 2 | cut -d . -f 1)
|
||||
@ -28,15 +25,11 @@ cmake "$srcDir" -G Xcode \
|
||||
-Wno-dev \
|
||||
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
|
||||
-DCMAKE_TOOLCHAIN_FILE="$srcDir/ios.toolchain.cmake" \
|
||||
-DPLATFORM=${1:-OS64} \
|
||||
-DPLATFORM=$platform \
|
||||
-DDEPLOYMENT_TARGET=11.0 \
|
||||
-DENABLE_BITCODE=0 \
|
||||
-DCMAKE_BINARY_DIR=$(pwd) \
|
||||
-DCMAKE_PREFIX_PATH="$prefixPath" \
|
||||
-DSDL2_INCLUDE_DIR=~/dev/ios/vcmi-ios-deps/SDL/include \
|
||||
-DSDL2_IMAGE_INCLUDE_DIR=~/dev/ios/vcmi-ios-deps/SDL_image-release-2.0.5 \
|
||||
-DSDL2_MIXER_INCLUDE_DIR=~/dev/ios/vcmi-ios-deps/SDL_mixer-release-2.0.4 \
|
||||
-DSDL2_TTF_INCLUDE_DIR=~/dev/ios/vcmi-ios-deps/SDL_ttf-release-2.0.15 \
|
||||
-DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY='Apple Development' \
|
||||
-DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM='4XHN44TEVG'
|
||||
# -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO
|
||||
|
Loading…
Reference in New Issue
Block a user