Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- changed cocos2d mac project to support universal build and x86 

- fixed issues associated with that
This commit is contained in:
billy1380 2013-03-23 16:04:51 +00:00
parent 636f07a43f
commit cdfe693583
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/platform/mac/CCDirectorCaller.mm
View File

@ -59,7 +59,7 @@ static id s_sharedDirectorCaller;
-(void) dealloc -(void) dealloc
{ {
s_sharedDirectorCaller = nil; s_sharedDirectorCaller = nil;
CCLOG("cocos2d: deallocing CCDirectorCaller %x", (unsigned int)self); CCLOG("cocos2d: deallocing CCDirectorCaller %x", self);
if (displayLink) { if (displayLink) {
CVDisplayLinkRelease(displayLink); CVDisplayLinkRelease(displayLink);
} }

2
cocos2dx/platform/third_party/mac/libraries/libwebp.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
581d190d221ecc4ab65b7fd571266951e0c81602 98a9f91fff796092bb7afab1f50fb11c3fe696d9

2
cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
76880c9d57ad50a4e121f0113e5d7c3394b33408 593eeddbb616c30af1167e9add361f1cd8e7996e

8
samples/Cpp/HelloCpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj
View File

@ -315,7 +315,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
@ -341,7 +341,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_C_LANGUAGE_STANDARD = "compiler-default";
@ -359,7 +359,7 @@
41851BB115B93C33004083E9 /* Debug */ = { 41851BB115B93C33004083E9 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "compiler-default"; CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
@ -394,7 +394,7 @@
41851BB215B93C33004083E9 /* Release */ = { 41851BB215B93C33004083E9 /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "compiler-default"; CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = NO;

2
samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
7328a9217c44d1618836e55d3df76897d5335ca9 4d8aa68dc5f18cfa35ec2a6c7d9c2a0632f05855

2
template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
9e877ea63dd2d4a53a7e283bf0f1c234d5ce69c8 1b7c61e11a503cf6c5b902591364c0394d67a545