iOS: update deps, fix Curl build
MoNTE48
parent
06bbc3b387
commit
0a7fde8480
|
|
@ -3,7 +3,7 @@
|
|||
archiveVersion = 1;
|
||||
classes = {
|
||||
};
|
||||
objectVersion = 52;
|
||||
objectVersion = 53;
|
||||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
|
|
@ -40,6 +40,7 @@
|
|||
8465A76522A7D4500095B7CA /* libintl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8465A76422A7D4500095B7CA /* libintl.cpp */; };
|
||||
849C4F86209656D3005EB041 /* ru.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 849C4F85209656D2005EB041 /* ru.lproj */; };
|
||||
84AA10F323D20C070056F125 /* libluajit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 84AA10F223D20BE50056F125 /* libluajit.a */; };
|
||||
84FE40E224439C2F008E29DB /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FE40E124439C2F008E29DB /* libcurl.a */; };
|
||||
EB4367AE23CAD13A43ADF4B1 /* libPods-MultiCraft.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8758CE009FCB7E91F4C84C28 /* libPods-MultiCraft.a */; };
|
||||
F856B5C31F55F7EE00FE9494 /* bg.png in Resources */ = {isa = PBXBuildFile; fileRef = F856B5C21F55F7EE00FE9494 /* bg.png */; };
|
||||
F87DC8BA210887C700393B64 /* mapgen_v7p.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F87DC8B9210887C700393B64 /* mapgen_v7p.cpp */; };
|
||||
|
|
@ -290,8 +291,8 @@
|
|||
8465A76422A7D4500095B7CA /* libintl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = libintl.cpp; path = ../../../../lib/intl/libintl.cpp; sourceTree = "<group>"; };
|
||||
849C4F85209656D2005EB041 /* ru.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ru.lproj; sourceTree = "<group>"; };
|
||||
84AA10F223D20BE50056F125 /* libluajit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libluajit.a; path = ../Pods/LuaJITPod/lib/libluajit.a; sourceTree = "<group>"; };
|
||||
84FE40E124439C2F008E29DB /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../deps/libcurl/lib/libcurl.a; sourceTree = "<group>"; };
|
||||
8758CE009FCB7E91F4C84C28 /* libPods-MultiCraft.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MultiCraft.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
F85119A61F4476FC00BFA9AF /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../Pods/libCurlPod/lib/libcurl.a; sourceTree = "<group>"; };
|
||||
F856B5C21F55F7EE00FE9494 /* bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bg.png; path = ../../../../textures/base/bg.png; sourceTree = "<group>"; };
|
||||
F87DC8B8210887C600393B64 /* mapgen_v7p.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mapgen_v7p.h; path = ../../../../src/mapgen_v7p.h; sourceTree = "<group>"; };
|
||||
F87DC8B9210887C700393B64 /* mapgen_v7p.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mapgen_v7p.cpp; path = ../../../../src/mapgen_v7p.cpp; sourceTree = "<group>"; };
|
||||
|
|
@ -708,6 +709,7 @@
|
|||
F8E6C7D11DCA433E00F64426 /* libiconv.tbd in Frameworks */,
|
||||
F8E6C7D51DCA476800F64426 /* libIrrlicht.a in Frameworks */,
|
||||
F8E6C7D71DCA477600F64426 /* libfreetype.a in Frameworks */,
|
||||
84FE40E224439C2F008E29DB /* libcurl.a in Frameworks */,
|
||||
EB4367AE23CAD13A43ADF4B1 /* libPods-MultiCraft.a in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
|
|
@ -1311,7 +1313,7 @@
|
|||
F8E6C7C31DCA42F300F64426 /* Frameworks */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
F85119A61F4476FC00BFA9AF /* libcurl.a */,
|
||||
84FE40E124439C2F008E29DB /* libcurl.a */,
|
||||
F8E6C7DE1DCA47AF00F64426 /* libvorbisfile.a */,
|
||||
F8E6C7DC1DCA47A300F64426 /* libvorbis.a */,
|
||||
F8E6C7DA1DCA479200F64426 /* libogg.a */,
|
||||
|
|
@ -1372,7 +1374,7 @@
|
|||
};
|
||||
};
|
||||
buildConfigurationList = F8E6C4D41DCA3B7900F64426 /* Build configuration list for PBXProject "MultiCraft" */;
|
||||
compatibilityVersion = "Xcode 11.0";
|
||||
compatibilityVersion = "Xcode 11.4";
|
||||
developmentRegion = en;
|
||||
hasScannedForEncodings = 0;
|
||||
knownRegions = (
|
||||
|
|
@ -1759,7 +1761,7 @@
|
|||
"${SRCROOT}/../../../lib/intl",
|
||||
"${SRCROOT}/../deps/irrlicht/include",
|
||||
"${SRCROOT}/../deps/freetype/include/freetype2",
|
||||
"${SRCROOT}/../Pods/libCurlPod/include",
|
||||
"${SRCROOT}/../deps/libcurl/include",
|
||||
"${SRCROOT}/../Pods/LuaJITPod/include",
|
||||
);
|
||||
INFOPLIST_FILE = MultiCraft/Info.plist;
|
||||
|
|
@ -1786,6 +1788,7 @@
|
|||
"$(inherited)",
|
||||
"-L${SRCROOT}/../deps/irrlicht",
|
||||
"-L${SRCROOT}/../deps/freetype/lib",
|
||||
"-L${SRCROOT}/../deps/libcurl/lib",
|
||||
"-L${SRCROOT}/../Pods/LuaJITPod/lib",
|
||||
"-Wl,-dead_strip",
|
||||
);
|
||||
|
|
@ -1828,7 +1831,7 @@
|
|||
"${SRCROOT}/../../../lib/intl",
|
||||
"${SRCROOT}/../deps/irrlicht/include",
|
||||
"${SRCROOT}/../deps/freetype/include/freetype2",
|
||||
"${SRCROOT}/../Pods/libCurlPod/include",
|
||||
"${SRCROOT}/../deps/libcurl/include",
|
||||
"${SRCROOT}/../Pods/LuaJITPod/include",
|
||||
);
|
||||
INFOPLIST_FILE = MultiCraft/Info.plist;
|
||||
|
|
@ -1855,6 +1858,7 @@
|
|||
"$(inherited)",
|
||||
"-L${SRCROOT}/../deps/irrlicht",
|
||||
"-L${SRCROOT}/../deps/freetype/lib",
|
||||
"-L${SRCROOT}/../deps/libcurl/lib",
|
||||
"-L${SRCROOT}/../Pods/LuaJITPod/lib",
|
||||
"-Wl,-dead_strip",
|
||||
);
|
||||
|
|
|
|||
|
|
@ -19,8 +19,7 @@ target 'MultiCraft' do
|
|||
|
||||
pod 'SSZipArchive'
|
||||
pod 'leveldb-library'
|
||||
pod 'libCurlPod', :git => 'https://github.com/MoNTE48/libCurlPod'
|
||||
pod 'LuaJITPod', :git => 'https://github.com/MoNTE48/LuaJITPod'
|
||||
pod 'LuaJITPod', :git => 'https://github.com/MoNTE48/LuaJITPod'
|
||||
pod 'libvorbis'
|
||||
|
||||
appodeal
|
||||
|
|
|
|||
|
|
@ -12,12 +12,12 @@ fi
|
|||
|
||||
cd freetype-src
|
||||
|
||||
CC=$IOS_CC CFLAGS=$IOS_FLAGS \
|
||||
CFLAGS=$IOS_FLAGS \
|
||||
PKG_CONFIG=/bin/false \
|
||||
./configure --host=arm-apple-darwin --prefix=/ \
|
||||
--disable-shared --enable-static \
|
||||
--with-png=no
|
||||
make -j$(sysctl -n hw.ncpu)
|
||||
--with-bzip2=no --with-png=no
|
||||
make -j
|
||||
|
||||
mkdir -p ../freetype
|
||||
make DESTDIR=$PWD/../freetype install
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
. sdk.sh
|
||||
CURL_VERSION=7.67.0
|
||||
CURL_VERSION=7.69.1
|
||||
|
||||
if [ ! -d libcurl-src ]; then
|
||||
wget https://curl.haxx.se/download/curl-$CURL_VERSION.tar.gz
|
||||
|
|
@ -15,11 +15,11 @@ cd libcurl-src
|
|||
# build once for armv7, once for arm64
|
||||
for x in armv7 arm64; do
|
||||
if [ $x = armv7 ]; then
|
||||
CURL_CFLAGS="-arch armv7 $IOS_FLAGS_LUA"
|
||||
CURL_CFLAGS="-arch armv7 $IOS_FLAGS_NOARCH"
|
||||
else
|
||||
CURL_CFLAGS="-arch arm64 -arch arm64e $IOS_FLAGS_LUA"
|
||||
CURL_CFLAGS="-arch arm64 -arch arm64e $IOS_FLAGS_NOARCH"
|
||||
fi
|
||||
CC=$IOS_CC CFLAGS=$CURL_CFLAGS \
|
||||
CFLAGS="$CURL_CFLAGS" \
|
||||
./configure --host=arm-apple-darwin --prefix=/ --disable-shared --enable-static \
|
||||
--disable-debug --disable-verbose --disable-versioned-symbols \
|
||||
--enable-hidden-symbols --disable-dependency-tracking \
|
||||
|
|
|
|||
|
|
@ -1,12 +1,9 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
./irrlicht.sh
|
||||
#./libogg.sh
|
||||
#./libvorbis.sh
|
||||
#./leveldb.sh
|
||||
./freetype.sh
|
||||
#./luajit.sh
|
||||
#./libcurl.sh
|
||||
./libcurl.sh
|
||||
#./luajit.sh ## requires an older version of macOS (with 32-bit support)
|
||||
|
||||
echo
|
||||
echo "All libraries were built!"
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ cd LuaJIT-src
|
|||
# 32-bit
|
||||
make amalg -j \
|
||||
DEFAULT_CC=clang HOST_CC="clang -m32 -arch i386" CROSS="$(dirname $IOS_CC)/" TARGET_SYS=iOS \
|
||||
TARGET_FLAGS="-arch armv7 ${IOS_FLAGS_LUA}" \
|
||||
TARGET_FLAGS="-arch armv7 $IOS_FLAGS_NOARCH" \
|
||||
TARGET_CFLAGS+="-Wno-implicit-function-declaration -fno-omit-frame-pointer"
|
||||
mv src/libluajit.a templib_32.a
|
||||
make clean
|
||||
|
|
@ -25,7 +25,7 @@ make clean
|
|||
# 64-bit
|
||||
make amalg -j \
|
||||
DEFAULT_CC=clang HOST_CC=clang CROSS="$(dirname $IOS_CC)/" TARGET_SYS=iOS \
|
||||
TARGET_FLAGS="-arch arm64 ${IOS_FLAGS_LUA}" \
|
||||
TARGET_FLAGS="-arch arm64 $IOS_FLAGS_NOARCH" \
|
||||
TARGET_CFLAGS+="-Wno-implicit-function-declaration"
|
||||
mv src/libluajit.a templib_64.a
|
||||
make clean
|
||||
|
|
@ -33,7 +33,7 @@ make clean
|
|||
# 64-bit [arm64e]
|
||||
make amalg -j \
|
||||
DEFAULT_CC=clang HOST_CC=clang CROSS="$(dirname $IOS_CC)/" TARGET_SYS=iOS \
|
||||
TARGET_FLAGS="-arch arm64e ${IOS_FLAGS_LUA}" \
|
||||
TARGET_FLAGS="-arch arm64e $IOS_FLAGS_NOARCH" \
|
||||
TARGET_CFLAGS+="-Wno-implicit-function-declaration"
|
||||
mv src/libluajit.a templib_64e.a
|
||||
make clean
|
||||
|
|
|
|||
|
|
@ -8,4 +8,4 @@ export IOS_COMPILER=$(xcrun --sdk $sdk --find clang)
|
|||
export IOS_CC=$IOS_COMPILER
|
||||
export IOS_CXX=$IOS_COMPILER
|
||||
export IOS_FLAGS="-isysroot $(xcrun --sdk $sdk --show-sdk-path) -arch armv7 -arch armv7s -arch arm64 -arch arm64e -miphoneos-version-min=$osver -fvisibility=hidden -fdata-sections -ffunction-sections -fno-unwind-tables -fno-asynchronous-unwind-tables -Ofast"
|
||||
export IOS_FLAGS_LUA="-isysroot $(xcrun --sdk $sdk --show-sdk-path) -miphoneos-version-min=$osver -fvisibility=hidden -fdata-sections -ffunction-sections -Ofast"
|
||||
export IOS_FLAGS_NOARCH="-isysroot $(xcrun --sdk $sdk --show-sdk-path) -miphoneos-version-min=$osver -fvisibility=hidden -fdata-sections -ffunction-sections -Ofast"
|
||||
|
|
|
|||
Loading…
Reference in New Issue