From cdfe6935835a79b831e1a9dc61bf2fd4950cf2ad Mon Sep 17 00:00:00 2001 From: billy1380 Date: Sat, 23 Mar 2013 16:04:51 +0000 Subject: [PATCH] - changed cocos2d mac project to support universal build and x86 - fixed issues associated with that --- cocos2dx/platform/mac/CCDirectorCaller.mm | 2 +- .../third_party/mac/libraries/libwebp.a.REMOVED.git-id | 2 +- .../cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- .../HelloCpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj | 8 ++++---- .../TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- .../HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cocos2dx/platform/mac/CCDirectorCaller.mm b/cocos2dx/platform/mac/CCDirectorCaller.mm index dcd6befed2..46309ee5b0 100755 --- a/cocos2dx/platform/mac/CCDirectorCaller.mm +++ b/cocos2dx/platform/mac/CCDirectorCaller.mm @@ -59,7 +59,7 @@ static id s_sharedDirectorCaller; -(void) dealloc { s_sharedDirectorCaller = nil; - CCLOG("cocos2d: deallocing CCDirectorCaller %x", (unsigned int)self); + CCLOG("cocos2d: deallocing CCDirectorCaller %x", self); if (displayLink) { CVDisplayLinkRelease(displayLink); } diff --git a/cocos2dx/platform/third_party/mac/libraries/libwebp.a.REMOVED.git-id b/cocos2dx/platform/third_party/mac/libraries/libwebp.a.REMOVED.git-id index ea13f7d85f..57cce30b7a 100644 --- a/cocos2dx/platform/third_party/mac/libraries/libwebp.a.REMOVED.git-id +++ b/cocos2dx/platform/third_party/mac/libraries/libwebp.a.REMOVED.git-id @@ -1 +1 @@ -581d190d221ecc4ab65b7fd571266951e0c81602 \ No newline at end of file +98a9f91fff796092bb7afab1f50fb11c3fe696d9 \ No newline at end of file diff --git a/cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id b/cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id index cfeeddfd88..cdb0cac2cf 100644 --- a/cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -76880c9d57ad50a4e121f0113e5d7c3394b33408 \ No newline at end of file +593eeddbb616c30af1167e9add361f1cd8e7996e \ No newline at end of file diff --git a/samples/Cpp/HelloCpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj b/samples/Cpp/HelloCpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj index 929e1408ff..80ec1ae874 100644 --- a/samples/Cpp/HelloCpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj +++ b/samples/Cpp/HelloCpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj @@ -315,7 +315,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_DYNAMIC_NO_PIC = NO; @@ -341,7 +341,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_C_LANGUAGE_STANDARD = "compiler-default"; @@ -359,7 +359,7 @@ 41851BB115B93C33004083E9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "compiler-default"; GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; @@ -394,7 +394,7 @@ 41851BB215B93C33004083E9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "compiler-default"; GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; diff --git a/samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id b/samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id index 2239bc5869..d243567c49 100644 --- a/samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -7328a9217c44d1618836e55d3df76897d5335ca9 \ No newline at end of file +4d8aa68dc5f18cfa35ec2a6c7d9c2a0632f05855 \ No newline at end of file diff --git a/template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id b/template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id index 2a36eca2f1..43109df6d9 100644 --- a/template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -9e877ea63dd2d4a53a7e283bf0f1c234d5ce69c8 \ No newline at end of file +1b7c61e11a503cf6c5b902591364c0394d67a545 \ No newline at end of file