From bbcfb0f810906d4e91fb624ce191d5afb765fff8 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Mon, 26 May 2014 18:31:53 +0800 Subject: [PATCH 1/2] Update Cocos2d-x --- frameworks/js-bindings/cocos2d-x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/js-bindings/cocos2d-x b/frameworks/js-bindings/cocos2d-x index 9dc0bce045..f2fc5e8642 160000 --- a/frameworks/js-bindings/cocos2d-x +++ b/frameworks/js-bindings/cocos2d-x @@ -1 +1 @@ -Subproject commit 9dc0bce0456363a7b0170e1824e2aa64e701f8df +Subproject commit f2fc5e8642ceed7adad1318bf87a1ccba2fe0269 From e4223ff8fe9086f22be62923b4218a1699c0b28c Mon Sep 17 00:00:00 2001 From: pandamicro Date: Mon, 26 May 2014 19:53:09 +0800 Subject: [PATCH 2/2] Issue #5335: Make default template work for iOS and Mac --- .../HelloJavascript.xcodeproj/project.pbxproj | 14 +++++-- .../HelloJavascript.xcodeproj/project.pbxproj | 38 ------------------- 2 files changed, 10 insertions(+), 42 deletions(-) diff --git a/templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj b/templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj index a53e7ae7a5..78672e1901 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj +++ b/templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj @@ -67,6 +67,8 @@ A922754C1517C094001B78AA /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A922754B1517C094001B78AA /* UIKit.framework */; }; A922754E1517C094001B78AA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A922754D1517C094001B78AA /* Foundation.framework */; }; A92275501517C094001B78AA /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A922754F1517C094001B78AA /* CoreGraphics.framework */; }; + BA6FEC4C19335FF300F5D174 /* jsb_ext_create_apis.js in Sources */ = {isa = PBXBuildFile; fileRef = BA6FEC4B19335FF300F5D174 /* jsb_ext_create_apis.js */; }; + BA6FEC4D19335FF300F5D174 /* jsb_ext_create_apis.js in Resources */ = {isa = PBXBuildFile; fileRef = BA6FEC4B19335FF300F5D174 /* jsb_ext_create_apis.js */; }; C03780EB18BEE0E400FE4F13 /* src in Resources */ = {isa = PBXBuildFile; fileRef = C03780EA18BEE0E400FE4F13 /* src */; }; C03780EC18BEE0E400FE4F13 /* src in Resources */ = {isa = PBXBuildFile; fileRef = C03780EA18BEE0E400FE4F13 /* src */; }; C037820C18BF77C500FE4F13 /* libjsbindings iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C037820918BF76AF00FE4F13 /* libjsbindings iOS.a */; }; @@ -317,6 +319,7 @@ A922754B1517C094001B78AA /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; A922754D1517C094001B78AA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; A922754F1517C094001B78AA /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + BA6FEC4B19335FF300F5D174 /* jsb_ext_create_apis.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb_ext_create_apis.js; path = "../../js-bindings/bindings/script/jsb_ext_create_apis.js"; sourceTree = ""; }; C03780EA18BEE0E400FE4F13 /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = ../../../src; sourceTree = ""; }; C037820118BF76AF00FE4F13 /* cocos2d_js_bindings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_js_bindings.xcodeproj; path = "../../js-bindings/bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj"; sourceTree = ""; }; C06E23CB18CEFE680093C81A /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; @@ -524,6 +527,7 @@ C0F9A1A218C6D1FC00C75ABD /* jsb_cocos2d_studio.js */, C0F9A1A418C6D1FC00C75ABD /* jsb_cocosbuilder.js */, 1AC34A0E18C99CA5007834C9 /* jsb_create_apis.js */, + BA6FEC4B19335FF300F5D174 /* jsb_ext_create_apis.js */, C0F9A1A518C6D1FC00C75ABD /* jsb_debugger.js */, C0F9A1A618C6D1FC00C75ABD /* jsb_deprecated.js */, 1AC34A0F18C99CA5007834C9 /* jsb_loaders.js */, @@ -747,6 +751,7 @@ 1AD7E0A918C9DBE3004817A6 /* main.js in Resources */, 1AD7E0A118C9DB84004817A6 /* jsb_boot.js in Resources */, 1AD7E0A218C9DB84004817A6 /* jsb_create_apis.js in Resources */, + BA6FEC4D19335FF300F5D174 /* jsb_ext_create_apis.js in Resources */, 1AD7E0A318C9DB84004817A6 /* jsb_loaders.js in Resources */, C0F9A1BC18C6D1FC00C75ABD /* jsb_cocos2d.js in Resources */, C0F9A1C418C6D1FC00C75ABD /* jsb_opengl_constants.js in Resources */, @@ -836,6 +841,7 @@ D4545227156E28EF00887EB5 /* AppDelegate.cpp in Sources */, 509D4AC817EBB2AB00697056 /* main.m in Sources */, 509D4ABC17EBB2AB00697056 /* AppController.mm in Sources */, + BA6FEC4C19335FF300F5D174 /* jsb_ext_create_apis.js in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -913,7 +919,7 @@ LIBRARY_SEARCH_PATHS = ""; OTHER_LDFLAGS = ""; SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../js-bindings/cocos2d-x/cocos/2d/platform/mac $(SRCROOT)/../../js-bindings/cocos2d-x/external/glfw3/include/mac $(SRCROOT)/../../js-bindings/external/spidermonkey/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../js-bindings/cocos2d-x/cocos/platform/mac $(SRCROOT)/../../js-bindings/cocos2d-x/external/glfw3/include/mac $(SRCROOT)/../../js-bindings/external/spidermonkey/include/mac"; }; name = Debug; }; @@ -934,7 +940,7 @@ LIBRARY_SEARCH_PATHS = ""; OTHER_LDFLAGS = ""; SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../js-bindings/cocos2d-x/cocos/2d/platform/mac $(SRCROOT)/../../js-bindings/cocos2d-x/external/glfw3/include/mac $(SRCROOT)/../../js-bindings/external/spidermonkey/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../js-bindings/cocos2d-x/cocos/platform/mac $(SRCROOT)/../../js-bindings/cocos2d-x/external/glfw3/include/mac $(SRCROOT)/../../js-bindings/external/spidermonkey/include/mac"; }; name = Release; }; @@ -1006,7 +1012,7 @@ OTHER_LDFLAGS = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../js-bindings/cocos2d-x/cocos/2d/platform/ios $(SRCROOT)/../../js-bindings/external/spidermonkey/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../js-bindings/cocos2d-x/cocos/platform/ios $(SRCROOT)/../../js-bindings/external/spidermonkey/include/ios"; }; name = Debug; }; @@ -1029,7 +1035,7 @@ OTHER_LDFLAGS = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../js-bindings/cocos2d-x/cocos/2d/platform/ios $(SRCROOT)/../../js-bindings/external/spidermonkey/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../js-bindings/cocos2d-x/cocos/platform/ios $(SRCROOT)/../../js-bindings/external/spidermonkey/include/ios"; }; name = Release; }; diff --git a/templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj b/templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj index 1bb76f0d17..1f59e57642 100644 --- a/templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj +++ b/templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj @@ -82,43 +82,24 @@ C0B29017192EEBB300D5DE97 /* rtres in Resources */ = {isa = PBXBuildFile; fileRef = C0B29016192EEBB300D5DE97 /* rtres */; }; C0B29018192EEBB300D5DE97 /* rtres in Resources */ = {isa = PBXBuildFile; fileRef = C0B29016192EEBB300D5DE97 /* rtres */; }; C0C2F37418AA0C66003976DA /* SimulatorApp.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0C2F37318AA0C66003976DA /* SimulatorApp.mm */; }; - C0E05756192B5EDB00D818D0 /* jsb_boot.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05743192B5EDB00D818D0 /* jsb_boot.js */; }; C0E05757192B5EDB00D818D0 /* jsb_boot.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05743192B5EDB00D818D0 /* jsb_boot.js */; }; - C0E05758192B5EDB00D818D0 /* jsb_chipmunk_constants.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05744192B5EDB00D818D0 /* jsb_chipmunk_constants.js */; }; C0E05759192B5EDB00D818D0 /* jsb_chipmunk_constants.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05744192B5EDB00D818D0 /* jsb_chipmunk_constants.js */; }; - C0E0575A192B5EDB00D818D0 /* jsb_chipmunk.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05745192B5EDB00D818D0 /* jsb_chipmunk.js */; }; C0E0575B192B5EDB00D818D0 /* jsb_chipmunk.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05745192B5EDB00D818D0 /* jsb_chipmunk.js */; }; - C0E0575C192B5EDB00D818D0 /* jsb_cocos2d_constants.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05746192B5EDB00D818D0 /* jsb_cocos2d_constants.js */; }; C0E0575D192B5EDB00D818D0 /* jsb_cocos2d_constants.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05746192B5EDB00D818D0 /* jsb_cocos2d_constants.js */; }; - C0E0575E192B5EDB00D818D0 /* jsb_cocos2d_extension.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05747192B5EDB00D818D0 /* jsb_cocos2d_extension.js */; }; C0E0575F192B5EDB00D818D0 /* jsb_cocos2d_extension.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05747192B5EDB00D818D0 /* jsb_cocos2d_extension.js */; }; - C0E05760192B5EDB00D818D0 /* jsb_cocos2d_studio.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05748192B5EDB00D818D0 /* jsb_cocos2d_studio.js */; }; C0E05761192B5EDB00D818D0 /* jsb_cocos2d_studio.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05748192B5EDB00D818D0 /* jsb_cocos2d_studio.js */; }; - C0E05762192B5EDB00D818D0 /* jsb_cocos2d_ui.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05749192B5EDB00D818D0 /* jsb_cocos2d_ui.js */; }; C0E05763192B5EDB00D818D0 /* jsb_cocos2d_ui.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05749192B5EDB00D818D0 /* jsb_cocos2d_ui.js */; }; - C0E05764192B5EDB00D818D0 /* jsb_cocos2d.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574A192B5EDB00D818D0 /* jsb_cocos2d.js */; }; C0E05765192B5EDB00D818D0 /* jsb_cocos2d.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574A192B5EDB00D818D0 /* jsb_cocos2d.js */; }; - C0E05766192B5EDB00D818D0 /* jsb_cocosbuilder.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574B192B5EDB00D818D0 /* jsb_cocosbuilder.js */; }; C0E05767192B5EDB00D818D0 /* jsb_cocosbuilder.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574B192B5EDB00D818D0 /* jsb_cocosbuilder.js */; }; - C0E05768192B5EDB00D818D0 /* jsb_create_apis.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574C192B5EDB00D818D0 /* jsb_create_apis.js */; }; C0E05769192B5EDB00D818D0 /* jsb_create_apis.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574C192B5EDB00D818D0 /* jsb_create_apis.js */; }; - C0E0576A192B5EDB00D818D0 /* jsb_debugger.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574D192B5EDB00D818D0 /* jsb_debugger.js */; }; C0E0576B192B5EDB00D818D0 /* jsb_debugger.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574D192B5EDB00D818D0 /* jsb_debugger.js */; }; - C0E0576C192B5EDB00D818D0 /* jsb_deprecated.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574E192B5EDB00D818D0 /* jsb_deprecated.js */; }; C0E0576D192B5EDB00D818D0 /* jsb_deprecated.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574E192B5EDB00D818D0 /* jsb_deprecated.js */; }; - C0E0576E192B5EDB00D818D0 /* jsb_ext_create_apis.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574F192B5EDB00D818D0 /* jsb_ext_create_apis.js */; }; C0E0576F192B5EDB00D818D0 /* jsb_ext_create_apis.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574F192B5EDB00D818D0 /* jsb_ext_create_apis.js */; }; - C0E05770192B5EDB00D818D0 /* jsb_loaders.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05750192B5EDB00D818D0 /* jsb_loaders.js */; }; C0E05771192B5EDB00D818D0 /* jsb_loaders.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05750192B5EDB00D818D0 /* jsb_loaders.js */; }; - C0E05772192B5EDB00D818D0 /* jsb_opengl_constants.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05751192B5EDB00D818D0 /* jsb_opengl_constants.js */; }; C0E05773192B5EDB00D818D0 /* jsb_opengl_constants.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05751192B5EDB00D818D0 /* jsb_opengl_constants.js */; }; - C0E05774192B5EDB00D818D0 /* jsb_opengl.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05752192B5EDB00D818D0 /* jsb_opengl.js */; }; C0E05775192B5EDB00D818D0 /* jsb_opengl.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05752192B5EDB00D818D0 /* jsb_opengl.js */; }; - C0E05776192B5EDB00D818D0 /* jsb_property_apis.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05753192B5EDB00D818D0 /* jsb_property_apis.js */; }; C0E05777192B5EDB00D818D0 /* jsb_property_apis.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05753192B5EDB00D818D0 /* jsb_property_apis.js */; }; - C0E05778192B5EDB00D818D0 /* jsb_property_impls.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05754192B5EDB00D818D0 /* jsb_property_impls.js */; }; C0E05779192B5EDB00D818D0 /* jsb_property_impls.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05754192B5EDB00D818D0 /* jsb_property_impls.js */; }; - C0E0577A192B5EDB00D818D0 /* jsb.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05755192B5EDB00D818D0 /* jsb.js */; }; C0E0577B192B5EDB00D818D0 /* jsb.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05755192B5EDB00D818D0 /* jsb.js */; }; C0E0577C192B5EF200D818D0 /* jsb_boot.js in Resources */ = {isa = PBXBuildFile; fileRef = C0E05743192B5EDB00D818D0 /* jsb_boot.js */; }; C0E0577D192B5EF200D818D0 /* jsb_chipmunk_constants.js in Resources */ = {isa = PBXBuildFile; fileRef = C0E05744192B5EDB00D818D0 /* jsb_chipmunk_constants.js */; }; @@ -943,32 +924,13 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C0E05766192B5EDB00D818D0 /* jsb_cocosbuilder.js in Sources */, 509D4AC917EBB2AB00697056 /* RootViewController.mm in Sources */, - C0E05758192B5EDB00D818D0 /* jsb_chipmunk_constants.js in Sources */, D4545227156E28EF00887EB5 /* AppDelegate.cpp in Sources */, - C0E0577A192B5EDB00D818D0 /* jsb.js in Sources */, C06C37881918E81100617BED /* ConfigParser.cpp in Sources */, - C0E05778192B5EDB00D818D0 /* jsb_property_impls.js in Sources */, - C0E05764192B5EDB00D818D0 /* jsb_cocos2d.js in Sources */, 509D4AC817EBB2AB00697056 /* main.m in Sources */, - C0E05756192B5EDB00D818D0 /* jsb_boot.js in Sources */, - C0E05762192B5EDB00D818D0 /* jsb_cocos2d_ui.js in Sources */, - C0E0575A192B5EDB00D818D0 /* jsb_chipmunk.js in Sources */, C033B524191B36AE00D06937 /* VisibleRect.cpp in Sources */, - C0E05774192B5EDB00D818D0 /* jsb_opengl.js in Sources */, - C0E05770192B5EDB00D818D0 /* jsb_loaders.js in Sources */, - C0E05776192B5EDB00D818D0 /* jsb_property_apis.js in Sources */, - C0E0576C192B5EDB00D818D0 /* jsb_deprecated.js in Sources */, - C0E05768192B5EDB00D818D0 /* jsb_create_apis.js in Sources */, 509D4ABC17EBB2AB00697056 /* AppController.mm in Sources */, C026DCC918928A2400B3EDE8 /* Runtime_ios-mac.mm in Sources */, - C0E0576A192B5EDB00D818D0 /* jsb_debugger.js in Sources */, - C0E0576E192B5EDB00D818D0 /* jsb_ext_create_apis.js in Sources */, - C0E05772192B5EDB00D818D0 /* jsb_opengl_constants.js in Sources */, - C0E05760192B5EDB00D818D0 /* jsb_cocos2d_studio.js in Sources */, - C0E0575E192B5EDB00D818D0 /* jsb_cocos2d_extension.js in Sources */, - C0E0575C192B5EDB00D818D0 /* jsb_cocos2d_constants.js in Sources */, C026DCC618928A1A00B3EDE8 /* Runtime.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0;