From 97d8d27eec3a7d4b504cd00b25e81a13f55d1266 Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Thu, 14 Aug 2014 21:58:40 +0800 Subject: [PATCH 1/3] Add LOCAL_WHOLE_STATIC_LIBRARIES for lua-template-runtime on android --- .../frameworks/runtime-src/proj.android/jni/Android.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk index e6225d828d..f007cdfe62 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk @@ -43,6 +43,11 @@ $(LOCAL_PATH)/../../../cocos2d-x/external LOCAL_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_lua_static LOCAL_WHOLE_STATIC_LIBRARIES += network_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += spine_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += extension_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += ui_lua_static include $(BUILD_SHARED_LIBRARY) From 55180c63e49271ae413328a0e8b7e503a2b132c4 Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Thu, 14 Aug 2014 23:22:24 +0800 Subject: [PATCH 2/3] Add modules register functions for lua-template-runtime on android --- .../runtime-src/Classes/lua_module_register.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/templates/lua-template-runtime/frameworks/runtime-src/Classes/lua_module_register.h b/templates/lua-template-runtime/frameworks/runtime-src/Classes/lua_module_register.h index 1ce4720324..43a2c175b2 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/Classes/lua_module_register.h +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/lua_module_register.h @@ -3,12 +3,22 @@ #include "network/lua_cocos2dx_network_manual.h" #include "cocosdenshion/lua_cocos2dx_cocosdenshion_manual.h" +#include "cocosbuilder/lua_cocos2dx_cocosbuilder_manual.h" +#include "cocostudio/lua_cocos2dx_coco_studio_manual.hpp" +#include "extension/lua_cocos2dx_extension_manual.h" +#include "ui/lua_cocos2dx_ui_manual.hpp" +#include "spine/lua_cocos2dx_spine_manual.hpp" int lua_module_register(lua_State* L) { register_network_module(L); register_cocosdenshion_module(L); + register_cocosbuilder_module(L); + register_cocostudio_module(L); + register_extension_module(L); + register_ui_moudle(L); + register_spine_module(L); return 1; } From 76a9382a91c32fdf5e1bc822a58e779c43942121 Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Fri, 15 Aug 2014 00:08:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?Rename=20folder=20names=20of=20cpp-template?= =?UTF-8?q?:=20=E2=80=98Classes=E2=80=99=E2=80=94>=E2=80=99src=E2=80=99=20?= =?UTF-8?q?,=E2=80=99Resource=E2=80=99=E2=80=94>=E2=80=99res=E2=80=99=20an?= =?UTF-8?q?d=20adjust=20the=20template=20project=20except=20wp8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/cpp-template-default/CMakeLists.txt | 12 +- .../proj.android/build-cfg.json | 2 +- .../proj.android/build_native.py | 2 +- .../proj.android/jni/Android.mk | 6 +- .../HelloCpp.xcodeproj/project.pbxproj | 362 +++++++++++------- .../cpp-template-default/proj.linux/main.cpp | 2 +- .../proj.win32/HelloCpp.vcxproj | 12 +- .../proj.win32/HelloCpp.vcxproj.filters | 22 +- .../proj.win32/HelloCpp.vcxproj.user | 4 +- .../{Resources => res}/CloseNormal.png | Bin .../{Resources => res}/CloseSelected.png | Bin .../{Resources => res}/HelloWorld.png | Bin .../{Resources => res}/fonts/Marker Felt.ttf | Bin .../{Classes => src}/AppDelegate.cpp | 0 .../{Classes => src}/AppDelegate.h | 0 .../{Classes => src}/HelloWorldScene.cpp | 0 .../{Classes => src}/HelloWorldScene.h | 0 17 files changed, 256 insertions(+), 168 deletions(-) rename templates/cpp-template-default/{Resources => res}/CloseNormal.png (100%) rename templates/cpp-template-default/{Resources => res}/CloseSelected.png (100%) rename templates/cpp-template-default/{Resources => res}/HelloWorld.png (100%) rename templates/cpp-template-default/{Resources => res}/fonts/Marker Felt.ttf (100%) rename templates/cpp-template-default/{Classes => src}/AppDelegate.cpp (100%) rename templates/cpp-template-default/{Classes => src}/AppDelegate.h (100%) rename templates/cpp-template-default/{Classes => src}/HelloWorldScene.cpp (100%) rename templates/cpp-template-default/{Classes => src}/HelloWorldScene.h (100%) diff --git a/templates/cpp-template-default/CMakeLists.txt b/templates/cpp-template-default/CMakeLists.txt index 97c0813e94..afee5d541d 100644 --- a/templates/cpp-template-default/CMakeLists.txt +++ b/templates/cpp-template-default/CMakeLists.txt @@ -57,16 +57,16 @@ endif() if( UNIX ) #assume linux set(GAME_SRC proj.linux/main.cpp - Classes/AppDelegate.cpp - Classes/HelloWorldScene.cpp + src/AppDelegate.cpp + src/HelloWorldScene.cpp ) elseif ( WIN32 ) set(GAME_SRC proj.win32/main.cpp proj.win32/main.h proj.win32/resource.h - Classes/AppDelegate.cpp - Classes/HelloWorldScene.cpp + src/AppDelegate.cpp + src/HelloWorldScene.cpp ) endif() @@ -244,14 +244,14 @@ if ( WIN32 ) #also copying dlls to binary directory for the executable to run pre_build(${APP_NAME} COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}/Resources - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/Resources ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/res ${APP_BIN_DIR}/Resources COMMAND ${CMAKE_COMMAND} -E copy ${COCOS2D_ROOT}/external/win32-specific/gles/prebuilt/glew32.dll ${APP_BIN_DIR}/${CMAKE_BUILD_TYPE} COMMAND ${CMAKE_COMMAND} -E copy ${COCOS2D_ROOT}/external/win32-specific/zlib/prebuilt/zlib1.dll ${APP_BIN_DIR}/${CMAKE_BUILD_TYPE} ) else() pre_build(${APP_NAME} COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}/Resources - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/Resources ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/res ${APP_BIN_DIR}/Resources ) endif() diff --git a/templates/cpp-template-default/proj.android/build-cfg.json b/templates/cpp-template-default/proj.android/build-cfg.json index 611f232c30..c719dc3cf2 100644 --- a/templates/cpp-template-default/proj.android/build-cfg.json +++ b/templates/cpp-template-default/proj.android/build-cfg.json @@ -6,7 +6,7 @@ ], "copy_resources": [ { - "from": "../Resources", + "from": "../res", "to": "" } ] diff --git a/templates/cpp-template-default/proj.android/build_native.py b/templates/cpp-template-default/proj.android/build_native.py index 97c9f89991..8f231b2478 100755 --- a/templates/cpp-template-default/proj.android/build_native.py +++ b/templates/cpp-template-default/proj.android/build_native.py @@ -114,7 +114,7 @@ def copy_resources(app_android_root): # copy resources os.mkdir(assets_dir) - resources_dir = os.path.join(app_android_root, "../Resources") + resources_dir = os.path.join(app_android_root, "../res") if os.path.isdir(resources_dir): copy_files(resources_dir, assets_dir) diff --git a/templates/cpp-template-default/proj.android/jni/Android.mk b/templates/cpp-template-default/proj.android/jni/Android.mk index cddef45aa8..55e22ede0b 100644 --- a/templates/cpp-template-default/proj.android/jni/Android.mk +++ b/templates/cpp-template-default/proj.android/jni/Android.mk @@ -11,10 +11,10 @@ LOCAL_MODULE := cocos2dcpp_shared LOCAL_MODULE_FILENAME := libcocos2dcpp LOCAL_SRC_FILES := hellocpp/main.cpp \ - ../../Classes/AppDelegate.cpp \ - ../../Classes/HelloWorldScene.cpp + ../../src/AppDelegate.cpp \ + ../../src/HelloWorldScene.cpp -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../src LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static diff --git a/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj b/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj index 15fe6d6f6b..8f4d492fbf 100644 --- a/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj +++ b/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj @@ -7,21 +7,26 @@ objects = { /* Begin PBXBuildFile section */ + 15A6DA93199CFB1100B56DBF /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15A6DA8F199CFB1100B56DBF /* AppDelegate.cpp */; }; + 15A6DA94199CFB1100B56DBF /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15A6DA8F199CFB1100B56DBF /* AppDelegate.cpp */; }; + 15A6DA95199CFB1100B56DBF /* HelloWorldScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15A6DA91199CFB1100B56DBF /* HelloWorldScene.cpp */; }; + 15A6DA96199CFB1100B56DBF /* HelloWorldScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15A6DA91199CFB1100B56DBF /* HelloWorldScene.cpp */; }; + 15A6DA9B199CFB9800B56DBF /* CloseNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A6DA98199CFB9800B56DBF /* CloseNormal.png */; }; + 15A6DA9C199CFB9800B56DBF /* CloseNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A6DA98199CFB9800B56DBF /* CloseNormal.png */; }; + 15A6DA9D199CFB9800B56DBF /* CloseSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A6DA99199CFB9800B56DBF /* CloseSelected.png */; }; + 15A6DA9E199CFB9800B56DBF /* CloseSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A6DA99199CFB9800B56DBF /* CloseSelected.png */; }; + 15A6DA9F199CFB9800B56DBF /* HelloWorld.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A6DA9A199CFB9800B56DBF /* HelloWorld.png */; }; + 15A6DAA0199CFB9800B56DBF /* HelloWorld.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A6DA9A199CFB9800B56DBF /* HelloWorld.png */; }; 1AC6FB1F180E996B004C840B /* libbox2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FAFF180E9839004C840B /* libbox2d Mac.a */; }; 1AC6FB20180E996B004C840B /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FAFD180E9839004C840B /* libchipmunk Mac.a */; }; - 1AC6FB21180E996B004C840B /* libcocos2dx Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FAF9180E9839004C840B /* libcocos2dx Mac.a */; }; - 1AC6FB22180E996B004C840B /* libcocos2dx-extensions Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FAFB180E9839004C840B /* libcocos2dx-extensions Mac.a */; }; - 1AC6FB23180E996B004C840B /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB01180E9839004C840B /* libCocosDenshion Mac.a */; }; + 1AC6FB21180E996B004C840B /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FAF9180E9839004C840B /* libcocos2d Mac.a */; }; + 1AC6FB22180E996B004C840B /* libextension Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FAFB180E9839004C840B /* libextension Mac.a */; }; + 1AC6FB23180E996B004C840B /* libcocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB01180E9839004C840B /* libcocosdenshion Mac.a */; }; 1AC6FB2E180E99EB004C840B /* libbox2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB0D180E9839004C840B /* libbox2d iOS.a */; }; 1AC6FB2F180E99EB004C840B /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB0B180E9839004C840B /* libchipmunk iOS.a */; }; - 1AC6FB30180E99EB004C840B /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB07180E9839004C840B /* libcocos2dx iOS.a */; }; - 1AC6FB31180E99EB004C840B /* libcocos2dx-extensions iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB09180E9839004C840B /* libcocos2dx-extensions iOS.a */; }; - 1AC6FB32180E99EB004C840B /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB0F180E9839004C840B /* libCocosDenshion iOS.a */; }; - 1AFAF8B716D35DE700DB1158 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFAF8B316D35DE700DB1158 /* AppDelegate.cpp */; }; - 1AFAF8B816D35DE700DB1158 /* HelloWorldScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFAF8B516D35DE700DB1158 /* HelloWorldScene.cpp */; }; - 1AFAF8BC16D35E4900DB1158 /* CloseNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8B916D35E4900DB1158 /* CloseNormal.png */; }; - 1AFAF8BD16D35E4900DB1158 /* CloseSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8BA16D35E4900DB1158 /* CloseSelected.png */; }; - 1AFAF8BE16D35E4900DB1158 /* HelloWorld.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8BB16D35E4900DB1158 /* HelloWorld.png */; }; + 1AC6FB30180E99EB004C840B /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB07180E9839004C840B /* libcocos2d iOS.a */; }; + 1AC6FB31180E99EB004C840B /* libextension iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB09180E9839004C840B /* libextension iOS.a */; }; + 1AC6FB32180E99EB004C840B /* libcocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB0F180E9839004C840B /* libcocosdenshion iOS.a */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; }; @@ -32,11 +37,6 @@ 503AE10517EB98FF00D1A890 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 503AE10317EB98FF00D1A890 /* main.cpp */; }; 503AE11217EB99EE00D1A890 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 503AE11117EB99EE00D1A890 /* libcurl.dylib */; }; 503AE11B17EB9C5A00D1A890 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 503AE11A17EB9C5A00D1A890 /* IOKit.framework */; }; - 5087E75317EB910900C73F5D /* CloseNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8B916D35E4900DB1158 /* CloseNormal.png */; }; - 5087E75417EB910900C73F5D /* CloseSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8BA16D35E4900DB1158 /* CloseSelected.png */; }; - 5087E75517EB910900C73F5D /* HelloWorld.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8BB16D35E4900DB1158 /* HelloWorld.png */; }; - 5087E75717EB910900C73F5D /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFAF8B316D35DE700DB1158 /* AppDelegate.cpp */; }; - 5087E75817EB910900C73F5D /* HelloWorldScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFAF8B516D35DE700DB1158 /* HelloWorldScene.cpp */; }; 5087E76317EB910900C73F5D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 5087E76517EB910900C73F5D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; }; 5087E76717EB910900C73F5D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BF170DB412928DE900B8313A /* libz.dylib */; }; @@ -72,6 +72,76 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 15A6DA7A199CFAFD00B56DBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B245F13A19766132001920FD; + remoteInfo = "libui Mac"; + }; + 15A6DA7C199CFAFD00B56DBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB484D1976716E00411E16; + remoteInfo = "libcocostudio Mac"; + }; + 15A6DA7E199CFAFD00B56DBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB47D2197669A100411E16; + remoteInfo = "libcocosbuilder Mac"; + }; + 15A6DA80199CFAFD00B56DBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB490119767F1F00411E16; + remoteInfo = "libspine Mac"; + }; + 15A6DA82199CFAFD00B56DBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB49C4197686CB00411E16; + remoteInfo = "libnetwork Mac"; + }; + 15A6DA84199CFAFD00B56DBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA6619775E92004493CC; + remoteInfo = "libui iOS"; + }; + 15A6DA86199CFAFD00B56DBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA6E19775EBB004493CC; + remoteInfo = "libcocostudio iOS"; + }; + 15A6DA88199CFAFD00B56DBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA7619775ECE004493CC; + remoteInfo = "libcocosbuilder iOS"; + }; + 15A6DA8A199CFAFD00B56DBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA7E19775EE1004493CC; + remoteInfo = "libspine iOS"; + }; + 15A6DA8C199CFAFD00B56DBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA8619775EF3004493CC; + remoteInfo = "libnetwork iOS"; + }; 1AC6FAF8180E9839004C840B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; @@ -107,20 +177,6 @@ remoteGlobalIDString = A03F2ED617814268006731B9; remoteInfo = "CocosDenshion Mac"; }; - 1AC6FB02180E9839004C840B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A03F31FD1781479B006731B9; - remoteInfo = "jsbindings Mac"; - }; - 1AC6FB04180E9839004C840B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1A6FB53017854BC300CDF010; - remoteInfo = "luabindings Mac"; - }; 1AC6FB06180E9839004C840B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; @@ -156,20 +212,6 @@ remoteGlobalIDString = A07A4FB4178387730073F6A7; remoteInfo = "CocosDenshion iOS"; }; - 1AC6FB10180E9839004C840B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A5030178387750073F6A7; - remoteInfo = "jsbindings iOS"; - }; - 1AC6FB12180E9839004C840B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1A119791178526AA00D62A44; - remoteInfo = "luabindings iOS"; - }; 1AC6FB15180E9959004C840B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; @@ -243,15 +285,15 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 15A6DA8F199CFB1100B56DBF /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AppDelegate.cpp; path = ../src/AppDelegate.cpp; sourceTree = ""; }; + 15A6DA90199CFB1100B56DBF /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ../src/AppDelegate.h; sourceTree = ""; }; + 15A6DA91199CFB1100B56DBF /* HelloWorldScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HelloWorldScene.cpp; path = ../src/HelloWorldScene.cpp; sourceTree = ""; }; + 15A6DA92199CFB1100B56DBF /* HelloWorldScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HelloWorldScene.h; path = ../src/HelloWorldScene.h; sourceTree = ""; }; + 15A6DA98199CFB9800B56DBF /* CloseNormal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CloseNormal.png; path = ../res/CloseNormal.png; sourceTree = ""; }; + 15A6DA99199CFB9800B56DBF /* CloseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CloseSelected.png; path = ../res/CloseSelected.png; sourceTree = ""; }; + 15A6DA9A199CFB9800B56DBF /* HelloWorld.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = HelloWorld.png; path = ../res/HelloWorld.png; sourceTree = ""; }; 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = ../cocos2d/build/cocos2d_libs.xcodeproj; sourceTree = ""; }; 1ACB3243164770DE00914215 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../../cocos2dx/platform/third_party/ios/libraries/libcurl.a; sourceTree = ""; }; - 1AFAF8B316D35DE700DB1158 /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AppDelegate.cpp; path = ../Classes/AppDelegate.cpp; sourceTree = ""; }; - 1AFAF8B416D35DE700DB1158 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ../Classes/AppDelegate.h; sourceTree = ""; }; - 1AFAF8B516D35DE700DB1158 /* HelloWorldScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HelloWorldScene.cpp; path = ../Classes/HelloWorldScene.cpp; sourceTree = ""; }; - 1AFAF8B616D35DE700DB1158 /* HelloWorldScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HelloWorldScene.h; path = ../Classes/HelloWorldScene.h; sourceTree = ""; }; - 1AFAF8B916D35E4900DB1158 /* CloseNormal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseNormal.png; sourceTree = ""; }; - 1AFAF8BA16D35E4900DB1158 /* CloseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseSelected.png; sourceTree = ""; }; - 1AFAF8BB16D35E4900DB1158 /* HelloWorld.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = HelloWorld.png; sourceTree = ""; }; 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D6058910D05DD3D006BFB54 /* HelloCpp iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloCpp iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; @@ -304,9 +346,9 @@ files = ( 1AC6FB2E180E99EB004C840B /* libbox2d iOS.a in Frameworks */, 1AC6FB2F180E99EB004C840B /* libchipmunk iOS.a in Frameworks */, - 1AC6FB30180E99EB004C840B /* libcocos2dx iOS.a in Frameworks */, - 1AC6FB31180E99EB004C840B /* libcocos2dx-extensions iOS.a in Frameworks */, - 1AC6FB32180E99EB004C840B /* libCocosDenshion iOS.a in Frameworks */, + 1AC6FB30180E99EB004C840B /* libcocos2d iOS.a in Frameworks */, + 1AC6FB31180E99EB004C840B /* libextension iOS.a in Frameworks */, + 1AC6FB32180E99EB004C840B /* libcocosdenshion iOS.a in Frameworks */, D6B0611B1803AB670077942B /* CoreMotion.framework in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, @@ -326,9 +368,9 @@ files = ( 1AC6FB1F180E996B004C840B /* libbox2d Mac.a in Frameworks */, 1AC6FB20180E996B004C840B /* libchipmunk Mac.a in Frameworks */, - 1AC6FB21180E996B004C840B /* libcocos2dx Mac.a in Frameworks */, - 1AC6FB22180E996B004C840B /* libcocos2dx-extensions Mac.a in Frameworks */, - 1AC6FB23180E996B004C840B /* libCocosDenshion Mac.a in Frameworks */, + 1AC6FB21180E996B004C840B /* libcocos2d Mac.a in Frameworks */, + 1AC6FB22180E996B004C840B /* libextension Mac.a in Frameworks */, + 1AC6FB23180E996B004C840B /* libcocosdenshion Mac.a in Frameworks */, 503AE11217EB99EE00D1A890 /* libcurl.dylib in Frameworks */, 5087E76717EB910900C73F5D /* libz.dylib in Frameworks */, 503AE11B17EB9C5A00D1A890 /* IOKit.framework in Frameworks */, @@ -361,16 +403,25 @@ path = Classes; sourceTree = ""; }; - 15AA9C4015B7EC450033D6C2 /* Classes */ = { + 15A6DA8E199CFB0100B56DBF /* src */ = { isa = PBXGroup; children = ( - 1AFAF8B316D35DE700DB1158 /* AppDelegate.cpp */, - 1AFAF8B416D35DE700DB1158 /* AppDelegate.h */, - 1AFAF8B516D35DE700DB1158 /* HelloWorldScene.cpp */, - 1AFAF8B616D35DE700DB1158 /* HelloWorldScene.h */, + 15A6DA8F199CFB1100B56DBF /* AppDelegate.cpp */, + 15A6DA90199CFB1100B56DBF /* AppDelegate.h */, + 15A6DA91199CFB1100B56DBF /* HelloWorldScene.cpp */, + 15A6DA92199CFB1100B56DBF /* HelloWorldScene.h */, ); - name = Classes; - path = ../classes; + name = src; + sourceTree = ""; + }; + 15A6DA97199CFB8700B56DBF /* res */ = { + isa = PBXGroup; + children = ( + 15A6DA98199CFB9800B56DBF /* CloseNormal.png */, + 15A6DA99199CFB9800B56DBF /* CloseSelected.png */, + 15A6DA9A199CFB9800B56DBF /* HelloWorld.png */, + ); + name = res; sourceTree = ""; }; 19C28FACFE9D520D11CA2CBB /* Products */ = { @@ -385,20 +436,26 @@ 1AC6FAE6180E9839004C840B /* Products */ = { isa = PBXGroup; children = ( - 1AC6FAF9180E9839004C840B /* libcocos2dx Mac.a */, - 1AC6FAFB180E9839004C840B /* libcocos2dx-extensions Mac.a */, + 1AC6FAF9180E9839004C840B /* libcocos2d Mac.a */, + 1AC6FAFB180E9839004C840B /* libextension Mac.a */, + 15A6DA7B199CFAFD00B56DBF /* libui Mac.a */, + 15A6DA7D199CFAFD00B56DBF /* libcocostudio Mac.a */, + 15A6DA7F199CFAFD00B56DBF /* libcocosbuilder Mac.a */, + 15A6DA81199CFAFD00B56DBF /* libspine Mac.a */, + 15A6DA83199CFAFD00B56DBF /* libnetwork Mac.a */, 1AC6FAFD180E9839004C840B /* libchipmunk Mac.a */, 1AC6FAFF180E9839004C840B /* libbox2d Mac.a */, - 1AC6FB01180E9839004C840B /* libCocosDenshion Mac.a */, - 1AC6FB03180E9839004C840B /* libjsbindings Mac.a */, - 1AC6FB05180E9839004C840B /* libluabindings Mac.a */, - 1AC6FB07180E9839004C840B /* libcocos2dx iOS.a */, - 1AC6FB09180E9839004C840B /* libcocos2dx-extensions iOS.a */, + 1AC6FB01180E9839004C840B /* libcocosdenshion Mac.a */, + 1AC6FB07180E9839004C840B /* libcocos2d iOS.a */, + 1AC6FB09180E9839004C840B /* libextension iOS.a */, 1AC6FB0B180E9839004C840B /* libchipmunk iOS.a */, 1AC6FB0D180E9839004C840B /* libbox2d iOS.a */, - 1AC6FB0F180E9839004C840B /* libCocosDenshion iOS.a */, - 1AC6FB11180E9839004C840B /* libjsbindings iOS.a */, - 1AC6FB13180E9839004C840B /* libluabindings iOS.a */, + 1AC6FB0F180E9839004C840B /* libcocosdenshion iOS.a */, + 15A6DA85199CFAFD00B56DBF /* libui iOS.a */, + 15A6DA87199CFAFD00B56DBF /* libcocostudio iOS.a */, + 15A6DA89199CFAFD00B56DBF /* libcocosbuilder iOS.a */, + 15A6DA8B199CFAFD00B56DBF /* libspine iOS.a */, + 15A6DA8D199CFAFD00B56DBF /* libnetwork iOS.a */, ); name = Products; sourceTree = ""; @@ -407,12 +464,12 @@ isa = PBXGroup; children = ( 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */, - 15AA9C4015B7EC450033D6C2 /* Classes */, + 15A6DA8E199CFB0100B56DBF /* src */, 29B97323FDCFA39411CA2CEA /* Frameworks */, 080E96DDFE201D6D7F000001 /* ios */, 503AE10617EB990700D1A890 /* mac */, 19C28FACFE9D520D11CA2CBB /* Products */, - 78C7DDAA14EBA5050085D0C2 /* Resources */, + 15A6DA97199CFB8700B56DBF /* res */, ); name = CustomTemplate; sourceTree = ""; @@ -484,17 +541,6 @@ path = ios; sourceTree = SOURCE_ROOT; }; - 78C7DDAA14EBA5050085D0C2 /* Resources */ = { - isa = PBXGroup; - children = ( - 1AFAF8B916D35E4900DB1158 /* CloseNormal.png */, - 1AFAF8BA16D35E4900DB1158 /* CloseSelected.png */, - 1AFAF8BB16D35E4900DB1158 /* HelloWorld.png */, - ); - name = Resources; - path = ../Resources; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -582,17 +628,87 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 1AC6FAF9180E9839004C840B /* libcocos2dx Mac.a */ = { + 15A6DA7B199CFAFD00B56DBF /* libui Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx Mac.a"; + path = "libui Mac.a"; + remoteRef = 15A6DA7A199CFAFD00B56DBF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A6DA7D199CFAFD00B56DBF /* libcocostudio Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocostudio Mac.a"; + remoteRef = 15A6DA7C199CFAFD00B56DBF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A6DA7F199CFAFD00B56DBF /* libcocosbuilder Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocosbuilder Mac.a"; + remoteRef = 15A6DA7E199CFAFD00B56DBF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A6DA81199CFAFD00B56DBF /* libspine Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libspine Mac.a"; + remoteRef = 15A6DA80199CFAFD00B56DBF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A6DA83199CFAFD00B56DBF /* libnetwork Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libnetwork Mac.a"; + remoteRef = 15A6DA82199CFAFD00B56DBF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A6DA85199CFAFD00B56DBF /* libui iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libui iOS.a"; + remoteRef = 15A6DA84199CFAFD00B56DBF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A6DA87199CFAFD00B56DBF /* libcocostudio iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocostudio iOS.a"; + remoteRef = 15A6DA86199CFAFD00B56DBF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A6DA89199CFAFD00B56DBF /* libcocosbuilder iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocosbuilder iOS.a"; + remoteRef = 15A6DA88199CFAFD00B56DBF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A6DA8B199CFAFD00B56DBF /* libspine iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libspine iOS.a"; + remoteRef = 15A6DA8A199CFAFD00B56DBF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A6DA8D199CFAFD00B56DBF /* libnetwork iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libnetwork iOS.a"; + remoteRef = 15A6DA8C199CFAFD00B56DBF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AC6FAF9180E9839004C840B /* libcocos2d Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2d Mac.a"; remoteRef = 1AC6FAF8180E9839004C840B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 1AC6FAFB180E9839004C840B /* libcocos2dx-extensions Mac.a */ = { + 1AC6FAFB180E9839004C840B /* libextension Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx-extensions Mac.a"; + path = "libextension Mac.a"; remoteRef = 1AC6FAFA180E9839004C840B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -610,38 +726,24 @@ remoteRef = 1AC6FAFE180E9839004C840B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 1AC6FB01180E9839004C840B /* libCocosDenshion Mac.a */ = { + 1AC6FB01180E9839004C840B /* libcocosdenshion Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libCocosDenshion Mac.a"; + path = "libcocosdenshion Mac.a"; remoteRef = 1AC6FB00180E9839004C840B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 1AC6FB03180E9839004C840B /* libjsbindings Mac.a */ = { + 1AC6FB07180E9839004C840B /* libcocos2d iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libjsbindings Mac.a"; - remoteRef = 1AC6FB02180E9839004C840B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1AC6FB05180E9839004C840B /* libluabindings Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluabindings Mac.a"; - remoteRef = 1AC6FB04180E9839004C840B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1AC6FB07180E9839004C840B /* libcocos2dx iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocos2dx iOS.a"; + path = "libcocos2d iOS.a"; remoteRef = 1AC6FB06180E9839004C840B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 1AC6FB09180E9839004C840B /* libcocos2dx-extensions iOS.a */ = { + 1AC6FB09180E9839004C840B /* libextension iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx-extensions iOS.a"; + path = "libextension iOS.a"; remoteRef = 1AC6FB08180E9839004C840B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -659,27 +761,13 @@ remoteRef = 1AC6FB0C180E9839004C840B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 1AC6FB0F180E9839004C840B /* libCocosDenshion iOS.a */ = { + 1AC6FB0F180E9839004C840B /* libcocosdenshion iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libCocosDenshion iOS.a"; + path = "libcocosdenshion iOS.a"; remoteRef = 1AC6FB0E180E9839004C840B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 1AC6FB11180E9839004C840B /* libjsbindings iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libjsbindings iOS.a"; - remoteRef = 1AC6FB10180E9839004C840B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1AC6FB13180E9839004C840B /* libluabindings iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluabindings iOS.a"; - remoteRef = 1AC6FB12180E9839004C840B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -688,23 +776,23 @@ buildActionMask = 2147483647; files = ( 5087E78117EB970100C73F5D /* Icon-120.png in Resources */, + 15A6DA9F199CFB9800B56DBF /* HelloWorld.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 */, + 15A6DA9D199CFB9800B56DBF /* CloseSelected.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 */, + 15A6DA9B199CFB9800B56DBF /* CloseNormal.png in Resources */, 50EF629717ECD46A001EB2F8 /* Icon-58.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -713,10 +801,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 5087E75317EB910900C73F5D /* CloseNormal.png in Resources */, 503AE0F817EB97AB00D1A890 /* Icon.icns in Resources */, - 5087E75417EB910900C73F5D /* CloseSelected.png in Resources */, - 5087E75517EB910900C73F5D /* HelloWorld.png in Resources */, + 15A6DAA0199CFB9800B56DBF /* HelloWorld.png in Resources */, + 15A6DA9C199CFB9800B56DBF /* CloseNormal.png in Resources */, + 15A6DA9E199CFB9800B56DBF /* CloseSelected.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -727,11 +815,11 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 15A6DA93199CFB1100B56DBF /* AppDelegate.cpp in Sources */, + 15A6DA95199CFB1100B56DBF /* HelloWorldScene.cpp in Sources */, 503AE10017EB989F00D1A890 /* AppController.mm in Sources */, 503AE10217EB989F00D1A890 /* RootViewController.mm in Sources */, - 1AFAF8B716D35DE700DB1158 /* AppDelegate.cpp in Sources */, 503AE10117EB989F00D1A890 /* main.m in Sources */, - 1AFAF8B816D35DE700DB1158 /* HelloWorldScene.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -739,9 +827,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 5087E75717EB910900C73F5D /* AppDelegate.cpp in Sources */, - 5087E75817EB910900C73F5D /* HelloWorldScene.cpp in Sources */, + 15A6DA94199CFB1100B56DBF /* AppDelegate.cpp in Sources */, 503AE10517EB98FF00D1A890 /* main.cpp in Sources */, + 15A6DA96199CFB1100B56DBF /* HelloWorldScene.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/templates/cpp-template-default/proj.linux/main.cpp b/templates/cpp-template-default/proj.linux/main.cpp index c5b735da78..529445638b 100644 --- a/templates/cpp-template-default/proj.linux/main.cpp +++ b/templates/cpp-template-default/proj.linux/main.cpp @@ -1,4 +1,4 @@ -#include "../Classes/AppDelegate.h" +#include "../src/AppDelegate.h" #include #include diff --git a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj index 022025afc8..a2eb592205 100644 --- a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj +++ b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj @@ -73,7 +73,7 @@ Disabled - $(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;..\Classes;..;%(AdditionalIncludeDirectories) + $(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;..\src;..;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -106,7 +106,7 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" MaxSpeed true - $(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;..\Classes;..;%(AdditionalIncludeDirectories) + $(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;..\src;..;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -137,13 +137,13 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" - - + + - - + + diff --git a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj.filters b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj.filters index 0afd6b671a..4b0292cd30 100644 --- a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj.filters +++ b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj.filters @@ -4,33 +4,33 @@ {84a8ebd7-7cf0-47f6-b75e-d441df67da40} - - {bb6c862e-70e9-49d9-81b7-3829a6f50471} - {715254bc-d70b-4ec5-bf29-467dd3ace079} + + {bb6c862e-70e9-49d9-81b7-3829a6f50471} + win32 - - Classes + + src - - Classes + + src win32 - - Classes + + src - - Classes + + src diff --git a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj.user b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj.user index 32a6296820..57d3d8f797 100644 --- a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj.user +++ b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj.user @@ -1,11 +1,11 @@  - $(ProjectDir)..\Resources + $(ProjectDir)..\res WindowsLocalDebugger - $(ProjectDir)..\Resources + $(ProjectDir)..\res WindowsLocalDebugger \ No newline at end of file diff --git a/templates/cpp-template-default/Resources/CloseNormal.png b/templates/cpp-template-default/res/CloseNormal.png similarity index 100% rename from templates/cpp-template-default/Resources/CloseNormal.png rename to templates/cpp-template-default/res/CloseNormal.png diff --git a/templates/cpp-template-default/Resources/CloseSelected.png b/templates/cpp-template-default/res/CloseSelected.png similarity index 100% rename from templates/cpp-template-default/Resources/CloseSelected.png rename to templates/cpp-template-default/res/CloseSelected.png diff --git a/templates/cpp-template-default/Resources/HelloWorld.png b/templates/cpp-template-default/res/HelloWorld.png similarity index 100% rename from templates/cpp-template-default/Resources/HelloWorld.png rename to templates/cpp-template-default/res/HelloWorld.png diff --git a/templates/cpp-template-default/Resources/fonts/Marker Felt.ttf b/templates/cpp-template-default/res/fonts/Marker Felt.ttf similarity index 100% rename from templates/cpp-template-default/Resources/fonts/Marker Felt.ttf rename to templates/cpp-template-default/res/fonts/Marker Felt.ttf diff --git a/templates/cpp-template-default/Classes/AppDelegate.cpp b/templates/cpp-template-default/src/AppDelegate.cpp similarity index 100% rename from templates/cpp-template-default/Classes/AppDelegate.cpp rename to templates/cpp-template-default/src/AppDelegate.cpp diff --git a/templates/cpp-template-default/Classes/AppDelegate.h b/templates/cpp-template-default/src/AppDelegate.h similarity index 100% rename from templates/cpp-template-default/Classes/AppDelegate.h rename to templates/cpp-template-default/src/AppDelegate.h diff --git a/templates/cpp-template-default/Classes/HelloWorldScene.cpp b/templates/cpp-template-default/src/HelloWorldScene.cpp similarity index 100% rename from templates/cpp-template-default/Classes/HelloWorldScene.cpp rename to templates/cpp-template-default/src/HelloWorldScene.cpp diff --git a/templates/cpp-template-default/Classes/HelloWorldScene.h b/templates/cpp-template-default/src/HelloWorldScene.h similarity index 100% rename from templates/cpp-template-default/Classes/HelloWorldScene.h rename to templates/cpp-template-default/src/HelloWorldScene.h