From 07b89703ad7423b38e22a23280cdce42d16d6298 Mon Sep 17 00:00:00 2001 From: MoNTE48 Date: Fri, 7 Jun 2019 23:54:32 +0200 Subject: [PATCH] iOS: disable LuaJIT, v. 1.2.1-beta --- .../MultiCraft.xcodeproj/project.pbxproj | 334 +++++++++++++----- build/iOS/MultiCraft/MultiCraft/Info.plist | 4 +- .../MultiCraft/en.lproj/Localizable.strings | Bin build/iOS/MultiCraft/MultiCraft/ioswrap.m | 0 .../MultiCraft/ru.lproj/Localizable.strings | Bin build/iOS/Podfile | 1 - build/iOS/deps/luajit.sh | 9 +- build/iOS/patches/luajit.patch | 13 - lib/lua/src/loslib.c | 4 + 9 files changed, 254 insertions(+), 111 deletions(-) mode change 100644 => 100755 build/iOS/MultiCraft/MultiCraft/en.lproj/Localizable.strings mode change 100644 => 100755 build/iOS/MultiCraft/MultiCraft/ioswrap.m mode change 100644 => 100755 build/iOS/MultiCraft/MultiCraft/ru.lproj/Localizable.strings delete mode 100755 build/iOS/patches/luajit.patch diff --git a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj index a400c657..c20fc402 100755 --- a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj +++ b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj @@ -43,7 +43,6 @@ F84D3A951DE79AB400ADE1A0 /* ads.mm in Sources */ = {isa = PBXBuildFile; fileRef = F84D3A941DE79AB400ADE1A0 /* ads.mm */; }; F85119A71F4476FC00BFA9AF /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F85119A61F4476FC00BFA9AF /* libcurl.a */; }; F856B5C31F55F7EE00FE9494 /* bg.png in Resources */ = {isa = PBXBuildFile; fileRef = F856B5C21F55F7EE00FE9494 /* bg.png */; }; - F85722891DDC74B700308383 /* libluajit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F85722881DDC74B700308383 /* libluajit.a */; }; F87DC8BA210887C700393B64 /* mapgen_v7p.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F87DC8B9210887C700393B64 /* mapgen_v7p.cpp */; }; F8E6C4E91DCA3B7900F64426 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F8E6C4E81DCA3B7900F64426 /* Assets.xcassets */; }; F8E6C4EC1DCA3B7900F64426 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F8E6C4EA1DCA3B7900F64426 /* LaunchScreen.storyboard */; }; @@ -162,6 +161,36 @@ F8E6C66F1DCA403100F64426 /* clientlauncher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C66A1DCA403100F64426 /* clientlauncher.cpp */; }; F8E6C6701DCA403100F64426 /* tile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C66D1DCA403100F64426 /* tile.cpp */; }; F8E6C6781DCA407400F64426 /* jsoncpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6771DCA407400F64426 /* jsoncpp.cpp */; }; + F8E6C6B41DCA40F300F64426 /* lapi.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C67F1DCA40F300F64426 /* lapi.c */; }; + F8E6C6B51DCA40F300F64426 /* lauxlib.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6811DCA40F300F64426 /* lauxlib.c */; }; + F8E6C6B61DCA40F300F64426 /* lbaselib.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6831DCA40F300F64426 /* lbaselib.c */; }; + F8E6C6B71DCA40F300F64426 /* lcode.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6841DCA40F300F64426 /* lcode.c */; }; + F8E6C6B81DCA40F300F64426 /* ldblib.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6861DCA40F300F64426 /* ldblib.c */; }; + F8E6C6B91DCA40F300F64426 /* ldebug.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6871DCA40F300F64426 /* ldebug.c */; }; + F8E6C6BA1DCA40F300F64426 /* ldo.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6891DCA40F300F64426 /* ldo.c */; }; + F8E6C6BB1DCA40F300F64426 /* ldump.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C68B1DCA40F300F64426 /* ldump.c */; }; + F8E6C6BC1DCA40F300F64426 /* lfunc.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C68C1DCA40F300F64426 /* lfunc.c */; }; + F8E6C6BD1DCA40F300F64426 /* lgc.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C68E1DCA40F300F64426 /* lgc.c */; }; + F8E6C6BE1DCA40F300F64426 /* linit.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6901DCA40F300F64426 /* linit.c */; }; + F8E6C6BF1DCA40F300F64426 /* liolib.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6911DCA40F300F64426 /* liolib.c */; }; + F8E6C6C01DCA40F300F64426 /* llex.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6921DCA40F300F64426 /* llex.c */; }; + F8E6C6C11DCA40F300F64426 /* lmathlib.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6951DCA40F300F64426 /* lmathlib.c */; }; + F8E6C6C21DCA40F300F64426 /* lmem.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6961DCA40F300F64426 /* lmem.c */; }; + F8E6C6C31DCA40F300F64426 /* loadlib.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6981DCA40F300F64426 /* loadlib.c */; }; + F8E6C6C41DCA40F300F64426 /* lobject.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6991DCA40F300F64426 /* lobject.c */; }; + F8E6C6C51DCA40F300F64426 /* lopcodes.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C69B1DCA40F300F64426 /* lopcodes.c */; }; + F8E6C6C61DCA40F300F64426 /* loslib.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C69D1DCA40F300F64426 /* loslib.c */; }; + F8E6C6C71DCA40F300F64426 /* lparser.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C69E1DCA40F300F64426 /* lparser.c */; }; + F8E6C6C81DCA40F300F64426 /* lstate.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6A01DCA40F300F64426 /* lstate.c */; }; + F8E6C6C91DCA40F300F64426 /* lstring.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6A21DCA40F300F64426 /* lstring.c */; }; + F8E6C6CA1DCA40F300F64426 /* lstrlib.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6A41DCA40F300F64426 /* lstrlib.c */; }; + F8E6C6CB1DCA40F300F64426 /* ltable.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6A51DCA40F300F64426 /* ltable.c */; }; + F8E6C6CC1DCA40F300F64426 /* ltablib.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6A71DCA40F300F64426 /* ltablib.c */; }; + F8E6C6CD1DCA40F300F64426 /* ltm.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6A81DCA40F300F64426 /* ltm.c */; }; + F8E6C6CE1DCA40F300F64426 /* lundump.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6AD1DCA40F300F64426 /* lundump.c */; }; + F8E6C6CF1DCA40F300F64426 /* lvm.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6AF1DCA40F300F64426 /* lvm.c */; }; + F8E6C6D01DCA40F300F64426 /* lzio.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6B11DCA40F300F64426 /* lzio.c */; }; + F8E6C6D11DCA40F300F64426 /* print.c in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6B31DCA40F300F64426 /* print.c */; }; F8E6C6DE1DCA413A00F64426 /* clientopcodes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6D31DCA413A00F64426 /* clientopcodes.cpp */; }; F8E6C6DF1DCA413A00F64426 /* clientpackethandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6D51DCA413A00F64426 /* clientpackethandler.cpp */; }; F8E6C6E01DCA413A00F64426 /* connection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C6D61DCA413A00F64426 /* connection.cpp */; }; @@ -290,10 +319,10 @@ 4B35A9F51EEE018D00274961 /* scripting_server.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = scripting_server.cpp; path = ../../../../src/script/scripting_server.cpp; sourceTree = ""; }; 4B35A9F61EEE018D00274961 /* scripting_server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scripting_server.h; path = ../../../../src/script/scripting_server.h; sourceTree = ""; }; 844B495E228606B200EB60EF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 8465A76122A7D4500095B7CA /* MessageCatalog.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = MessageCatalog.hpp; sourceTree = ""; }; - 8465A76222A7D4500095B7CA /* libintl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libintl.h; sourceTree = ""; }; - 8465A76322A7D4500095B7CA /* Util.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Util.hpp; sourceTree = ""; }; - 8465A76422A7D4500095B7CA /* libintl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = libintl.cpp; sourceTree = ""; }; + 8465A76122A7D4500095B7CA /* MessageCatalog.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = MessageCatalog.hpp; path = ../../../../lib/intl/MessageCatalog.hpp; sourceTree = ""; }; + 8465A76222A7D4500095B7CA /* libintl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libintl.h; path = ../../../../lib/intl/libintl.h; sourceTree = ""; }; + 8465A76322A7D4500095B7CA /* Util.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Util.hpp; path = ../../../../lib/intl/Util.hpp; sourceTree = ""; }; + 8465A76422A7D4500095B7CA /* libintl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = libintl.cpp; path = ../../../../lib/intl/libintl.cpp; sourceTree = ""; }; 849C4F85209656D2005EB041 /* ru.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ru.lproj; sourceTree = ""; }; 8758CE009FCB7E91F4C84C28 /* libPods-MultiCraft.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MultiCraft.a"; sourceTree = BUILT_PRODUCTS_DIR; }; F810D7042080E48000D109B8 /* en.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; path = en.lproj; sourceTree = ""; }; @@ -301,7 +330,6 @@ F84D3A941DE79AB400ADE1A0 /* ads.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ads.mm; path = ../../Ads/ads.mm; sourceTree = ""; }; F85119A61F4476FC00BFA9AF /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../Pods/libCurlPod/lib/libcurl.a; sourceTree = ""; }; F856B5C21F55F7EE00FE9494 /* bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bg.png; path = ../../../../textures/base/bg.png; sourceTree = ""; }; - F85722881DDC74B700308383 /* libluajit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libluajit.a; path = ../Pods/LuaJITPod/lib/libluajit.a; sourceTree = ""; }; F87DC8B8210887C600393B64 /* mapgen_v7p.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mapgen_v7p.h; path = ../../../../src/mapgen_v7p.h; sourceTree = ""; }; F87DC8B9210887C700393B64 /* mapgen_v7p.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mapgen_v7p.cpp; path = ../../../../src/mapgen_v7p.cpp; sourceTree = ""; }; F8E6C4D91DCA3B7900F64426 /* MultiCraft.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MultiCraft.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -565,8 +593,61 @@ F8E6C66C1DCA403100F64426 /* inputhandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = inputhandler.h; path = ../../../../src/client/inputhandler.h; sourceTree = ""; }; F8E6C66D1DCA403100F64426 /* tile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tile.cpp; path = ../../../../src/client/tile.cpp; sourceTree = ""; }; F8E6C66E1DCA403100F64426 /* tile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tile.h; path = ../../../../src/client/tile.h; sourceTree = ""; }; - F8E6C6761DCA407400F64426 /* json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = json.h; path = ../../../../src/jsoncpp/json/json.h; sourceTree = ""; }; - F8E6C6771DCA407400F64426 /* jsoncpp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = jsoncpp.cpp; path = ../../../../src/jsoncpp/jsoncpp.cpp; sourceTree = ""; }; + F8E6C6761DCA407400F64426 /* json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = json.h; path = ../../../../lib/jsoncpp/json/json.h; sourceTree = ""; }; + F8E6C6771DCA407400F64426 /* jsoncpp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = jsoncpp.cpp; path = ../../../../lib/jsoncpp/jsoncpp.cpp; sourceTree = ""; }; + F8E6C67F1DCA40F300F64426 /* lapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lapi.c; path = ../../../../lib/lua/src/lapi.c; sourceTree = ""; }; + F8E6C6801DCA40F300F64426 /* lapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lapi.h; path = ../../../../lib/lua/src/lapi.h; sourceTree = ""; }; + F8E6C6811DCA40F300F64426 /* lauxlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lauxlib.c; path = ../../../../lib/lua/src/lauxlib.c; sourceTree = ""; }; + F8E6C6821DCA40F300F64426 /* lauxlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lauxlib.h; path = ../../../../lib/lua/src/lauxlib.h; sourceTree = ""; }; + F8E6C6831DCA40F300F64426 /* lbaselib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lbaselib.c; path = ../../../../lib/lua/src/lbaselib.c; sourceTree = ""; }; + F8E6C6841DCA40F300F64426 /* lcode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lcode.c; path = ../../../../lib/lua/src/lcode.c; sourceTree = ""; }; + F8E6C6851DCA40F300F64426 /* lcode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lcode.h; path = ../../../../lib/lua/src/lcode.h; sourceTree = ""; }; + F8E6C6861DCA40F300F64426 /* ldblib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldblib.c; path = ../../../../lib/lua/src/ldblib.c; sourceTree = ""; }; + F8E6C6871DCA40F300F64426 /* ldebug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldebug.c; path = ../../../../lib/lua/src/ldebug.c; sourceTree = ""; }; + F8E6C6881DCA40F300F64426 /* ldebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ldebug.h; path = ../../../../lib/lua/src/ldebug.h; sourceTree = ""; }; + F8E6C6891DCA40F300F64426 /* ldo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldo.c; path = ../../../../lib/lua/src/ldo.c; sourceTree = ""; }; + F8E6C68A1DCA40F300F64426 /* ldo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ldo.h; path = ../../../../lib/lua/src/ldo.h; sourceTree = ""; }; + F8E6C68B1DCA40F300F64426 /* ldump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldump.c; path = ../../../../lib/lua/src/ldump.c; sourceTree = ""; }; + F8E6C68C1DCA40F300F64426 /* lfunc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lfunc.c; path = ../../../../lib/lua/src/lfunc.c; sourceTree = ""; }; + F8E6C68D1DCA40F300F64426 /* lfunc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lfunc.h; path = ../../../../lib/lua/src/lfunc.h; sourceTree = ""; }; + F8E6C68E1DCA40F300F64426 /* lgc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lgc.c; path = ../../../../lib/lua/src/lgc.c; sourceTree = ""; }; + F8E6C68F1DCA40F300F64426 /* lgc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lgc.h; path = ../../../../lib/lua/src/lgc.h; sourceTree = ""; }; + F8E6C6901DCA40F300F64426 /* linit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = linit.c; path = ../../../../lib/lua/src/linit.c; sourceTree = ""; }; + F8E6C6911DCA40F300F64426 /* liolib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = liolib.c; path = ../../../../lib/lua/src/liolib.c; sourceTree = ""; }; + F8E6C6921DCA40F300F64426 /* llex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = llex.c; path = ../../../../lib/lua/src/llex.c; sourceTree = ""; }; + F8E6C6931DCA40F300F64426 /* llex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = llex.h; path = ../../../../lib/lua/src/llex.h; sourceTree = ""; }; + F8E6C6941DCA40F300F64426 /* llimits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = llimits.h; path = ../../../../lib/lua/src/llimits.h; sourceTree = ""; }; + F8E6C6951DCA40F300F64426 /* lmathlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmathlib.c; path = ../../../../lib/lua/src/lmathlib.c; sourceTree = ""; }; + F8E6C6961DCA40F300F64426 /* lmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmem.c; path = ../../../../lib/lua/src/lmem.c; sourceTree = ""; }; + F8E6C6971DCA40F300F64426 /* lmem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lmem.h; path = ../../../../lib/lua/src/lmem.h; sourceTree = ""; }; + F8E6C6981DCA40F300F64426 /* loadlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loadlib.c; path = ../../../../lib/lua/src/loadlib.c; sourceTree = ""; }; + F8E6C6991DCA40F300F64426 /* lobject.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lobject.c; path = ../../../../lib/lua/src/lobject.c; sourceTree = ""; }; + F8E6C69A1DCA40F300F64426 /* lobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lobject.h; path = ../../../../lib/lua/src/lobject.h; sourceTree = ""; }; + F8E6C69B1DCA40F300F64426 /* lopcodes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lopcodes.c; path = ../../../../lib/lua/src/lopcodes.c; sourceTree = ""; }; + F8E6C69C1DCA40F300F64426 /* lopcodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lopcodes.h; path = ../../../../lib/lua/src/lopcodes.h; sourceTree = ""; }; + F8E6C69D1DCA40F300F64426 /* loslib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loslib.c; path = ../../../../lib/lua/src/loslib.c; sourceTree = ""; }; + F8E6C69E1DCA40F300F64426 /* lparser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lparser.c; path = ../../../../lib/lua/src/lparser.c; sourceTree = ""; }; + F8E6C69F1DCA40F300F64426 /* lparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lparser.h; path = ../../../../lib/lua/src/lparser.h; sourceTree = ""; }; + F8E6C6A01DCA40F300F64426 /* lstate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstate.c; path = ../../../../lib/lua/src/lstate.c; sourceTree = ""; }; + F8E6C6A11DCA40F300F64426 /* lstate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lstate.h; path = ../../../../lib/lua/src/lstate.h; sourceTree = ""; }; + F8E6C6A21DCA40F300F64426 /* lstring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstring.c; path = ../../../../lib/lua/src/lstring.c; sourceTree = ""; }; + F8E6C6A31DCA40F300F64426 /* lstring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lstring.h; path = ../../../../lib/lua/src/lstring.h; sourceTree = ""; }; + F8E6C6A41DCA40F300F64426 /* lstrlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstrlib.c; path = ../../../../lib/lua/src/lstrlib.c; sourceTree = ""; }; + F8E6C6A51DCA40F300F64426 /* ltable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltable.c; path = ../../../../lib/lua/src/ltable.c; sourceTree = ""; }; + F8E6C6A61DCA40F300F64426 /* ltable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ltable.h; path = ../../../../lib/lua/src/ltable.h; sourceTree = ""; }; + F8E6C6A71DCA40F300F64426 /* ltablib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltablib.c; path = ../../../../lib/lua/src/ltablib.c; sourceTree = ""; }; + F8E6C6A81DCA40F300F64426 /* ltm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltm.c; path = ../../../../lib/lua/src/ltm.c; sourceTree = ""; }; + F8E6C6A91DCA40F300F64426 /* ltm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ltm.h; path = ../../../../lib/lua/src/ltm.h; sourceTree = ""; }; + F8E6C6AA1DCA40F300F64426 /* lua.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lua.h; path = ../../../../lib/lua/lib/lua.h; sourceTree = ""; }; + F8E6C6AB1DCA40F300F64426 /* luaconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = luaconf.h; path = ../../../../lib/lua/lib/luaconf.h; sourceTree = ""; }; + F8E6C6AC1DCA40F300F64426 /* lualib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lualib.h; path = ../../../../lib/lua/lib/lualib.h; sourceTree = ""; }; + F8E6C6AD1DCA40F300F64426 /* lundump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lundump.c; path = ../../../../lib/lua/src/lundump.c; sourceTree = ""; }; + F8E6C6AE1DCA40F300F64426 /* lundump.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lundump.h; path = ../../../../lib/lua/src/lundump.h; sourceTree = ""; }; + F8E6C6AF1DCA40F300F64426 /* lvm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lvm.c; path = ../../../../lib/lua/src/lvm.c; sourceTree = ""; }; + F8E6C6B01DCA40F300F64426 /* lvm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lvm.h; path = ../../../../lib/lua/src/lvm.h; sourceTree = ""; }; + F8E6C6B11DCA40F300F64426 /* lzio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lzio.c; path = ../../../../lib/lua/src/lzio.c; sourceTree = ""; }; + F8E6C6B21DCA40F300F64426 /* lzio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lzio.h; path = ../../../../lib/lua/src/lzio.h; sourceTree = ""; }; + F8E6C6B31DCA40F300F64426 /* print.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = print.c; path = ../../../../lib/lua/src/print.c; sourceTree = ""; }; F8E6C6D31DCA413A00F64426 /* clientopcodes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = clientopcodes.cpp; path = ../../../../src/network/clientopcodes.cpp; sourceTree = ""; }; F8E6C6D41DCA413A00F64426 /* clientopcodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = clientopcodes.h; path = ../../../../src/network/clientopcodes.h; sourceTree = ""; }; F8E6C6D51DCA413A00F64426 /* clientpackethandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = clientpackethandler.cpp; path = ../../../../src/network/clientpackethandler.cpp; sourceTree = ""; }; @@ -727,7 +808,6 @@ F8E6C7DB1DCA479200F64426 /* libogg.a in Frameworks */, F8E6C7DD1DCA47A300F64426 /* libvorbis.a in Frameworks */, F8E6C7DF1DCA47AF00F64426 /* libvorbisfile.a in Frameworks */, - F85722891DDC74B700308383 /* libluajit.a in Frameworks */, F85119A71F4476FC00BFA9AF /* libcurl.a in Frameworks */, EB4367AE23CAD13A43ADF4B1 /* libPods-MultiCraft.a in Frameworks */, ); @@ -754,7 +834,6 @@ 8465A76422A7D4500095B7CA /* libintl.cpp */, ); name = intl; - path = ../../../../lib/intl; sourceTree = ""; }; 87D06CD2CC310BE5E73639F4 /* Pods */ = { @@ -1106,6 +1185,7 @@ F8E6C5F01DCA3F9900F64426 /* voxelalgorithms.h */, F8E6C5F11DCA3F9900F64426 /* wieldmesh.cpp */, F8E6C5F21DCA3F9900F64426 /* wieldmesh.h */, + F8E6C67C1DCA40BC00F64426 /* lua */, 8465A76022A7D4500095B7CA /* intl */, ); name = src; @@ -1144,6 +1224,66 @@ name = json; sourceTree = ""; }; + F8E6C67C1DCA40BC00F64426 /* lua */ = { + isa = PBXGroup; + children = ( + F8E6C67F1DCA40F300F64426 /* lapi.c */, + F8E6C6801DCA40F300F64426 /* lapi.h */, + F8E6C6811DCA40F300F64426 /* lauxlib.c */, + F8E6C6821DCA40F300F64426 /* lauxlib.h */, + F8E6C6831DCA40F300F64426 /* lbaselib.c */, + F8E6C6841DCA40F300F64426 /* lcode.c */, + F8E6C6851DCA40F300F64426 /* lcode.h */, + F8E6C6861DCA40F300F64426 /* ldblib.c */, + F8E6C6871DCA40F300F64426 /* ldebug.c */, + F8E6C6881DCA40F300F64426 /* ldebug.h */, + F8E6C6891DCA40F300F64426 /* ldo.c */, + F8E6C68A1DCA40F300F64426 /* ldo.h */, + F8E6C68B1DCA40F300F64426 /* ldump.c */, + F8E6C68C1DCA40F300F64426 /* lfunc.c */, + F8E6C68D1DCA40F300F64426 /* lfunc.h */, + F8E6C68E1DCA40F300F64426 /* lgc.c */, + F8E6C68F1DCA40F300F64426 /* lgc.h */, + F8E6C6901DCA40F300F64426 /* linit.c */, + F8E6C6911DCA40F300F64426 /* liolib.c */, + F8E6C6921DCA40F300F64426 /* llex.c */, + F8E6C6931DCA40F300F64426 /* llex.h */, + F8E6C6941DCA40F300F64426 /* llimits.h */, + F8E6C6951DCA40F300F64426 /* lmathlib.c */, + F8E6C6961DCA40F300F64426 /* lmem.c */, + F8E6C6971DCA40F300F64426 /* lmem.h */, + F8E6C6981DCA40F300F64426 /* loadlib.c */, + F8E6C6991DCA40F300F64426 /* lobject.c */, + F8E6C69A1DCA40F300F64426 /* lobject.h */, + F8E6C69B1DCA40F300F64426 /* lopcodes.c */, + F8E6C69C1DCA40F300F64426 /* lopcodes.h */, + F8E6C69D1DCA40F300F64426 /* loslib.c */, + F8E6C69E1DCA40F300F64426 /* lparser.c */, + F8E6C69F1DCA40F300F64426 /* lparser.h */, + F8E6C6A01DCA40F300F64426 /* lstate.c */, + F8E6C6A11DCA40F300F64426 /* lstate.h */, + F8E6C6A21DCA40F300F64426 /* lstring.c */, + F8E6C6A31DCA40F300F64426 /* lstring.h */, + F8E6C6A41DCA40F300F64426 /* lstrlib.c */, + F8E6C6A51DCA40F300F64426 /* ltable.c */, + F8E6C6A61DCA40F300F64426 /* ltable.h */, + F8E6C6A71DCA40F300F64426 /* ltablib.c */, + F8E6C6A81DCA40F300F64426 /* ltm.c */, + F8E6C6A91DCA40F300F64426 /* ltm.h */, + F8E6C6AA1DCA40F300F64426 /* lua.h */, + F8E6C6AB1DCA40F300F64426 /* luaconf.h */, + F8E6C6AC1DCA40F300F64426 /* lualib.h */, + F8E6C6AD1DCA40F300F64426 /* lundump.c */, + F8E6C6AE1DCA40F300F64426 /* lundump.h */, + F8E6C6AF1DCA40F300F64426 /* lvm.c */, + F8E6C6B01DCA40F300F64426 /* lvm.h */, + F8E6C6B11DCA40F300F64426 /* lzio.c */, + F8E6C6B21DCA40F300F64426 /* lzio.h */, + F8E6C6B31DCA40F300F64426 /* print.c */, + ); + name = lua; + sourceTree = ""; + }; F8E6C6D21DCA412300F64426 /* network */ = { isa = PBXGroup; children = ( @@ -1349,7 +1489,6 @@ isa = PBXGroup; children = ( F85119A61F4476FC00BFA9AF /* libcurl.a */, - F85722881DDC74B700308383 /* libluajit.a */, F8E6C7DE1DCA47AF00F64426 /* libvorbisfile.a */, F8E6C7DC1DCA47A300F64426 /* libvorbis.a */, F8E6C7DA1DCA479200F64426 /* libogg.a */, @@ -1692,6 +1831,36 @@ F8E6C6281DCA3F9900F64426 /* light.cpp in Sources */, F8E6C60A1DCA3F9900F64426 /* database.cpp in Sources */, F8E6C6F91DCA41DB00F64426 /* c_types.cpp in Sources */, + F8E6C6BC1DCA40F300F64426 /* lfunc.c in Sources */, + F8E6C6B41DCA40F300F64426 /* lapi.c in Sources */, + F8E6C6B81DCA40F300F64426 /* ldblib.c in Sources */, + F8E6C6CA1DCA40F300F64426 /* lstrlib.c in Sources */, + F8E6C6C11DCA40F300F64426 /* lmathlib.c in Sources */, + F8E6C6C31DCA40F300F64426 /* loadlib.c in Sources */, + F8E6C6BA1DCA40F300F64426 /* ldo.c in Sources */, + F8E6C6CB1DCA40F300F64426 /* ltable.c in Sources */, + F8E6C6BD1DCA40F300F64426 /* lgc.c in Sources */, + F8E6C6CE1DCA40F300F64426 /* lundump.c in Sources */, + F8E6C6C21DCA40F300F64426 /* lmem.c in Sources */, + F8E6C6B91DCA40F300F64426 /* ldebug.c in Sources */, + F8E6C6BB1DCA40F300F64426 /* ldump.c in Sources */, + F8E6C6CF1DCA40F300F64426 /* lvm.c in Sources */, + F8E6C6C41DCA40F300F64426 /* lobject.c in Sources */, + F8E6C6C71DCA40F300F64426 /* lparser.c in Sources */, + F8E6C6D01DCA40F300F64426 /* lzio.c in Sources */, + F8E6C6C51DCA40F300F64426 /* lopcodes.c in Sources */, + F8E6C6C81DCA40F300F64426 /* lstate.c in Sources */, + F8E6C6BF1DCA40F300F64426 /* liolib.c in Sources */, + F8E6C6D11DCA40F300F64426 /* print.c in Sources */, + F8E6C6C91DCA40F300F64426 /* lstring.c in Sources */, + F8E6C6B51DCA40F300F64426 /* lauxlib.c in Sources */, + F8E6C6B61DCA40F300F64426 /* lbaselib.c in Sources */, + F8E6C6CC1DCA40F300F64426 /* ltablib.c in Sources */, + F8E6C6C61DCA40F300F64426 /* loslib.c in Sources */, + F8E6C6BE1DCA40F300F64426 /* linit.c in Sources */, + F8E6C6C01DCA40F300F64426 /* llex.c in Sources */, + F8E6C6CD1DCA40F300F64426 /* ltm.c in Sources */, + F8E6C6B71DCA40F300F64426 /* lcode.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1722,45 +1891,23 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - CLANG_USE_OPTIMIZATION_PROFILE = NO; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_SUSPICIOUS_MOVES = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = NO; GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; GCC_FAST_MATH = YES; - GCC_NO_COMMON_BLOCKS = NO; GCC_OPTIMIZATION_LEVEL = fast; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_UNROLL_LOOPS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 9.0; + LLVM_LTO = YES; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -1773,43 +1920,23 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - CLANG_USE_OPTIMIZATION_PROFILE = NO; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_SUSPICIOUS_MOVES = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_FAST_MATH = YES; - GCC_NO_COMMON_BLOCKS = NO; GCC_OPTIMIZATION_LEVEL = fast; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_UNROLL_LOOPS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 9.0; + LLVM_LTO = YES; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1822,13 +1949,7 @@ baseConfigurationReference = 32528F14AAB9EA0E9CAB8526 /* Pods-MultiCraft.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CLANG_USE_OPTIMIZATION_PROFILE = NO; - CLANG_WARN_DOCUMENTATION_COMMENTS = NO; - COPY_PHASE_STRIP = YES; - DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = R3RLJ9TW52; - ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", __IOS__, @@ -1839,31 +1960,57 @@ "USE_FREETYPE=1", "USE_CURSES=0", "USE_LEVELDB=1", - "USE_LUAJIT=1", + "USE_LUAJIT=0", "USE_SPATIAL=0", "USE_SYSTEM_GMP=0", "USE_REDIS=0", "HAVE_TOUCHSCREENGUI=1", - "DISABLE_CSM=1", ); HEADER_SEARCH_PATHS = ( "$(inherited)", "${SRCROOT}/../../../src", - "${SRCROOT}/../../../src/jsoncpp", "${SRCROOT}/../../../src/script", + "${SRCROOT}/../../../lib/lua/src", + "${SRCROOT}/../../../lib/jsoncpp", + "${SRCROOT}/../../../lib/intl", "${SRCROOT}/../deps/irrlicht/include", "${SRCROOT}/../Pods/libOggVorbisPod/include", "${SRCROOT}/../deps/freetype/include/freetype2", - "${SRCROOT}/../Pods/LuaJITPod/include", - "${SRCROOT}/../deps/intl/include", "${SRCROOT}/../Pods/libCurlPod/include", ); INFOPLIST_FILE = MultiCraft/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"${PODS_CONFIGURATION_BUILD_DIR}/PersonalizedAdConsent\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/SDVersion\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/leveldb-library\"", + "\"${PODS_ROOT}/Appodeal/APDAdColonyAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDAmazonAdsAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDAppLovinAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDAppodealAdExchangeAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDChartboostAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDFacebookAudienceAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDGoogleAdMobAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDInMobiAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDInnerActiveAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDIronSourceAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDMintegralAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDMyTargetAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDOpenXAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDSmaatoAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDStartAppAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDTapjoyAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDUnityAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDVungleAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDYandexAdapter.embeddedframework\"", + "\"${PODS_ROOT}/libCurlPod/lib\"", + "\"${PODS_ROOT}/libOggVorbisPod/lib\"", + ); OTHER_CFLAGS = ( "$(inherited)", "-isystem", @@ -1872,7 +2019,6 @@ "\"${PODS_ROOT}/Headers/Public/SDVersion\"", "-isystem", "\"${PODS_ROOT}/Headers/Public/SSZipArchive\"", - "-flto", "-fvisibility=hidden", "-fdata-sections", "-ffunction-sections", @@ -1883,15 +2029,11 @@ "-L${SRCROOT}/../deps/irrlicht", "-L$(SRCROOT)/../Pods/libOggVorbisPod/lib", "-L${SRCROOT}/../deps/freetype/lib", - "-L${SRCROOT}/../Pods/LuaJITPod/lib", - "-L${SRCROOT}/../deps/intl", "-L${SRCROOT}/../Pods/libCurlPod/lib", "-Wl,-dead_strip", ); PRODUCT_BUNDLE_IDENTIFIER = mobi.MultiCraft; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -1901,12 +2043,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CLANG_USE_OPTIMIZATION_PROFILE = NO; - CLANG_WARN_DOCUMENTATION_COMMENTS = NO; - COPY_PHASE_STRIP = YES; - DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = R3RLJ9TW52; - ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "NDEBUG=1", @@ -1918,31 +2055,57 @@ "USE_FREETYPE=1", "USE_CURSES=0", "USE_LEVELDB=1", - "USE_LUAJIT=1", + "USE_LUAJIT=0", "USE_SPATIAL=0", "USE_SYSTEM_GMP=0", "USE_REDIS=0", "HAVE_TOUCHSCREENGUI=1", - "DISABLE_CSM=1", ); HEADER_SEARCH_PATHS = ( "$(inherited)", "${SRCROOT}/../../../src", - "${SRCROOT}/../../../src/jsoncpp", "${SRCROOT}/../../../src/script", + "${SRCROOT}/../../../lib/lua/src", + "${SRCROOT}/../../../lib/jsoncpp", + "${SRCROOT}/../../../lib/intl", "${SRCROOT}/../deps/irrlicht/include", "${SRCROOT}/../Pods/libOggVorbisPod/include", "${SRCROOT}/../deps/freetype/include/freetype2", - "${SRCROOT}/../Pods/LuaJITPod/include", - "${SRCROOT}/../deps/intl/include", "${SRCROOT}/../Pods/libCurlPod/include", ); INFOPLIST_FILE = MultiCraft/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"${PODS_CONFIGURATION_BUILD_DIR}/PersonalizedAdConsent\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/SDVersion\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/leveldb-library\"", + "\"${PODS_ROOT}/Appodeal/APDAdColonyAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDAmazonAdsAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDAppLovinAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDAppodealAdExchangeAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDChartboostAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDFacebookAudienceAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDGoogleAdMobAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDInMobiAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDInnerActiveAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDIronSourceAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDMintegralAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDMyTargetAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDOpenXAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDSmaatoAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDStartAppAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDTapjoyAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDUnityAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDVungleAdapter.embeddedframework\"", + "\"${PODS_ROOT}/Appodeal/APDYandexAdapter.embeddedframework\"", + "\"${PODS_ROOT}/libCurlPod/lib\"", + "\"${PODS_ROOT}/libOggVorbisPod/lib\"", + ); OTHER_CFLAGS = ( "$(inherited)", "-isystem", @@ -1951,7 +2114,6 @@ "\"${PODS_ROOT}/Headers/Public/SDVersion\"", "-isystem", "\"${PODS_ROOT}/Headers/Public/SSZipArchive\"", - "-flto", "-fvisibility=hidden", "-fdata-sections", "-ffunction-sections", @@ -1962,15 +2124,11 @@ "-L${SRCROOT}/../deps/irrlicht", "-L$(SRCROOT)/../Pods/libOggVorbisPod/lib", "-L${SRCROOT}/../deps/freetype/lib", - "-L${SRCROOT}/../Pods/LuaJITPod/lib", - "-L${SRCROOT}/../deps/intl", "-L${SRCROOT}/../Pods/libCurlPod/lib", "-Wl,-dead_strip", ); PRODUCT_BUNDLE_IDENTIFIER = mobi.MultiCraft; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; diff --git a/build/iOS/MultiCraft/MultiCraft/Info.plist b/build/iOS/MultiCraft/MultiCraft/Info.plist index a45c8c58..38c37358 100755 --- a/build/iOS/MultiCraft/MultiCraft/Info.plist +++ b/build/iOS/MultiCraft/MultiCraft/Info.plist @@ -19,9 +19,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.2.0 + 1.2.1 CFBundleVersion - 47 + 49 LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/build/iOS/MultiCraft/MultiCraft/en.lproj/Localizable.strings b/build/iOS/MultiCraft/MultiCraft/en.lproj/Localizable.strings old mode 100644 new mode 100755 diff --git a/build/iOS/MultiCraft/MultiCraft/ioswrap.m b/build/iOS/MultiCraft/MultiCraft/ioswrap.m old mode 100644 new mode 100755 diff --git a/build/iOS/MultiCraft/MultiCraft/ru.lproj/Localizable.strings b/build/iOS/MultiCraft/MultiCraft/ru.lproj/Localizable.strings old mode 100644 new mode 100755 diff --git a/build/iOS/Podfile b/build/iOS/Podfile index 5a057572..13640c53 100755 --- a/build/iOS/Podfile +++ b/build/iOS/Podfile @@ -8,7 +8,6 @@ target 'MultiCraft' do pod 'SSZipArchive' pod 'leveldb-library' pod 'SDVersion', :git => 'https://github.com/MoNTE48/SDVersion' - pod 'LuaJITPod', :git => 'https://github.com/MoNTE48/LuaJITPod' pod 'libCurlPod', :git => 'https://github.com/MoNTE48/libCurlPod' pod 'libOggVorbisPod', :git => 'https://github.com/MoNTE48/libOggVorbisPod' diff --git a/build/iOS/deps/luajit.sh b/build/iOS/deps/luajit.sh index 128624bd..e3b37064 100755 --- a/build/iOS/deps/luajit.sh +++ b/build/iOS/deps/luajit.sh @@ -12,21 +12,16 @@ fi cd luajit-src -if [ ! -f .patched ]; then -patch -p0 <../../patches/luajit.patch -touch .patched -fi - # 32-bit make -j$(sysctl -n hw.ncpu) \ - HOST_CC="clang -m32 -arch i386" CROSS="$(dirname $IOS_CC)/" \ + DEFAULT_CC=clang HOST_CC="clang -m32 -arch i386" CROSS="$(dirname $IOS_CC)/" \ TARGET_FLAGS="${IOS_FLAGS_LUA/-arch arm64/}" TARGET_SYS=iOS \ -j$(sysctl -n hw.ncpu) mv src/libluajit.a tmp32.a make clean # 64-bit make -j$(sysctl -n hw.ncpu) \ - HOST_CC=clang CROSS="$(dirname $IOS_CC)/" \ + DEFAULT_CC=clang HOST_CC=clang CROSS="$(dirname $IOS_CC)/" \ TARGET_FLAGS="${IOS_FLAGS_LUA/-arch armv7/}" TARGET_SYS=iOS \ -j$(sysctl -n hw.ncpu) mv src/libluajit.a tmp64.a diff --git a/build/iOS/patches/luajit.patch b/build/iOS/patches/luajit.patch deleted file mode 100755 index a74dfe3a..00000000 --- a/build/iOS/patches/luajit.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/Makefile 2016-12-13 22:30:13.000000000 +0200 -+++ src/Makefile.new 2016-12-14 03:14:34.000000000 +0200 -@@ -166,6 +166,10 @@ - HOST_SYS= Windows - HOST_MSYS= cygwin - endif -+# Use Clang for macOS host. -+ ifeq (Darwin,$(HOST_SYS)) -+ DEFAULT_CC= clang -+ endif - endif - - ############################################################################## diff --git a/lib/lua/src/loslib.c b/lib/lua/src/loslib.c index da06a572..b8b55226 100644 --- a/lib/lua/src/loslib.c +++ b/lib/lua/src/loslib.c @@ -36,7 +36,11 @@ static int os_pushresult (lua_State *L, int i, const char *filename) { static int os_execute (lua_State *L) { +#ifndef __IOS__ lua_pushinteger(L, system(luaL_optstring(L, 1, NULL))); +#else + lua_pushnil(L); +#endif return 1; }