games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-17 11:56:46 +02:00
Code Issues Releases Activity

some cleanup

Browse Source
This commit is contained in:
Andrey Filipenkov 2021-03-17 20:16:48 +03:00
parent 4647bd8981
commit 9b3c2f2a82
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure_ios.sh
View File

@ -1,11 +1,20 @@
#!/usr/bin/env bash #!/usr/bin/env bash
boostPrefix=~/dev/other/Apple-Boost-BuildScript/build/boost/1.75.0/ios/debug/prefix boostPrefix=~/dev/other/Apple-Boost-BuildScript/build/boost/1.75.0/ios/debug/prefix
ffmpegDir=~/dev/ios/vcmi-ios-deps/mobile-ffmpeg-min-universal ffmpegDir=~/dev/ios/vcmi-ios-deps/mobile-ffmpeg-min-universal-4.4
sdlLibsDir=~/dev/ios/vcmi-ios-deps/SDL2-lib sdlLibsDir=~/dev/ios/vcmi-ios-deps/SDL2-lib
prefixPath="$boostPrefix;$ffmpegDir;$sdlLibsDir"
# prefixPath="$boostPrefix;$sdlLibsDir"
# xcodeMajorVersion=$(xcodebuild -version | fgrep Xcode | cut -d ' ' -f 2 | cut -d . -f 1)
# if [[ $xcodeMajorVersion -ge 12 ]]; then
# extraVars=-DCMAKE_FRAMEWORK_PATH=~/dev/ios/vcmi-ios-deps/mobile-ffmpeg-min-gpl-4.4-xc12-frameworks
# else
# prefixPath+=;~/dev/ios/vcmi-ios-deps/mobile-ffmpeg-min-universal
# fi
srcDir="../vcmi" srcDir="../vcmi"
cmake "$srcDir" -G Xcode \ cmake "$srcDir" -G Xcode -T buildsystem=1 \
-DBUNDLE_IDENTIFIER_PREFIX=com.kambala \ -DBUNDLE_IDENTIFIER_PREFIX=com.kambala \
-Wno-dev \ -Wno-dev \
-DCMAKE_TOOLCHAIN_FILE="$srcDir/ios.toolchain.cmake" \ -DCMAKE_TOOLCHAIN_FILE="$srcDir/ios.toolchain.cmake" \
@ -13,7 +22,7 @@ cmake "$srcDir" -G Xcode \
-DDEPLOYMENT_TARGET=11.0 \ -DDEPLOYMENT_TARGET=11.0 \
-DENABLE_BITCODE=0 \ -DENABLE_BITCODE=0 \
-DCMAKE_BINARY_DIR=$(pwd) \ -DCMAKE_BINARY_DIR=$(pwd) \
-DCMAKE_PREFIX_PATH="$boostPrefix;$ffmpegDir;$sdlLibsDir" \ -DCMAKE_PREFIX_PATH="$prefixPath" \
-DSDL2_INCLUDE_DIR=~/dev/ios/vcmi-ios-deps/SDL/include \ -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_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_MIXER_INCLUDE_DIR=~/dev/ios/vcmi-ios-deps/SDL_mixer-release-2.0.4 \

10
lib/VCMIDirs.cpp
View File

@ -410,15 +410,7 @@ std::vector<bfs::path> VCMIDirsIOS::dataPaths() const
}; };
} }
bfs::path VCMIDirsIOS::libraryPath() const bfs::path VCMIDirsIOS::libraryPath() const { return {ios_frameworksPath()}; }
{
#ifdef VCMI_IOS_SIM
// fixme ios
return {"/Users/kambala/dev/vcmi/build-sim64/bin/Debug"};
#else
return {ios_frameworksPath()};
#endif
}
bfs::path VCMIDirsIOS::binaryPath() const { return {ios_bundlePath()}; } bfs::path VCMIDirsIOS::binaryPath() const { return {ios_bundlePath()}; }
bool VCMIDirsIOS::developmentMode() const { return false; } bool VCMIDirsIOS::developmentMode() const { return false; }