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

iOS: revert 'use libintl from gettext' 

Doesn't work with older iOS versions.
master
MoNTE48 2020-11-08 22:35:39 +01:00 committed by Maksim
parent 5fb597a63f
commit 6628aaac96
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@
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 */; };
84894C68253A3DFB006726BE /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 84894C67253A3DF3006726BE /* libintl.a */; };
8465A76522A7D4500095B7CA /* libintl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8465A76422A7D4500095B7CA /* libintl.cpp */; };
849C4F86209656D3005EB041 /* ru.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 849C4F85209656D2005EB041 /* ru.lproj */; };
84A4380425535BA5002571D4 /* soft_oal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84A4380325535BA5002571D4 /* soft_oal.framework */; };
84A4380525535BA5002571D4 /* soft_oal.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84A4380325535BA5002571D4 /* soft_oal.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@ -308,7 +308,10 @@
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>"; };
84894C67253A3DF3006726BE /* libintl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libintl.a; path = ../deps/gettext/lib/libintl.a; 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>"; };
8465A76322A7D4500095B7CA /* Util.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Util.hpp; path = ../../../../lib/intl/Util.hpp; sourceTree = "<group>"; };
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>"; };
84A4380325535BA5002571D4 /* soft_oal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = soft_oal.framework; path = ../deps/soft_oal.framework; sourceTree = "<group>"; };
84B9C11524A4D82400016BCE /* ConsentAlertViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConsentAlertViewController.swift; sourceTree = "<group>"; };
@ -725,7 +728,6 @@
F8E6C7CD1DCA431B00F64426 /* Foundation.framework in Frameworks */,
84FE40E224439C2F008E29DB /* libcurl.a in Frameworks */,
F8E6C7D71DCA477600F64426 /* libfreetype.a in Frameworks */,
84894C68253A3DFB006726BE /* libintl.a in Frameworks */,
F8E6C7D51DCA476800F64426 /* libIrrlicht.a in Frameworks */,
84C32A3724AF7A4500445E92 /* Nantes in Frameworks */,
F8E6C7C91DCA430300F64426 /* OpenGLES.framework in Frameworks */,
@ -748,6 +750,17 @@
name = gmp;
sourceTree = "<group>";
};
8465A76022A7D4500095B7CA /* intl */ = {
isa = PBXGroup;
children = (
8465A76122A7D4500095B7CA /* MessageCatalog.hpp */,
8465A76222A7D4500095B7CA /* libintl.h */,
8465A76322A7D4500095B7CA /* Util.hpp */,
8465A76422A7D4500095B7CA /* libintl.cpp */,
);
name = intl;
sourceTree = "<group>";
};
84CD4A56248782720019B81D /* Main */ = {
isa = PBXGroup;
children = (
@ -1106,6 +1119,7 @@
F8E6C5F01DCA3F9900F64426 /* voxelalgorithms.h */,
F8E6C5F11DCA3F9900F64426 /* wieldmesh.cpp */,
F8E6C5F21DCA3F9900F64426 /* wieldmesh.h */,
8465A76022A7D4500095B7CA /* intl */,
);
name = src;
sourceTree = "<group>";
@ -1345,7 +1359,6 @@
F8E6C7C31DCA42F300F64426 /* Frameworks */ = {
isa = PBXGroup;
children = (
84894C67253A3DF3006726BE /* libintl.a */,
84FE40E124439C2F008E29DB /* libcurl.a */,
F8E6C7D61DCA477600F64426 /* libfreetype.a */,
F8E6C7D41DCA476800F64426 /* libIrrlicht.a */,
@ -1565,6 +1578,7 @@
F8E6C61E1DCA3F9900F64426 /* guiTable.cpp in Sources */,
F8E6C6291DCA3F9900F64426 /* localplayer.cpp in Sources */,
4B35A9C81EEDD22500274961 /* tileanimation.cpp in Sources */,
8465A76522A7D4500095B7CA /* libintl.cpp in Sources */,
F8E6C6221DCA3F9900F64426 /* imagefilters.cpp in Sources */,
F8E6C74D1DCA420A00F64426 /* l_mainmenu.cpp in Sources */,
F8E6C5F71DCA3F9900F64426 /* client.cpp in Sources */,
@ -1842,7 +1856,7 @@
"${SRCROOT}/../../../src/script",
"${SRCROOT}/../../../lib/jsoncpp",
"${SRCROOT}/../deps/freetype/include/freetype2",
"${SRCROOT}/../deps/gettext/include",
"${SRCROOT}/../../../lib/intl",
"${SRCROOT}/../deps/irrlicht/include",
"${SRCROOT}/../deps/libcurl/include",
);
@ -1869,7 +1883,6 @@
OTHER_LDFLAGS = (
"$(inherited)",
"-L${SRCROOT}/../deps/freetype/lib",
"-L${SRCROOT}/../deps/gettext/lib",
"-L${SRCROOT}/../deps/irrlicht",
"-L${SRCROOT}/../deps/libcurl/lib",
"-Wl,-dead_strip",
@ -1910,7 +1923,7 @@
"${SRCROOT}/../../../src/script",
"${SRCROOT}/../../../lib/jsoncpp",
"${SRCROOT}/../deps/freetype/include/freetype2",
"${SRCROOT}/../deps/gettext/include",
"${SRCROOT}/../../../lib/intl",
"${SRCROOT}/../deps/irrlicht/include",
"${SRCROOT}/../deps/libcurl/include",
);
@ -1937,7 +1950,6 @@
OTHER_LDFLAGS = (
"$(inherited)",
"-L${SRCROOT}/../deps/freetype/lib",
"-L${SRCROOT}/../deps/gettext/lib",
"-L${SRCROOT}/../deps/irrlicht",
"-L${SRCROOT}/../deps/libcurl/lib",
"-Wl,-dead_strip",

2
build/iOS/deps/libraries.sh
View File

@ -3,7 +3,7 @@
./irrlicht.sh
./freetype.sh
./libcurl.sh
./gettext.sh
#./gettext.sh ## doesn't work with older iOS versions
./openal.sh
#./luajit.sh ## requires an older version of macOS (with 32-bit support)