MultiCraftProject/MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iOS: update libvorbis and libogg

Browse Source
This commit is contained in:
MoNTE48 2019-10-11 10:53:39 +02:00
parent 198f4ae58f
commit c6d149224e
5 changed files with 11 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj
View File

@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 51;
objectVersion = 52;
objects = {
/* Begin PBXBuildFile section */
@ -35,11 +35,11 @@
4B35A9F11EEE014F00274961 /* l_storage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B35A9EF1EEE014F00274961 /* l_storage.cpp */; };
4B35A9F41EEE017000274961 /* scripting_client.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B35A9F21EEE017000274961 /* scripting_client.cpp */; };
4B35A9F71EEE018D00274961 /* scripting_server.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B35A9F51EEE018D00274961 /* scripting_server.cpp */; };
842A808C2339174C00A89418 /* ads.mm in Sources */ = {isa = PBXBuildFile; fileRef = 842A808B2339174C00A89418 /* ads.mm */; };
844B495F228606B200EB60EF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 844B495D228606B200EB60EF /* Main.storyboard */; };
8465A76522A7D4500095B7CA /* libintl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8465A76422A7D4500095B7CA /* libintl.cpp */; };
849C4F86209656D3005EB041 /* ru.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 849C4F85209656D2005EB041 /* ru.lproj */; };
EB4367AE23CAD13A43ADF4B1 /* libPods-MultiCraft.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8758CE009FCB7E91F4C84C28 /* libPods-MultiCraft.a */; };
842A808C2339174C00A89418 /* ads.mm in Sources */ = {isa = PBXBuildFile; fileRef = 842A808B2339174C00A89418 /* ads.mm */; };
F856B5C31F55F7EE00FE9494 /* bg.png in Resources */ = {isa = PBXBuildFile; fileRef = F856B5C21F55F7EE00FE9494 /* bg.png */; };
F87DC8BA210887C700393B64 /* mapgen_v7p.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F87DC8B9210887C700393B64 /* mapgen_v7p.cpp */; };
F8E6C4E91DCA3B7900F64426 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F8E6C4E81DCA3B7900F64426 /* Assets.xcassets */; };
@ -313,6 +313,8 @@
4B35A9F51EEE018D00274961 /* scripting_server.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = scripting_server.cpp; path = ../../../../src/script/scripting_server.cpp; sourceTree = "<group>"; };
4B35A9F61EEE018D00274961 /* scripting_server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scripting_server.h; path = ../../../../src/script/scripting_server.h; sourceTree = "<group>"; };
840E2F9E233410F90088E7F7 /* SDVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDVersion.h; path = SDVersion/SDVersion.h; sourceTree = "<group>"; };
842A808A2339174B00A89418 /* ads.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ads.h; path = Ads/ads.h; sourceTree = "<group>"; };
842A808B2339174C00A89418 /* ads.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ads.mm; path = Ads/ads.mm; sourceTree = "<group>"; };
844B495E228606B200EB60EF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
8465A76122A7D4500095B7CA /* MessageCatalog.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = MessageCatalog.hpp; path = ../../../../lib/intl/MessageCatalog.hpp; sourceTree = "<group>"; };
8465A76222A7D4500095B7CA /* libintl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libintl.h; path = ../../../../lib/intl/libintl.h; sourceTree = "<group>"; };
@ -320,8 +322,6 @@
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>"; };
8758CE009FCB7E91F4C84C28 /* libPods-MultiCraft.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MultiCraft.a"; sourceTree = BUILT_PRODUCTS_DIR; };
842A808A2339174B00A89418 /* ads.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ads.h; path = Ads/ads.h; sourceTree = "<group>"; };
842A808B2339174C00A89418 /* ads.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ads.mm; path = Ads/ads.mm; sourceTree = "<group>"; };
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>"; };
@ -1527,7 +1527,7 @@
};
};
buildConfigurationList = F8E6C4D41DCA3B7900F64426 /* Build configuration list for PBXProject "MultiCraft" */;
compatibilityVersion = "Xcode 10.0";
compatibilityVersion = "Xcode 11.0";
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
@ -1945,7 +1945,6 @@
"${SRCROOT}/../../../lib/jsoncpp",
"${SRCROOT}/../../../lib/intl",
"${SRCROOT}/../deps/irrlicht/include",
"${SRCROOT}/../Pods/libOggVorbisPod/include",
"${SRCROOT}/../deps/freetype/include/freetype2",
"${SRCROOT}/../Pods/libCurlPod/include",
);
@ -1954,14 +1953,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"${PODS_CONFIGURATION_BUILD_DIR}/PersonalizedAdConsent\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/leveldb-library\"",
"\"${PODS_ROOT}/libCurlPod/lib\"",
"\"${PODS_ROOT}/libOggVorbisPod/lib\"",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_CFLAGS = (
"$(inherited)",
"-isystem",
@ -1978,9 +1970,7 @@
OTHER_LDFLAGS = (
"$(inherited)",
"-L${SRCROOT}/../deps/irrlicht",
"-L$(SRCROOT)/../Pods/libOggVorbisPod/lib",
"-L${SRCROOT}/../deps/freetype/lib",
"-L${SRCROOT}/../Pods/libCurlPod/lib",
"-Wl,-dead_strip",
);
PRODUCT_BUNDLE_IDENTIFIER = mobi.MultiCraft;
@ -2020,7 +2010,6 @@
"${SRCROOT}/../../../lib/jsoncpp",
"${SRCROOT}/../../../lib/intl",
"${SRCROOT}/../deps/irrlicht/include",
"${SRCROOT}/../Pods/libOggVorbisPod/include",
"${SRCROOT}/../deps/freetype/include/freetype2",
"${SRCROOT}/../Pods/libCurlPod/include",
);
@ -2029,14 +2018,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"${PODS_CONFIGURATION_BUILD_DIR}/PersonalizedAdConsent\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/leveldb-library\"",
"\"${PODS_ROOT}/libCurlPod/lib\"",
"\"${PODS_ROOT}/libOggVorbisPod/lib\"",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_CFLAGS = (
"$(inherited)",
"-isystem",
@ -2053,9 +2035,7 @@
OTHER_LDFLAGS = (
"$(inherited)",
"-L${SRCROOT}/../deps/irrlicht",
"-L$(SRCROOT)/../Pods/libOggVorbisPod/lib",
"-L${SRCROOT}/../deps/freetype/lib",
"-L${SRCROOT}/../Pods/libCurlPod/lib",
"-Wl,-dead_strip",
);
PRODUCT_BUNDLE_IDENTIFIER = mobi.MultiCraft;

5
build/iOS/Podfile
View File

@ -4,11 +4,12 @@ platform :ios, '9.0'
target 'MultiCraft' do
source 'https://github.com/CocoaPods/Specs.git'
source 'https://github.com/appodeal/CocoaPods.git'
source 'https://github.com/MoNTE48/VorbisOgg-Specs.git'
pod 'SSZipArchive'
pod 'leveldb-library'
pod 'libCurlPod', :git => 'https://github.com/MoNTE48/libCurlPod'
pod 'libOggVorbisPod', :git => 'https://github.com/MoNTE48/libOggVorbisPod'
pod 'libvorbis'
pod 'Appodeal/AdColonyAdapter'
pod 'Appodeal/AdExchangeAdapter'
@ -30,7 +31,7 @@ post_install do |installer|
config.build_settings['LLVM_LTO'] = 'YES'
config.build_settings['ENABLE_BITCODE'] = 'NO'
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0'
config.build_settings['OTHER_CFLAGS'] ||= ['-fvisibility=hidden', '-fdata-sections', '-ffunction-sections', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables']
config.build_settings['OTHER_CFLAGS'] ||= ['-fvisibility=hidden', '-fdata-sections', '-ffunction-sections', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables -Wno-shorten-64-to-32']
config.build_settings['OTHER_CPLUSPLUSFLAGS'] ||= ['$(OTHER_CFLAGS)']
config.build_settings['OTHER_LDFLAGS'] = ['-Wl,-dead_strip']
end

26
build/iOS/deps/leveldb.sh
View File

@ -1,26 +0,0 @@
#!/bin/bash -e
. sdk.sh
LEVELDB_VERSION=1.20
if [ ! -d leveldb-src ]; then
wget https://github.com/google/leveldb/archive/v$LEVELDB_VERSION.tar.gz
tar -xzvf v$LEVELDB_VERSION.tar.gz
mv leveldb-$LEVELDB_VERSION leveldb-src
rm v$LEVELDB_VERSION.tar.gz
fi
cd leveldb-src
# prevent Makefile from fiddling with our flags
sed -i .old 's|^ifeq.*IOS.*|ifeq (0, 1)|g' Makefile
CC="$IOS_CC $IOS_FLAGS" CXX="$IOS_CC $IOS_FLAGS" \
TARGET_OS=IOS \
make -j$(sysctl -n hw.ncpu) out-static/libleveldb.a
[ -d ../leveldb ] && rm -r ../leveldb
mkdir -p ../leveldb/lib
cp -r include/ ../leveldb/include
cp out-static/libleveldb.a ../leveldb/lib
echo "leveldb build successful"

23
build/iOS/deps/libogg.sh
View File

@ -1,23 +0,0 @@
#!/bin/bash -e
. sdk.sh
OGG_VERSION=1.3.3
if [ ! -d libogg-src ]; then
wget http://downloads.xiph.org/releases/ogg/libogg-$OGG_VERSION.tar.gz
tar -xzvf libogg-$OGG_VERSION.tar.gz
mv libogg-$OGG_VERSION libogg-src
rm libogg-$OGG_VERSION.tar.gz
fi
cd libogg-src
CC=$IOS_CC CFLAGS=$IOS_FLAGS \
./configure --host=arm-apple-darwin --prefix=/ \
--disable-shared --enable-static
make -j$(sysctl -n hw.ncpu)
mkdir -p ../libogg
make DESTDIR=$PWD/../libogg install
echo "libogg build successful"

24
build/iOS/deps/libvorbis.sh
View File

@ -1,24 +0,0 @@
#!/bin/bash -e
. sdk.sh
VORBIS_VERSION=1.3.6
if [ ! -d libvorbis-src ]; then
wget http://downloads.xiph.org/releases/vorbis/libvorbis-$VORBIS_VERSION.tar.gz
tar -xzvf libvorbis-$VORBIS_VERSION.tar.gz
mv libvorbis-$VORBIS_VERSION libvorbis-src
rm libvorbis-$VORBIS_VERSION.tar.gz
fi
cd libvorbis-src
CC=$IOS_CC CFLAGS=$IOS_FLAGS \
./configure --host=arm-apple-darwin --prefix=/ \
--disable-shared --enable-static \
--with-ogg=$PWD/../libogg
make -j$(sysctl -n hw.ncpu)
mkdir -p ../libvorbis
make DESTDIR=$PWD/../libvorbis install
echo "libvorbis build successful"