Compare commits
21 Commits
ios-suppor
...
cadc4d7e60
| Author | SHA1 | Date | |
|---|---|---|---|
| cadc4d7e60 | |||
| 561e8a3691 | |||
| 59d4642413 | |||
| 3737143842 | |||
|
|
ce52bfd35c | ||
|
|
c70cd428fd | ||
| 1158644de7 | |||
| 03b62b60df | |||
| dfa6dc4221 | |||
| 8ea20b1da9 | |||
| 2b4ff27043 | |||
| ec76c0fc2c | |||
| 8708dc9c83 | |||
| 7d485fdcd7 | |||
| 976366d6bf | |||
| 663c1d4b3f | |||
| 0ef6822737 | |||
| 442eb2d9c3 | |||
| c0c5cbaa51 | |||
| afbd79d9de | |||
| 34858932f1 |
@@ -2441,8 +2441,13 @@
|
||||
F99D341D2F736AA100DC153E /* HttpClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HttpClient.h; path = ../../src/platform/HttpClient.h; sourceTree = "<group>"; };
|
||||
F99D341E2F736AA100DC153E /* HttpClient.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = HttpClient.cpp; path = ../../src/platform/HttpClient.cpp; sourceTree = "<group>"; };
|
||||
F99D34212F736AD400DC153E /* TextOption.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TextOption.h; path = ../../src/client/gui/components/TextOption.h; sourceTree = "<group>"; };
|
||||
<<<<<<< HEAD
|
||||
F99D34222F736AD400DC153E /* TextOption.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = TextOption.cpp; path = ../../src/client/gui/components/TextOption.cpp; };
|
||||
F99D34252F736AFB00DC153E /* OptionsFile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OptionsFile.h; path = ../../src/client/OptionsFile.h; sourceTree = "<group>"; sourceTree = "<group>"; };
|
||||
=======
|
||||
F99D34222F736AD400DC153E /* TextOption.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = TextOption.cpp; path = ../../src/client/gui/components/TextOption.cpp; sourceTree = "<unknown>"; };
|
||||
F99D34252F736AFB00DC153E /* OptionsFile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OptionsFile.h; path = ../../src/client/OptionsFile.h; sourceTree = "<group>"; };
|
||||
>>>>>>> ios-rebase
|
||||
F99D34262F736AFB00DC153E /* OptionsFile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OptionsFile.cpp; path = ../../src/client/OptionsFile.cpp; sourceTree = "<group>"; };
|
||||
F99D34292F736B6F00DC153E /* OptionsItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OptionsItem.h; path = ../../src/client/gui/components/OptionsItem.h; sourceTree = "<group>"; };
|
||||
F99D342A2F736B6F00DC153E /* OptionsItem.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OptionsItem.cpp; path = ../../src/client/gui/components/OptionsItem.cpp; sourceTree = "<group>"; };
|
||||
@@ -2463,9 +2468,12 @@
|
||||
F99D34492F7370CF00DC153E /* Slider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Slider.h; path = ../../src/client/gui/components/Slider.h; sourceTree = "<group>"; };
|
||||
F99D344A2F7370CF00DC153E /* Slider.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Slider.cpp; path = ../../src/client/gui/components/Slider.cpp; sourceTree = "<group>"; };
|
||||
F99D344D2F7372A100DC153E /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
F99F0FA82F84369F00F2B29A /* GrassColor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GrassColor.cpp; sourceTree = "<group>"; };
|
||||
F99F0FAB2F8436CE00F2B29A /* FoliageColor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FoliageColor.cpp; sourceTree = "<group>"; };
|
||||
F99F0FAE2F8436EB00F2B29A /* Color.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Color.cpp; sourceTree = "<group>"; };
|
||||
>>>>>>> ios-rebase
|
||||
/* End PBXFileReference section */
|
||||
|
||||
/* Begin PBXFrameworksBuildPhase section */
|
||||
@@ -5871,7 +5879,11 @@
|
||||
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
|
||||
<<<<<<< HEAD
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 14;
|
||||
=======
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12;
|
||||
>>>>>>> ios-rebase
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
|
||||
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "C93D3524-5C6F-466E-B12B-833663B7EAE0";
|
||||
@@ -5902,7 +5914,11 @@
|
||||
);
|
||||
INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
|
||||
<<<<<<< HEAD
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 14;
|
||||
=======
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12;
|
||||
>>>>>>> ios-rebase
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "com.mojang.mcpe-arm64";
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
@@ -5996,7 +6012,11 @@
|
||||
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
|
||||
<<<<<<< HEAD
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 14;
|
||||
=======
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12;
|
||||
>>>>>>> ios-rebase
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
|
||||
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "64BA8967-1A9A-4980-972C-42E75AD5E023";
|
||||
@@ -6028,7 +6048,11 @@
|
||||
);
|
||||
INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
|
||||
<<<<<<< HEAD
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 14;
|
||||
=======
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12;
|
||||
>>>>>>> ios-rebase
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
OTHER_CFLAGS = (
|
||||
"-DNS_BLOCK_ASSERTIONS=1",
|
||||
@@ -6094,7 +6118,11 @@
|
||||
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
|
||||
<<<<<<< HEAD
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 14;
|
||||
=======
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12;
|
||||
>>>>>>> ios-rebase
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
RUN_CLANG_STATIC_ANALYZER = NO;
|
||||
SDKROOT = iphoneos;
|
||||
@@ -6122,7 +6150,11 @@
|
||||
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
|
||||
<<<<<<< HEAD
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 14;
|
||||
=======
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12;
|
||||
>>>>>>> ios-rebase
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
|
||||
RUN_CLANG_STATIC_ANALYZER = NO;
|
||||
@@ -6155,7 +6187,11 @@
|
||||
);
|
||||
INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
|
||||
<<<<<<< HEAD
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 14;
|
||||
=======
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12;
|
||||
>>>>>>> ios-rebase
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "com.mojang.mcpe-arm64";
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
@@ -6190,7 +6226,11 @@
|
||||
);
|
||||
INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
|
||||
<<<<<<< HEAD
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 14;
|
||||
=======
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12;
|
||||
>>>>>>> ios-rebase
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "com.mojang.mcpe-arm64";
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
|
||||
Reference in New Issue
Block a user