Cocos2d-x Template File Revisions

CMakeLists.diff

diff --git a/frameworks/CMakeLists.txt b/frameworks/CMakeLists.txt
index 07a5c6a..2e90a7d 100644
--- a/frameworks/CMakeLists.txt
+++ b/frameworks/CMakeLists.txt
@@ -50,7 +50,7 @@ add_subdirectory(${COCOS2D_ROOT})
 
 
 # Some macro definitions
-if(WINDOWS)
+if(COCOS_TARGET_SYSTEM_WINDOWS)
   if(BUILD_SHARED_LIBS)
     ADD_DEFINITIONS (-D_USRDLL -D_EXPORT_DLL_ -D_USEGUIDLL -D_USREXDLL -D_USRSTUDIODLL)
   else()
@@ -59,14 +59,14 @@ if(WINDOWS)
 
   ADD_DEFINITIONS (-DCOCOS2DXWIN32_EXPORTS -D_WINDOWS -DWIN32 -D_WIN32)
   set(PLATFORM_FOLDER win32)
-elseif(MACOSX OR APPLE)
+elseif(COCOS_TARGET_SYSTEM_MACOSX OR APPLE)
   ADD_DEFINITIONS (-DCC_TARGET_OS_MAC)
   ADD_DEFINITIONS (-DUSE_FILE32API)
   set(PLATFORM_FOLDER mac)
-elseif(LINUX)
+elseif(COCOS_TARGET_SYSTEM_LINUX)
   ADD_DEFINITIONS(-DLINUX)
   set(PLATFORM_FOLDER linux)
-elseif(ANDROID)
+elseif(COCOS_TARGET_SYSTEM_ANDROID)
   ADD_DEFINITIONS (-DUSE_FILE32API)
   set(PLATFORM_FOLDER android)
 else()
@@ -123,16 +123,28 @@ set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin")
 set_target_properties(${APP_NAME} PROPERTIES
      RUNTIME_OUTPUT_DIRECTORY  "${APP_BIN_DIR}")
 
+
+macro(pre_build TARGET_NAME)
+add_custom_target( ${TARGET_NAME}_PRE_BUILD ALL )
+add_custom_command(
+TARGET ${TARGET_NAME}_PRE_BUILD
+${ARGN}
+PRE_BUILD
+COMMENT "${TARGET_NAME}_PRE_BUILD ..."
+)
+add_custom_target(${TARGET_NAME}_CORE_PRE_BUILD)
+add_dependencies(${TARGET_NAME}_PRE_BUILD ${TARGET_NAME}_CORE_PRE_BUILD)
+add_dependencies(${TARGET_NAME} ${TARGET_NAME}_PRE_BUILD)
+endmacro()
+
+
 pre_build(${APP_NAME}
   COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}/Resources
   COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../res ${APP_BIN_DIR}/Resources/res
   COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../src ${APP_BIN_DIR}/Resources/src
   COMMAND ${CMAKE_COMMAND} -E copy_directory ${COCOS2D_ROOT}/cocos/scripting/lua-bindings/script/cocos2d ${APP_BIN_DIR}/Resources
   COMMAND ${CMAKE_COMMAND} -E copy_directory ${COCOS2D_ROOT}/cocos/scripting/lua-bindings/script/cocosdenshion ${APP_BIN_DIR}/Resources
-  COMMAND ${CMAKE_COMMAND} -E copy_directory ${COCOS2D_ROOT}/cocos/scripting/lua-bindings/script/cocosbuilder ${APP_BIN_DIR}/Resources
-  COMMAND ${CMAKE_COMMAND} -E copy_directory ${COCOS2D_ROOT}/cocos/scripting/lua-bindings/script/cocostudio ${APP_BIN_DIR}/Resources
   COMMAND ${CMAKE_COMMAND} -E copy_directory ${COCOS2D_ROOT}/cocos/scripting/lua-bindings/script/extension ${APP_BIN_DIR}/Resources
   COMMAND ${CMAKE_COMMAND} -E copy_directory ${COCOS2D_ROOT}/cocos/scripting/lua-bindings/script/network ${APP_BIN_DIR}/Resources
   COMMAND ${CMAKE_COMMAND} -E copy_directory ${COCOS2D_ROOT}/cocos/scripting/lua-bindings/script/ui ${APP_BIN_DIR}/Resources
   )
-  

lua_module_register_h.diff

diff --git a/templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h b/templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
index 5897798..e0d7275 100644
--- a/templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
+++ b/templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
@@ -3,11 +3,8 @@
 
 #include "cocosdenshion/lua_cocos2dx_cocosdenshion_manual.h"
 #include "network/lua_cocos2dx_network_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"
 #include "3d/lua_cocos2dx_3d_manual.h"
 #include "audioengine/lua_cocos2dx_audioengine_manual.h"
 
@@ -16,11 +13,8 @@ static int lua_module_register(lua_State* L)
     //Dont' change the module register order unless you know what your are doing
     register_cocosdenshion_module(L);
     register_network_module(L);
-    register_cocosbuilder_module(L);
-    register_cocostudio_module(L);
     register_ui_moudle(L);
     register_extension_module(L);
-    register_spine_module(L);
     register_cocos3d_module(L);
     register_audioengine_module(L);
     return 1;