فهرست منبع

chore: update XCode Settings
chore: libjsoncpp.26.dylib

Sam Jaffe 5 ماه پیش
والد
کامیت
6a8b76b617
2فایلهای تغییر یافته به همراه16 افزوده شده و 8 حذف شده
  1. 15 7
      engine.xcodeproj/project.pbxproj
  2. 1 1
      engine.xcodeproj/xcshareddata/xcschemes/engine.xcscheme

+ 15 - 7
engine.xcodeproj/project.pbxproj

@@ -8,10 +8,9 @@
 
 /* Begin PBXBuildFile section */
 		CD592BED29C2A422009AC14E /* universe.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD592BEB29C2A422009AC14E /* universe.cxx */; };
+		CDA7996A2E132F550096B547 /* libjsoncpp.26.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CDA799692E132F550096B547 /* libjsoncpp.26.dylib */; };
 		CDD4759429C4B7A200BDB829 /* config.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CDD4759129C4B7A200BDB829 /* config.cxx */; };
 		CDD475C829C4D2BF00BDB829 /* libengine.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CD592BDB29C2A399009AC14E /* libengine.a */; };
-		CDD475D029C4D2F700BDB829 /* libjsoncpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CDD475CF29C4D2F700BDB829 /* libjsoncpp.a */; };
-		CDD475D129C4D2FC00BDB829 /* libjsoncpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CDD475CF29C4D2F700BDB829 /* libjsoncpp.a */; };
 		CDD475D229C4D30100BDB829 /* engine in Headers */ = {isa = PBXBuildFile; fileRef = CD592BE529C2A3E0009AC14E /* engine */; settings = {ATTRIBUTES = (Public, ); }; };
 		CDD475D329C4D32300BDB829 /* condition.h in Headers */ = {isa = PBXBuildFile; fileRef = CDD4759929C4BB0C00BDB829 /* condition.h */; };
 		CDD475D429C4D32400BDB829 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = CDD4759829C4BB0C00BDB829 /* config.h */; };
@@ -153,6 +152,7 @@
 		CD592BF229C2A506009AC14E /* forwards.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = forwards.h; sourceTree = "<group>"; };
 		CD592BF329C2A531009AC14E /* universe.tpp */ = {isa = PBXFileReference; lastKnownFileType = text; path = universe.tpp; sourceTree = "<group>"; };
 		CD592C0E29C3D1E7009AC14E /* mailbox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mailbox.h; sourceTree = "<group>"; };
+		CDA799692E132F550096B547 /* libjsoncpp.26.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libjsoncpp.26.dylib; path = ../../../../../../../../opt/homebrew/lib/libjsoncpp.26.dylib; sourceTree = "<group>"; };
 		CDD4759129C4B7A200BDB829 /* config.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = config.cxx; sourceTree = "<group>"; };
 		CDD4759729C4BB0C00BDB829 /* event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = event.h; sourceTree = "<group>"; };
 		CDD4759829C4BB0C00BDB829 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
@@ -161,7 +161,6 @@
 		CDD475A729C4CDBA00BDB829 /* string-utils.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "string-utils.xcodeproj"; path = "external/string-utils/string-utils.xcodeproj"; sourceTree = "<group>"; };
 		CDD475B129C4CDBF00BDB829 /* GoogleMock.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GoogleMock.xcodeproj; path = "../../../gmock-xcode-master/GoogleMock.xcodeproj"; sourceTree = "<group>"; };
 		CDD475C429C4D2BF00BDB829 /* engine-test.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "engine-test.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
-		CDD475CF29C4D2F700BDB829 /* libjsoncpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjsoncpp.a; path = ../../../../../../../../opt/local/lib/libjsoncpp.a; sourceTree = "<group>"; };
 		CDD475DA29C4D35400BDB829 /* xcode_gtest_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xcode_gtest_helper.h; sourceTree = "<group>"; };
 		CDD475DB29C4D35F00BDB829 /* config_test.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = config_test.cxx; sourceTree = "<group>"; };
 		CDD475DD29C4D36700BDB829 /* stub_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stub_config.h; sourceTree = "<group>"; };
@@ -180,7 +179,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CDD475D029C4D2F700BDB829 /* libjsoncpp.a in Frameworks */,
+				CDA7996A2E132F550096B547 /* libjsoncpp.26.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -189,7 +188,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				CDD475C829C4D2BF00BDB829 /* libengine.a in Frameworks */,
-				CDD475D129C4D2FC00BDB829 /* libjsoncpp.a in Frameworks */,
 				CDD4760229C4D99C00BDB829 /* libshared_random_generator.dylib in Frameworks */,
 				CDD4760329C4D9AE00BDB829 /* GoogleMock.framework in Frameworks */,
 			);
@@ -310,7 +308,7 @@
 		CDD475CE29C4D2F700BDB829 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				CDD475CF29C4D2F700BDB829 /* libjsoncpp.a */,
+				CDA799692E132F550096B547 /* libjsoncpp.26.dylib */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -409,7 +407,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1340;
-				LastUpgradeCheck = 1340;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					CD592BDA29C2A399009AC14E = {
 						CreatedOnToolsVersion = 13.4.1;
@@ -639,9 +637,11 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -703,9 +703,11 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -731,10 +733,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
+				DEAD_CODE_STRIPPING = YES;
 				EXECUTABLE_PREFIX = lib;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					/opt/local/lib,
+					/opt/homebrew/lib,
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -745,10 +749,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
+				DEAD_CODE_STRIPPING = YES;
 				EXECUTABLE_PREFIX = lib;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					/opt/local/lib,
+					/opt/homebrew/lib,
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -760,6 +766,7 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
+				DEAD_CODE_STRIPPING = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "engine-test/Info.plist";
 				INFOPLIST_KEY_LSApplicationCategoryType = "";
@@ -782,6 +789,7 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
+				DEAD_CODE_STRIPPING = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "engine-test/Info.plist";
 				INFOPLIST_KEY_LSApplicationCategoryType = "";

+ 1 - 1
engine.xcodeproj/xcshareddata/xcschemes/engine.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1340"
+   LastUpgradeVersion = "1640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"