Merge pull request #10038 from natural-law/v3

[ci skip] Rename the Xcode target of libsimulator.
This commit is contained in:
minggo 2015-01-16 14:40:22 +08:00
commit 7e12d08ae1
3 changed files with 42 additions and 40 deletions

View File

@ -53,8 +53,8 @@
9FC760451A677A4A00D1E6E7 /* SimpleConfigParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FC760411A67791200D1E6E7 /* SimpleConfigParser.cpp */; };
9FF504841A5E87B100AFDA55 /* ConsoleWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9FF504811A5E87B100AFDA55 /* ConsoleWindow.xib */; };
9FF504851A5E87B100AFDA55 /* ConsoleWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9FF504831A5E87B100AFDA55 /* ConsoleWindowController.m */; };
9FF504861A5E881200AFDA55 /* liblibsimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FF5047E1A5E86D600AFDA55 /* liblibsimulator.a */; };
9FF504871A5E88CE00AFDA55 /* liblibsimulator_iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FF504801A5E86D600AFDA55 /* liblibsimulator_iOS.a */; };
9FF504861A5E881200AFDA55 /* libsimulator Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FF5047E1A5E86D600AFDA55 /* libsimulator Mac.a */; };
9FF504871A5E88CE00AFDA55 /* libsimulator iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FF504801A5E86D600AFDA55 /* libsimulator iOS.a */; };
9FFC07361A4A764100AED399 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9FFC07341A4A764100AED399 /* MainMenu.xib */; };
C03781B918BF655400FE4F13 /* res in Resources */ = {isa = PBXBuildFile; fileRef = C03781B718BF655400FE4F13 /* res */; };
C03781BA18BF655400FE4F13 /* res in Resources */ = {isa = PBXBuildFile; fileRef = C03781B718BF655400FE4F13 /* res */; };
@ -240,7 +240,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9FF504861A5E881200AFDA55 /* liblibsimulator.a in Frameworks */,
9FF504861A5E881200AFDA55 /* libsimulator Mac.a in Frameworks */,
15427CEE198F24AF00DC375D /* libcocos2d Mac.a in Frameworks */,
15427CEC198F24A600DC375D /* libluacocos2d Mac.a in Frameworks */,
15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */,
@ -260,7 +260,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9FF504871A5E88CE00AFDA55 /* liblibsimulator_iOS.a in Frameworks */,
9FF504871A5E88CE00AFDA55 /* libsimulator iOS.a in Frameworks */,
5200BECA1A53D9A500AC45E4 /* Security.framework in Frameworks */,
15427CD5198F222200DC375D /* libluacocos2d iOS.a in Frameworks */,
15427CD3198F221400DC375D /* libcocos2d iOS.a in Frameworks */,
@ -362,8 +362,8 @@
9FF504791A5E86D600AFDA55 /* Products */ = {
isa = PBXGroup;
children = (
9FF5047E1A5E86D600AFDA55 /* liblibsimulator.a */,
9FF504801A5E86D600AFDA55 /* liblibsimulator_iOS.a */,
9FF5047E1A5E86D600AFDA55 /* libsimulator Mac.a */,
9FF504801A5E86D600AFDA55 /* libsimulator iOS.a */,
);
name = Products;
sourceTree = "<group>";
@ -571,17 +571,17 @@
remoteRef = 15A8A4241834BDA200142BE0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
9FF5047E1A5E86D600AFDA55 /* liblibsimulator.a */ = {
9FF5047E1A5E86D600AFDA55 /* libsimulator Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = liblibsimulator.a;
path = "libsimulator Mac.a";
remoteRef = 9FF5047D1A5E86D600AFDA55 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
9FF504801A5E86D600AFDA55 /* liblibsimulator_iOS.a */ = {
9FF504801A5E86D600AFDA55 /* libsimulator iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = liblibsimulator_iOS.a;
path = "libsimulator iOS.a";
remoteRef = 9FF5047F1A5E86D600AFDA55 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};

View File

@ -49,8 +49,8 @@
521A8E7119F0C3D200D177D7 /* Default-736h@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 521A8E6F19F0C3D200D177D7 /* Default-736h@3x.png */; };
9F7214271A5C1E4C00DAED06 /* libluacocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F7213E01A5C19ED00DAED06 /* libluacocos2d Mac.a */; };
9F7214281A5C1E5B00DAED06 /* libluacocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F7213E21A5C19ED00DAED06 /* libluacocos2d iOS.a */; };
9FD6FC0B1A5D27870028EDC6 /* liblibsimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD6FC081A5D26580028EDC6 /* liblibsimulator.a */; settings = {ATTRIBUTES = (Required, ); }; };
9FD6FC0C1A5D278E0028EDC6 /* liblibsimulator_iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD6FC0A1A5D26580028EDC6 /* liblibsimulator_iOS.a */; };
9FD6FC0B1A5D27870028EDC6 /* libsimulator Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD6FC081A5D26580028EDC6 /* libsimulator Mac.a */; settings = {ATTRIBUTES = (Required, ); }; };
9FD6FC0C1A5D278E0028EDC6 /* libsimulator iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD6FC0A1A5D26580028EDC6 /* libsimulator iOS.a */; };
9FD6FC721A5D2A820028EDC6 /* ConsoleWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9FD6FC6F1A5D2A820028EDC6 /* ConsoleWindow.xib */; };
9FD6FC731A5D2A820028EDC6 /* ConsoleWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9FD6FC711A5D2A820028EDC6 /* ConsoleWindowController.m */; };
9FFC07261A4A739200AED399 /* lang in Resources */ = {isa = PBXBuildFile; fileRef = 9FFC07061A4A739200AED399 /* lang */; };
@ -231,7 +231,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9FD6FC0B1A5D27870028EDC6 /* liblibsimulator.a in Frameworks */,
9FD6FC0B1A5D27870028EDC6 /* libsimulator Mac.a in Frameworks */,
9F7214271A5C1E4C00DAED06 /* libluacocos2d Mac.a in Frameworks */,
15427CEE198F24AF00DC375D /* libcocos2d Mac.a in Frameworks */,
15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */,
@ -251,7 +251,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9FD6FC0C1A5D278E0028EDC6 /* liblibsimulator_iOS.a in Frameworks */,
9FD6FC0C1A5D278E0028EDC6 /* libsimulator iOS.a in Frameworks */,
9F7214281A5C1E5B00DAED06 /* libluacocos2d iOS.a in Frameworks */,
5200BECA1A53D9A500AC45E4 /* Security.framework in Frameworks */,
15427CD3198F221400DC375D /* libcocos2d iOS.a in Frameworks */,
@ -350,8 +350,8 @@
9FD6FC031A5D26580028EDC6 /* Products */ = {
isa = PBXGroup;
children = (
9FD6FC081A5D26580028EDC6 /* liblibsimulator.a */,
9FD6FC0A1A5D26580028EDC6 /* liblibsimulator_iOS.a */,
9FD6FC081A5D26580028EDC6 /* libsimulator Mac.a */,
9FD6FC0A1A5D26580028EDC6 /* libsimulator iOS.a */,
);
name = Products;
sourceTree = "<group>";
@ -547,17 +547,17 @@
remoteRef = 9F7213E11A5C19ED00DAED06 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
9FD6FC081A5D26580028EDC6 /* liblibsimulator.a */ = {
9FD6FC081A5D26580028EDC6 /* libsimulator Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = liblibsimulator.a;
path = "libsimulator Mac.a";
remoteRef = 9FD6FC071A5D26580028EDC6 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
9FD6FC0A1A5D26580028EDC6 /* liblibsimulator_iOS.a */ = {
9FD6FC0A1A5D26580028EDC6 /* libsimulator iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = liblibsimulator_iOS.a;
path = "libsimulator iOS.a";
remoteRef = 9FD6FC091A5D26580028EDC6 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};

View File

@ -175,8 +175,8 @@
9F2F21BB1A635F1C006B8BF1 /* RuntimeProtocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RuntimeProtocol.cpp; sourceTree = "<group>"; };
9F2F21BC1A635F1C006B8BF1 /* RuntimeProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RuntimeProtocol.h; sourceTree = "<group>"; };
9F2F21C61A635FFF006B8BF1 /* Runtime_ios-mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "Runtime_ios-mac.mm"; sourceTree = "<group>"; };
9F7214351A5C271F00DAED06 /* liblibsimulator.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblibsimulator.a; sourceTree = BUILT_PRODUCTS_DIR; };
9F7214851A5C28BA00DAED06 /* liblibsimulator_iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblibsimulator_iOS.a; sourceTree = BUILT_PRODUCTS_DIR; };
9F7214351A5C271F00DAED06 /* libsimulator Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libsimulator Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; };
9F7214851A5C28BA00DAED06 /* libsimulator iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libsimulator iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
9FB638201A635BA300AAEC43 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
9FB638231A635BA300AAEC43 /* extension_set.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = extension_set.cc; sourceTree = "<group>"; };
9FB638241A635BA300AAEC43 /* extension_set.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = extension_set.h; sourceTree = "<group>"; };
@ -315,8 +315,8 @@
9F7214361A5C271F00DAED06 /* Products */ = {
isa = PBXGroup;
children = (
9F7214351A5C271F00DAED06 /* liblibsimulator.a */,
9F7214851A5C28BA00DAED06 /* liblibsimulator_iOS.a */,
9F7214351A5C271F00DAED06 /* libsimulator Mac.a */,
9F7214851A5C28BA00DAED06 /* libsimulator iOS.a */,
);
name = Products;
sourceTree = "<group>";
@ -609,9 +609,9 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
9F7214341A5C271F00DAED06 /* libsimulator */ = {
9F7214341A5C271F00DAED06 /* libsimulator Mac */ = {
isa = PBXNativeTarget;
buildConfigurationList = 9F7214401A5C271F00DAED06 /* Build configuration list for PBXNativeTarget "libsimulator" */;
buildConfigurationList = 9F7214401A5C271F00DAED06 /* Build configuration list for PBXNativeTarget "libsimulator Mac" */;
buildPhases = (
9F7214311A5C271F00DAED06 /* Sources */,
9F7214321A5C271F00DAED06 /* Frameworks */,
@ -621,14 +621,14 @@
);
dependencies = (
);
name = libsimulator;
productName = libsimulator;
productReference = 9F7214351A5C271F00DAED06 /* liblibsimulator.a */;
name = "libsimulator Mac";
productName = "libsimulator Mac";
productReference = 9F7214351A5C271F00DAED06 /* libsimulator Mac.a */;
productType = "com.apple.product-type.library.static";
};
9F7214841A5C28BA00DAED06 /* libsimulator_iOS */ = {
9F7214841A5C28BA00DAED06 /* libsimulator iOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 9F7214961A5C28BA00DAED06 /* Build configuration list for PBXNativeTarget "libsimulator_iOS" */;
buildConfigurationList = 9F7214961A5C28BA00DAED06 /* Build configuration list for PBXNativeTarget "libsimulator iOS" */;
buildPhases = (
9F7214811A5C28BA00DAED06 /* Sources */,
9F7214821A5C28BA00DAED06 /* Frameworks */,
@ -638,9 +638,9 @@
);
dependencies = (
);
name = libsimulator_iOS;
productName = libsimulator_iOS;
productReference = 9F7214851A5C28BA00DAED06 /* liblibsimulator_iOS.a */;
name = "libsimulator iOS";
productName = "libsimulator iOS";
productReference = 9F7214851A5C28BA00DAED06 /* libsimulator iOS.a */;
productType = "com.apple.product-type.library.static";
};
/* End PBXNativeTarget section */
@ -672,8 +672,8 @@
projectDirPath = "";
projectRoot = "";
targets = (
9F7214341A5C271F00DAED06 /* libsimulator */,
9F7214841A5C28BA00DAED06 /* libsimulator_iOS */,
9F7214341A5C271F00DAED06 /* libsimulator Mac */,
9F7214841A5C28BA00DAED06 /* libsimulator iOS */,
);
};
/* End PBXProject section */
@ -868,7 +868,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
CLANG_ENABLE_OBJC_ARC = NO;
EXECUTABLE_PREFIX = lib;
EXECUTABLE_PREFIX = "";
GCC_ENABLE_CPP_EXCEPTIONS = YES;
GCC_ENABLE_CPP_RTTI = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@ -896,7 +896,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
CLANG_ENABLE_OBJC_ARC = NO;
EXECUTABLE_PREFIX = lib;
EXECUTABLE_PREFIX = "";
GCC_ENABLE_CPP_EXCEPTIONS = YES;
GCC_ENABLE_CPP_RTTI = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@ -923,6 +923,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
EXECUTABLE_PREFIX = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ios/Prefix.pch;
GCC_PREPROCESSOR_DEFINITIONS = (
@ -947,6 +948,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
EXECUTABLE_PREFIX = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ios/Prefix.pch;
GCC_PREPROCESSOR_DEFINITIONS = (
@ -980,7 +982,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
9F7214401A5C271F00DAED06 /* Build configuration list for PBXNativeTarget "libsimulator" */ = {
9F7214401A5C271F00DAED06 /* Build configuration list for PBXNativeTarget "libsimulator Mac" */ = {
isa = XCConfigurationList;
buildConfigurations = (
9F7214411A5C271F00DAED06 /* Debug */,
@ -989,7 +991,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
9F7214961A5C28BA00DAED06 /* Build configuration list for PBXNativeTarget "libsimulator_iOS" */ = {
9F7214961A5C28BA00DAED06 /* Build configuration list for PBXNativeTarget "libsimulator iOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
9F7214971A5C28BA00DAED06 /* Debug */,