diff --git a/samples/Cpp/TestCpp/proj.mac/Icon.icns b/samples/Cpp/TestCpp/proj.mac/Icon.icns deleted file mode 100644 index 285dee82b3..0000000000 Binary files a/samples/Cpp/TestCpp/proj.mac/Icon.icns and /dev/null differ diff --git a/samples/Cpp/TestCpp/proj.mac/Icon.icns.REMOVED.git-id b/samples/Cpp/TestCpp/proj.mac/Icon.icns.REMOVED.git-id new file mode 100644 index 0000000000..0c90afdb6d --- /dev/null +++ b/samples/Cpp/TestCpp/proj.mac/Icon.icns.REMOVED.git-id @@ -0,0 +1 @@ +2040fc6fe624353ae1d3db50cd3d450f4fda5afc \ No newline at end of file diff --git a/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id b/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id index c77e83acd2..efbf8806ae 100644 --- a/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -6525e599db23af6e97431ff58db75979a289e203 \ No newline at end of file +b759f56a07f242b20e9c96f2a6cd49c4b5c9dc9b \ No newline at end of file diff --git a/template/multi-platform-cpp/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj b/template/multi-platform-cpp/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj index 4a449355c9..7e027bca7a 100644 --- a/template/multi-platform-cpp/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj +++ b/template/multi-platform-cpp/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj @@ -57,6 +57,12 @@ 5087E78617EB970100C73F5D /* Icon-76.png in Resources */ = {isa = PBXBuildFile; fileRef = 5087E77B17EB970100C73F5D /* Icon-76.png */; }; 5087E78917EB974C00C73F5D /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5087E78817EB974C00C73F5D /* AppKit.framework */; }; 5087E78B17EB975400C73F5D /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5087E78A17EB975400C73F5D /* OpenGL.framework */; }; + 50EF629617ECD46A001EB2F8 /* Icon-40.png in Resources */ = {isa = PBXBuildFile; fileRef = 50EF629217ECD46A001EB2F8 /* Icon-40.png */; }; + 50EF629717ECD46A001EB2F8 /* Icon-58.png in Resources */ = {isa = PBXBuildFile; fileRef = 50EF629317ECD46A001EB2F8 /* Icon-58.png */; }; + 50EF629817ECD46A001EB2F8 /* Icon-80.png in Resources */ = {isa = PBXBuildFile; fileRef = 50EF629417ECD46A001EB2F8 /* Icon-80.png */; }; + 50EF629917ECD46A001EB2F8 /* Icon-100.png in Resources */ = {isa = PBXBuildFile; fileRef = 50EF629517ECD46A001EB2F8 /* Icon-100.png */; }; + 50EF62A217ECD613001EB2F8 /* Icon-29.png in Resources */ = {isa = PBXBuildFile; fileRef = 50EF62A017ECD613001EB2F8 /* Icon-29.png */; }; + 50EF62A317ECD613001EB2F8 /* Icon-50.png in Resources */ = {isa = PBXBuildFile; fileRef = 50EF62A117ECD613001EB2F8 /* Icon-50.png */; }; BF171245129291EC00B8313A /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF170DB012928DE900B8313A /* OpenGLES.framework */; }; BF1712471292920000B8313A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BF170DB412928DE900B8313A /* libz.dylib */; }; BF1C47F01293687400B63C5D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF1C47EA1293683800B63C5D /* QuartzCore.framework */; }; @@ -276,6 +282,12 @@ 5087E77C17EB970100C73F5D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 5087E78817EB974C00C73F5D /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; 5087E78A17EB975400C73F5D /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; + 50EF629217ECD46A001EB2F8 /* Icon-40.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-40.png"; sourceTree = ""; }; + 50EF629317ECD46A001EB2F8 /* Icon-58.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-58.png"; sourceTree = ""; }; + 50EF629417ECD46A001EB2F8 /* Icon-80.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-80.png"; sourceTree = ""; }; + 50EF629517ECD46A001EB2F8 /* Icon-100.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-100.png"; sourceTree = ""; }; + 50EF62A017ECD613001EB2F8 /* Icon-29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-29.png"; sourceTree = ""; }; + 50EF62A117ECD613001EB2F8 /* Icon-50.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-50.png"; sourceTree = ""; }; BF170DB012928DE900B8313A /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; BF170DB412928DE900B8313A /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; BF1C47EA1293683800B63C5D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; @@ -451,6 +463,12 @@ 5087E77217EB970100C73F5D /* Default-568h@2x.png */, 5087E77317EB970100C73F5D /* Default.png */, 5087E77417EB970100C73F5D /* Default@2x.png */, + 50EF62A017ECD613001EB2F8 /* Icon-29.png */, + 50EF62A117ECD613001EB2F8 /* Icon-50.png */, + 50EF629217ECD46A001EB2F8 /* Icon-40.png */, + 50EF629317ECD46A001EB2F8 /* Icon-58.png */, + 50EF629417ECD46A001EB2F8 /* Icon-80.png */, + 50EF629517ECD46A001EB2F8 /* Icon-100.png */, 5087E77517EB970100C73F5D /* Icon-114.png */, 5087E77617EB970100C73F5D /* Icon-120.png */, 5087E77717EB970100C73F5D /* Icon-144.png */, @@ -529,6 +547,11 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 0500; + TargetAttributes = { + 1D6058900D05DD3D006BFB54 = { + DevelopmentTeam = MDDB52YB8L; + }; + }; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "HelloCpp" */; compatibilityVersion = "Xcode 3.2"; @@ -665,16 +688,22 @@ 5087E78117EB970100C73F5D /* Icon-120.png in Resources */, 5087E78617EB970100C73F5D /* Icon-76.png in Resources */, 5087E77F17EB970100C73F5D /* Default@2x.png in Resources */, + 50EF629917ECD46A001EB2F8 /* Icon-100.png in Resources */, 1AFAF8BC16D35E4900DB1158 /* CloseNormal.png in Resources */, 5087E78317EB970100C73F5D /* Icon-152.png in Resources */, 5087E77D17EB970100C73F5D /* Default-568h@2x.png in Resources */, 5087E78517EB970100C73F5D /* Icon-72.png in Resources */, 1AFAF8BD16D35E4900DB1158 /* CloseSelected.png in Resources */, + 50EF62A317ECD613001EB2F8 /* Icon-50.png in Resources */, 5087E78017EB970100C73F5D /* Icon-114.png in Resources */, 1AFAF8BE16D35E4900DB1158 /* HelloWorld.png in Resources */, + 50EF62A217ECD613001EB2F8 /* Icon-29.png in Resources */, + 50EF629617ECD46A001EB2F8 /* Icon-40.png in Resources */, 5087E78217EB970100C73F5D /* Icon-144.png in Resources */, + 50EF629817ECD46A001EB2F8 /* Icon-80.png in Resources */, 5087E78417EB970100C73F5D /* Icon-57.png in Resources */, 5087E77E17EB970100C73F5D /* Default.png in Resources */, + 50EF629717ECD46A001EB2F8 /* Icon-58.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -775,6 +804,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CODE_SIGN_IDENTITY = "iPhone Developer"; + COMPRESS_PNG_FILES = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -805,7 +835,6 @@ "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios/libraries\"", "\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"", ); - OTHER_CFLAGS = "-O2"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = ""; @@ -817,6 +846,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CODE_SIGN_IDENTITY = "iPhone Developer"; + COMPRESS_PNG_FILES = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ios/Prefix.pch; diff --git a/template/multi-platform-cpp/proj.ios_mac/mac/Icon.icns b/template/multi-platform-cpp/proj.ios_mac/mac/Icon.icns deleted file mode 100644 index 285dee82b3..0000000000 Binary files a/template/multi-platform-cpp/proj.ios_mac/mac/Icon.icns and /dev/null differ diff --git a/template/multi-platform-cpp/proj.ios_mac/mac/Icon.icns.REMOVED.git-id b/template/multi-platform-cpp/proj.ios_mac/mac/Icon.icns.REMOVED.git-id new file mode 100644 index 0000000000..0c90afdb6d --- /dev/null +++ b/template/multi-platform-cpp/proj.ios_mac/mac/Icon.icns.REMOVED.git-id @@ -0,0 +1 @@ +2040fc6fe624353ae1d3db50cd3d450f4fda5afc \ No newline at end of file diff --git a/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj b/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj index e2aff1abec..0601fd183a 100644 --- a/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj +++ b/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj @@ -36,6 +36,12 @@ 502380DF17EBB89A00990C9B /* libcocos2dx-extensions Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C31017865E8F00122817 /* libcocos2dx-extensions Mac.a */; }; 502380E017EBB89A00990C9B /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C31617865E8F00122817 /* libCocosDenshion Mac.a */; }; 502380E117EBB89A00990C9B /* libjsbindings Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C31817865E8F00122817 /* libjsbindings Mac.a */; }; + 5091731A17ECDF7A00D62437 /* Icon-29.png in Resources */ = {isa = PBXBuildFile; fileRef = 5091731417ECDF7A00D62437 /* Icon-29.png */; }; + 5091731B17ECDF7A00D62437 /* Icon-40.png in Resources */ = {isa = PBXBuildFile; fileRef = 5091731517ECDF7A00D62437 /* Icon-40.png */; }; + 5091731C17ECDF7A00D62437 /* Icon-50.png in Resources */ = {isa = PBXBuildFile; fileRef = 5091731617ECDF7A00D62437 /* Icon-50.png */; }; + 5091731D17ECDF7A00D62437 /* Icon-58.png in Resources */ = {isa = PBXBuildFile; fileRef = 5091731717ECDF7A00D62437 /* Icon-58.png */; }; + 5091731E17ECDF7A00D62437 /* Icon-80.png in Resources */ = {isa = PBXBuildFile; fileRef = 5091731817ECDF7A00D62437 /* Icon-80.png */; }; + 5091731F17ECDF7A00D62437 /* Icon-100.png in Resources */ = {isa = PBXBuildFile; fileRef = 5091731917ECDF7A00D62437 /* Icon-100.png */; }; 509D4A8117EBB24E00697056 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4545215156E28EF00887EB5 /* AppDelegate.cpp */; }; 509D4A8817EBB24E00697056 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A82F5FA169AC92500C4B13A /* libsqlite3.dylib */; }; 509D4A8917EBB24E00697056 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D454520B156E22BD00887EB5 /* libz.dylib */; }; @@ -227,6 +233,12 @@ 1AF4C34417865F1600122817 /* main.debug.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = main.debug.js; path = ../../../scripting/javascript/bindings/js/main.debug.js; sourceTree = ""; }; 466AF66C179FC7BE002EE9BB /* jsb_deprecated.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb_deprecated.js; path = ../../../scripting/javascript/bindings/js/jsb_deprecated.js; sourceTree = ""; }; 502380DB17EBB88200990C9B /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; }; + 5091731417ECDF7A00D62437 /* Icon-29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-29.png"; path = "ios/Icon-29.png"; sourceTree = ""; }; + 5091731517ECDF7A00D62437 /* Icon-40.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-40.png"; path = "ios/Icon-40.png"; sourceTree = ""; }; + 5091731617ECDF7A00D62437 /* Icon-50.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-50.png"; path = "ios/Icon-50.png"; sourceTree = ""; }; + 5091731717ECDF7A00D62437 /* Icon-58.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-58.png"; path = "ios/Icon-58.png"; sourceTree = ""; }; + 5091731817ECDF7A00D62437 /* Icon-80.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-80.png"; path = "ios/Icon-80.png"; sourceTree = ""; }; + 5091731917ECDF7A00D62437 /* Icon-100.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-100.png"; path = "ios/Icon-100.png"; sourceTree = ""; }; 509D4AAA17EBB24E00697056 /* Hello JavaScript Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Hello JavaScript Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 509D4AAB17EBB2AB00697056 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppController.h; path = ios/AppController.h; sourceTree = ""; }; 509D4AAC17EBB2AB00697056 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppController.mm; path = ios/AppController.mm; sourceTree = ""; }; @@ -368,6 +380,26 @@ name = "JS Common"; sourceTree = ""; }; + 5091732E17ECDF8A00D62437 /* Icons */ = { + isa = PBXGroup; + children = ( + 5091731417ECDF7A00D62437 /* Icon-29.png */, + 5091731517ECDF7A00D62437 /* Icon-40.png */, + 5091731617ECDF7A00D62437 /* Icon-50.png */, + 5091731717ECDF7A00D62437 /* Icon-58.png */, + 5091731817ECDF7A00D62437 /* Icon-80.png */, + 5091731917ECDF7A00D62437 /* Icon-100.png */, + 509D4AB017EBB2AB00697056 /* Icon-57.png */, + 509D4AB117EBB2AB00697056 /* Icon-72.png */, + 509D4AB217EBB2AB00697056 /* Icon-76.png */, + 509D4AB317EBB2AB00697056 /* Icon-114.png */, + 509D4AB417EBB2AB00697056 /* Icon-120.png */, + 509D4AB517EBB2AB00697056 /* Icon-144.png */, + 509D4AB617EBB2AB00697056 /* Icon-152.png */, + ); + name = Icons; + sourceTree = ""; + }; 509D4ACA17EBB2BE00697056 /* mac */ = { isa = PBXGroup; children = ( @@ -432,13 +464,7 @@ 509D4AAD17EBB2AB00697056 /* Default-568h@2x.png */, 509D4AAE17EBB2AB00697056 /* Default.png */, 509D4AAF17EBB2AB00697056 /* Default@2x.png */, - 509D4AB017EBB2AB00697056 /* Icon-57.png */, - 509D4AB117EBB2AB00697056 /* Icon-72.png */, - 509D4AB217EBB2AB00697056 /* Icon-76.png */, - 509D4AB317EBB2AB00697056 /* Icon-114.png */, - 509D4AB417EBB2AB00697056 /* Icon-120.png */, - 509D4AB517EBB2AB00697056 /* Icon-144.png */, - 509D4AB617EBB2AB00697056 /* Icon-152.png */, + 5091732E17ECDF8A00D62437 /* Icons */, 509D4AB717EBB2AB00697056 /* Info.plist */, 509D4AB817EBB2AB00697056 /* main.m */, 509D4AB917EBB2AB00697056 /* Prefix.pch */, @@ -669,12 +695,15 @@ 1AF4C35217865F7400122817 /* jsb_chipmunk.js in Resources */, 1AF4C35317865F7400122817 /* jsb_cocos2d_constants.js in Resources */, 509D4ABE17EBB2AB00697056 /* Default.png in Resources */, + 5091731E17ECDF7A00D62437 /* Icon-80.png in Resources */, + 5091731F17ECDF7A00D62437 /* Icon-100.png in Resources */, 509D4AC117EBB2AB00697056 /* Icon-72.png in Resources */, 1AF4C35417865F7400122817 /* jsb_cocos2d_extension.js in Resources */, 1AF4C35517865F7400122817 /* jsb_cocos2d.js in Resources */, 1AF4C35617865F7400122817 /* jsb_cocosbuilder.js in Resources */, 509D4AC017EBB2AB00697056 /* Icon-57.png in Resources */, 1AF4C35717865F7400122817 /* jsb_debugger.js in Resources */, + 5091731A17ECDF7A00D62437 /* Icon-29.png in Resources */, 1AF4C35817865F7400122817 /* jsb_opengl_constants.js in Resources */, 1AF4C35917865F7400122817 /* jsb_opengl.js in Resources */, 1AF4C35A17865F7400122817 /* jsb_sys.js in Resources */, @@ -687,9 +716,12 @@ 1AE4B40616D1FF4C003C6D1C /* main.js in Resources */, 509D4ABF17EBB2AB00697056 /* Default@2x.png in Resources */, 509D4AC217EBB2AB00697056 /* Icon-76.png in Resources */, + 5091731B17ECDF7A00D62437 /* Icon-40.png in Resources */, 1AE4B40416D1FECD003C6D1C /* res in Resources */, + 5091731C17ECDF7A00D62437 /* Icon-50.png in Resources */, 509D4AC417EBB2AB00697056 /* Icon-120.png in Resources */, 1AE4B40516D1FECD003C6D1C /* src in Resources */, + 5091731D17ECDF7A00D62437 /* Icon-58.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/template/multi-platform-js/proj.ios_mac/mac/Icon.icns b/template/multi-platform-js/proj.ios_mac/mac/Icon.icns deleted file mode 100644 index 285dee82b3..0000000000 Binary files a/template/multi-platform-js/proj.ios_mac/mac/Icon.icns and /dev/null differ diff --git a/template/multi-platform-js/proj.ios_mac/mac/Icon.icns.REMOVED.git-id b/template/multi-platform-js/proj.ios_mac/mac/Icon.icns.REMOVED.git-id new file mode 100644 index 0000000000..0c90afdb6d --- /dev/null +++ b/template/multi-platform-js/proj.ios_mac/mac/Icon.icns.REMOVED.git-id @@ -0,0 +1 @@ +2040fc6fe624353ae1d3db50cd3d450f4fda5afc \ No newline at end of file diff --git a/template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj b/template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj index 86343f277e..2b9b653096 100644 --- a/template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj +++ b/template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj @@ -80,6 +80,12 @@ 5023817817EBBE3400990C9B /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5023817417EBBE3400990C9B /* main.cpp */; }; 5023817A17EBBE8300990C9B /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5023817917EBBE8300990C9B /* OpenGLES.framework */; }; 50805AAF17EBBEAA004CFAD3 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50805AAE17EBBEAA004CFAD3 /* UIKit.framework */; }; + 5091733617ECE17A00D62437 /* Icon-29.png in Resources */ = {isa = PBXBuildFile; fileRef = 5091733017ECE17A00D62437 /* Icon-29.png */; }; + 5091733717ECE17A00D62437 /* Icon-40.png in Resources */ = {isa = PBXBuildFile; fileRef = 5091733117ECE17A00D62437 /* Icon-40.png */; }; + 5091733817ECE17A00D62437 /* Icon-50.png in Resources */ = {isa = PBXBuildFile; fileRef = 5091733217ECE17A00D62437 /* Icon-50.png */; }; + 5091733917ECE17A00D62437 /* Icon-58.png in Resources */ = {isa = PBXBuildFile; fileRef = 5091733317ECE17A00D62437 /* Icon-58.png */; }; + 5091733A17ECE17A00D62437 /* Icon-80.png in Resources */ = {isa = PBXBuildFile; fileRef = 5091733417ECE17A00D62437 /* Icon-80.png */; }; + 5091733B17ECE17A00D62437 /* Icon-100.png in Resources */ = {isa = PBXBuildFile; fileRef = 5091733517ECE17A00D62437 /* Icon-100.png */; }; 50D7C96517EBBECA005D0B91 /* libbox2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3E11786631700122817 /* libbox2d iOS.a */; }; 50D7C96617EBBECA005D0B91 /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3DF1786631700122817 /* libchipmunk iOS.a */; }; 50D7C96717EBBECA005D0B91 /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3DB1786631700122817 /* libcocos2dx iOS.a */; }; @@ -270,6 +276,12 @@ 5023817517EBBE3400990C9B /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = ""; }; 5023817917EBBE8300990C9B /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/OpenGLES.framework; sourceTree = DEVELOPER_DIR; }; 50805AAE17EBBEAA004CFAD3 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; + 5091733017ECE17A00D62437 /* Icon-29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-29.png"; sourceTree = ""; }; + 5091733117ECE17A00D62437 /* Icon-40.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-40.png"; sourceTree = ""; }; + 5091733217ECE17A00D62437 /* Icon-50.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-50.png"; sourceTree = ""; }; + 5091733317ECE17A00D62437 /* Icon-58.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-58.png"; sourceTree = ""; }; + 5091733417ECE17A00D62437 /* Icon-80.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-80.png"; sourceTree = ""; }; + 5091733517ECE17A00D62437 /* Icon-100.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-100.png"; sourceTree = ""; }; 50D7C96B17EBBEDF005D0B91 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; 50D7C96D17EBBEE6005D0B91 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; 50D7C96F17EBBEEC005D0B91 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; @@ -383,13 +395,7 @@ 5023810917EBBCAC00990C9B /* Default-568h@2x.png */, 5023810A17EBBCAC00990C9B /* Default.png */, 5023810B17EBBCAC00990C9B /* Default@2x.png */, - 5023810C17EBBCAC00990C9B /* Icon-114.png */, - 5023810D17EBBCAC00990C9B /* Icon-120.png */, - 5023810E17EBBCAC00990C9B /* Icon-144.png */, - 5023810F17EBBCAC00990C9B /* Icon-152.png */, - 5023811017EBBCAC00990C9B /* Icon-57.png */, - 5023811117EBBCAC00990C9B /* Icon-72.png */, - 5023811217EBBCAC00990C9B /* Icon-76.png */, + 5091734A17ECE18300D62437 /* Icons */, 5023811317EBBCAC00990C9B /* Info.plist */, 5023811417EBBCAC00990C9B /* main.m */, 5023811517EBBCAC00990C9B /* Prefix.pch */, @@ -410,6 +416,26 @@ path = mac; sourceTree = ""; }; + 5091734A17ECE18300D62437 /* Icons */ = { + isa = PBXGroup; + children = ( + 5091733017ECE17A00D62437 /* Icon-29.png */, + 5091733117ECE17A00D62437 /* Icon-40.png */, + 5091733217ECE17A00D62437 /* Icon-50.png */, + 5091733317ECE17A00D62437 /* Icon-58.png */, + 5091733417ECE17A00D62437 /* Icon-80.png */, + 5091733517ECE17A00D62437 /* Icon-100.png */, + 5023810C17EBBCAC00990C9B /* Icon-114.png */, + 5023810D17EBBCAC00990C9B /* Icon-120.png */, + 5023810E17EBBCAC00990C9B /* Icon-144.png */, + 5023810F17EBBCAC00990C9B /* Icon-152.png */, + 5023811017EBBCAC00990C9B /* Icon-57.png */, + 5023811117EBBCAC00990C9B /* Icon-72.png */, + 5023811217EBBCAC00990C9B /* Icon-76.png */, + ); + name = Icons; + sourceTree = ""; + }; F293B3BD15EB7BE500256477 = { isa = PBXGroup; children = ( @@ -530,6 +556,11 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 0500; + TargetAttributes = { + F293B3C715EB7BE500256477 = { + DevelopmentTeam = MDDB52YB8L; + }; + }; }; buildConfigurationList = F293B3C215EB7BE500256477 /* Build configuration list for PBXProject "HelloLua" */; compatibilityVersion = "Xcode 3.2"; @@ -693,16 +724,19 @@ buildActionMask = 2147483647; files = ( 5023811D17EBBCAC00990C9B /* Icon-120.png in Resources */, + 5091733B17ECE17A00D62437 /* Icon-100.png in Resources */, 1AC3622F16D47C5C000847F2 /* background.mp3 in Resources */, 1AC3623016D47C5C000847F2 /* background.ogg in Resources */, 1AC3623116D47C5C000847F2 /* crop.png in Resources */, 1AC3623216D47C5C000847F2 /* dog.png in Resources */, 5023811B17EBBCAC00990C9B /* Default@2x.png in Resources */, 1AC3623316D47C5C000847F2 /* effect1.wav in Resources */, + 5091733617ECE17A00D62437 /* Icon-29.png in Resources */, 5023811917EBBCAC00990C9B /* Default-568h@2x.png in Resources */, 1AC3623416D47C5C000847F2 /* farm.jpg in Resources */, 1AC3623516D47C5C000847F2 /* fonts in Resources */, 1AC3623616D47C5C000847F2 /* hello.lua in Resources */, + 5091733917ECE17A00D62437 /* Icon-58.png in Resources */, 1AC3623716D47C5C000847F2 /* hello2.lua in Resources */, 1AC3623816D47C5C000847F2 /* land.png in Resources */, 5023811F17EBBCAC00990C9B /* Icon-152.png in Resources */, @@ -710,15 +744,18 @@ 1AC3623916D47C5C000847F2 /* menu1.png in Resources */, 1AC3623A16D47C5C000847F2 /* menu2.png in Resources */, 5023812217EBBCAC00990C9B /* Icon-76.png in Resources */, + 5091733A17ECE17A00D62437 /* Icon-80.png in Resources */, 1A0227AC17A3AA3500B867AD /* AudioEngine.lua in Resources */, 1A0227AD17A3AA3500B867AD /* CCBReaderLoad.lua in Resources */, 1A0227AE17A3AA3500B867AD /* Cocos2dConstants.lua in Resources */, 1A0227AF17A3AA3500B867AD /* Deprecated.lua in Resources */, 1A0227B017A3AA3500B867AD /* DrawPrimitives.lua in Resources */, + 5091733717ECE17A00D62437 /* Icon-40.png in Resources */, 1A0227B117A3AA3500B867AD /* Opengl.lua in Resources */, 5023811E17EBBCAC00990C9B /* Icon-144.png in Resources */, 5023811A17EBBCAC00990C9B /* Default.png in Resources */, 1A0227B217A3AA3500B867AD /* OpenglConstants.lua in Resources */, + 5091733817ECE17A00D62437 /* Icon-50.png in Resources */, 1ADB273817CCA0C200634B5E /* Cocos2d.lua in Resources */, 1525771E17CEFBD400BE417B /* DeprecatedClass.lua in Resources */, 1525771F17CEFBD400BE417B /* DeprecatedEnum.lua in Resources */, @@ -933,6 +970,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CODE_SIGN_IDENTITY = "iPhone Developer"; COMPRESS_PNG_FILES = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -976,6 +1014,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CODE_SIGN_IDENTITY = "iPhone Developer"; COMPRESS_PNG_FILES = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ios/Prefix.pch; diff --git a/template/multi-platform-lua/proj.ios_mac/mac/Icon.icns b/template/multi-platform-lua/proj.ios_mac/mac/Icon.icns deleted file mode 100644 index 285dee82b3..0000000000 Binary files a/template/multi-platform-lua/proj.ios_mac/mac/Icon.icns and /dev/null differ diff --git a/template/multi-platform-lua/proj.ios_mac/mac/Icon.icns.REMOVED.git-id b/template/multi-platform-lua/proj.ios_mac/mac/Icon.icns.REMOVED.git-id new file mode 100644 index 0000000000..0c90afdb6d --- /dev/null +++ b/template/multi-platform-lua/proj.ios_mac/mac/Icon.icns.REMOVED.git-id @@ -0,0 +1 @@ +2040fc6fe624353ae1d3db50cd3d450f4fda5afc \ No newline at end of file