|
|
@@ -9,12 +9,13 @@
|
|
|
/* Begin PBXBuildFile section */
|
|
|
CD1C83562298B55F00825C4E /* fps_counter.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD1C83542298B55F00825C4E /* fps_counter.cxx */; };
|
|
|
CD1C8419229A095600825C4E /* text_engine.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD1C8417229A095600825C4E /* text_engine.cxx */; };
|
|
|
+ CD39A88F22F521DB00FEC384 /* libjsoncpp.1.9.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD39A88D22F521A200FEC384 /* libjsoncpp.1.9.0.dylib */; };
|
|
|
+ CD39A89022F5225500FEC384 /* libjsoncpp.1.9.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD39A88D22F521A200FEC384 /* libjsoncpp.1.9.0.dylib */; };
|
|
|
CD62D8462251A94C0023219A /* libgraphics.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD62D8452251A94C0023219A /* libgraphics.dylib */; };
|
|
|
CD62D8482251A9500023219A /* libmath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD62D8472251A9500023219A /* libmath.dylib */; };
|
|
|
CD62FCCE22904A8900376440 /* libengine.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CDB1F8AE1D7A30CD00700C6B /* libengine.dylib */; };
|
|
|
CD62FCD622904A9B00376440 /* GoogleMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD62FCBE22904A7C00376440 /* GoogleMock.framework */; };
|
|
|
CD62FD35229364DB00376440 /* entity.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD62FD33229364DB00376440 /* entity.cxx */; settings = {COMPILER_FLAGS = "-fvisibility=default"; }; };
|
|
|
- CD62FD3C229370E200376440 /* libjsoncpp.1.8.4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD62FD3922936E9C00376440 /* libjsoncpp.1.8.4.dylib */; };
|
|
|
CD62FD402293746900376440 /* serial.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD62FD3E2293746900376440 /* serial.cxx */; settings = {COMPILER_FLAGS = "-fvisibility=default"; }; };
|
|
|
CD7E87792295FAB400D877FE /* libgameutils.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD7E87782295FAB400D877FE /* libgameutils.dylib */; };
|
|
|
CD8064EF22D21EB500B9B4E4 /* libgraphics.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD62D8452251A94C0023219A /* libgraphics.dylib */; };
|
|
|
@@ -29,7 +30,6 @@
|
|
|
CDB1F8CC1D7A319A00700C6B /* scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDB1F8CA1D7A319A00700C6B /* scene.cpp */; settings = {COMPILER_FLAGS = "-fvisibility=default"; }; };
|
|
|
CDB1F8D21D7A32A300700C6B /* events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDB1F8D01D7A32A300700C6B /* events.cpp */; settings = {COMPILER_FLAGS = "-fvisibility=default"; }; };
|
|
|
CDED9C5122A4114F00AE5CE5 /* serial_test.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CDED9C5022A4114F00AE5CE5 /* serial_test.cxx */; };
|
|
|
- CDED9C5222A4130700AE5CE5 /* libjsoncpp.1.8.4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD62FD3922936E9C00376440 /* libjsoncpp.1.8.4.dylib */; };
|
|
|
/* End PBXBuildFile section */
|
|
|
|
|
|
/* Begin PBXContainerItemProxy section */
|
|
|
@@ -80,6 +80,7 @@
|
|
|
/* Begin PBXFileReference section */
|
|
|
CD1C83542298B55F00825C4E /* fps_counter.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = fps_counter.cxx; sourceTree = "<group>"; };
|
|
|
CD1C8417229A095600825C4E /* text_engine.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = text_engine.cxx; sourceTree = "<group>"; };
|
|
|
+ CD39A88D22F521A200FEC384 /* libjsoncpp.1.9.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libjsoncpp.1.9.0.dylib; path = ../../../../../../../opt/local/lib/libjsoncpp.1.9.0.dylib; sourceTree = "<group>"; };
|
|
|
CD62D8452251A94C0023219A /* libgraphics.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; path = libgraphics.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
|
|
|
CD62D8472251A9500023219A /* libmath.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; path = libmath.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
|
|
|
CD62FCB622904A7B00376440 /* GoogleMock.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GoogleMock.xcodeproj; path = "../../gmock-xcode-master/GoogleMock.xcodeproj"; sourceTree = "<group>"; };
|
|
|
@@ -108,10 +109,10 @@
|
|
|
isa = PBXFrameworksBuildPhase;
|
|
|
buildActionMask = 2147483647;
|
|
|
files = (
|
|
|
+ CD39A88F22F521DB00FEC384 /* libjsoncpp.1.9.0.dylib in Frameworks */,
|
|
|
CD8064FE22DA621200B9B4E4 /* libmath.dylib in Frameworks */,
|
|
|
CD8064F722D22BF500B9B4E4 /* libgameutils.dylib in Frameworks */,
|
|
|
CD8064EF22D21EB500B9B4E4 /* libgraphics.dylib in Frameworks */,
|
|
|
- CDED9C5222A4130700AE5CE5 /* libjsoncpp.1.8.4.dylib in Frameworks */,
|
|
|
CD62FCD622904A9B00376440 /* GoogleMock.framework in Frameworks */,
|
|
|
CD62FCCE22904A8900376440 /* libengine.dylib in Frameworks */,
|
|
|
);
|
|
|
@@ -121,8 +122,8 @@
|
|
|
isa = PBXFrameworksBuildPhase;
|
|
|
buildActionMask = 2147483647;
|
|
|
files = (
|
|
|
+ CD39A89022F5225500FEC384 /* libjsoncpp.1.9.0.dylib in Frameworks */,
|
|
|
CD7E87792295FAB400D877FE /* libgameutils.dylib in Frameworks */,
|
|
|
- CD62FD3C229370E200376440 /* libjsoncpp.1.8.4.dylib in Frameworks */,
|
|
|
CD62D8482251A9500023219A /* libmath.dylib in Frameworks */,
|
|
|
CD62D8462251A94C0023219A /* libgraphics.dylib in Frameworks */,
|
|
|
);
|
|
|
@@ -134,6 +135,7 @@
|
|
|
CD62D8442251A94C0023219A /* Frameworks */ = {
|
|
|
isa = PBXGroup;
|
|
|
children = (
|
|
|
+ CD39A88D22F521A200FEC384 /* libjsoncpp.1.9.0.dylib */,
|
|
|
CD7E87782295FAB400D877FE /* libgameutils.dylib */,
|
|
|
CD62FD3922936E9C00376440 /* libjsoncpp.1.8.4.dylib */,
|
|
|
CD62D8452251A94C0023219A /* libgraphics.dylib */,
|
|
|
@@ -268,7 +270,7 @@
|
|
|
isa = PBXProject;
|
|
|
attributes = {
|
|
|
LastSwiftUpdateCheck = 1010;
|
|
|
- LastUpgradeCheck = 1010;
|
|
|
+ LastUpgradeCheck = 1030;
|
|
|
ORGANIZATIONNAME = "Sam Jaffe";
|
|
|
TargetAttributes = {
|
|
|
CD62FCC822904A8900376440 = {
|
|
|
@@ -282,10 +284,11 @@
|
|
|
};
|
|
|
buildConfigurationList = CDB1F8A91D7A30CD00700C6B /* Build configuration list for PBXProject "engine" */;
|
|
|
compatibilityVersion = "Xcode 3.2";
|
|
|
- developmentRegion = English;
|
|
|
+ developmentRegion = en;
|
|
|
hasScannedForEncodings = 0;
|
|
|
knownRegions = (
|
|
|
en,
|
|
|
+ Base,
|
|
|
);
|
|
|
mainGroup = CDB1F8A51D7A30CD00700C6B;
|
|
|
productRefGroup = CDB1F8AF1D7A30CD00700C6B /* Products */;
|
|
|
@@ -470,6 +473,7 @@
|
|
|
CDB1F8B71D7A30CD00700C6B /* Debug */ = {
|
|
|
isa = XCBuildConfiguration;
|
|
|
buildSettings = {
|
|
|
+ CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
|
|
|
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
|
|
|
CLANG_CXX_LIBRARY = "libc++";
|
|
|
CLANG_ENABLE_MODULES = YES;
|
|
|
@@ -524,6 +528,7 @@
|
|
|
CDB1F8B81D7A30CD00700C6B /* Release */ = {
|
|
|
isa = XCBuildConfiguration;
|
|
|
buildSettings = {
|
|
|
+ CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
|
|
|
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
|
|
|
CLANG_CXX_LIBRARY = "libc++";
|
|
|
CLANG_ENABLE_MODULES = YES;
|