Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch

2013-11-08 18:44:29 +08:00 · 2013-11-08 18:44:29 +08:00 · 116e2a5f18
parent 1f389d3779 5f85db9f4d
commit 116e2a5f18
3 changed files with 299 additions and 0 deletions
--- a/template/multi-platform-cpp/CMakeLists.txt
+++ b/template/multi-platform-cpp/CMakeLists.txt
@ -0,0 +1,143 @@
+cmake_minimum_required(VERSION 2.6)
+
+set(APP_NAME HelloCpp)
+project (${APP_NAME})
+
+include(../../build/BuildHelpers.CMakeLists.txt)
+
+option(USE_CHIPMUNK "Use chipmunk for physics library" ON)
+option(USE_BOX2D "Use box2d for physics library" OFF)
+option(DEBUG_MODE "Debug or release?" ON)
+
+if(DEBUG_MODE)
+  set(CMAKE_BUILD_TYPE DEBUG)
+else(DEBUG_MODE)
+  set(CMAKE_BUILD_TYPE RELEASE)
+endif(DEBUG_MODE)
+
+set(CMAKE_C_FLAGS_DEBUG "-g -Wall -DCOCOS2D_DEBUG=1")
+set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
+
+set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} "-std=c99")
+set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++11")
+
+if(USE_CHIPMUNK)
+  message("Using chipmunk ...")
+  add_definitions(-DLINUX -DCC_ENABLE_CHIPMUNK_INTEGRATION=1)
+elseif(USE_BOX2D)
+  message("Using box2d ...")
+  add_definitions(-DLINUX -DCC_ENABLE_BOX2D_INTEGRATION=1)
+else(USE_CHIPMUNK)
+  message(FATAL_ERROR "Must choose a physics library.")
+endif(USE_CHIPMUNK)
+
+# architecture
+if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+set(ARCH_DIR "64-bit")
+else()
+set(ARCH_DIR "32-bit")
+endif()
+
+
+set(GAME_SRC
+  proj.linux/main.cpp
+  Classes/AppDelegate.cpp
+  Classes/HelloWorldScene.cpp
+)
+
+set(COCOS2D_ROOT ${CMAKE_SOURCE_DIR}/../..)
+
+include_directories(
+  ${COCOS2D_ROOT}
+  ${COCOS2D_ROOT}/cocos
+  ${COCOS2D_ROOT}/cocos/audio/include
+  ${COCOS2D_ROOT}/cocos/2d
+  ${COCOS2D_ROOT}/cocos/2d/platform
+  ${COCOS2D_ROOT}/cocos/2d/platform/linux
+  ${COCOS2D_ROOT}/cocos/base
+  ${COCOS2D_ROOT}/cocos/physics
+  ${COCOS2D_ROOT}/cocos/editor-support
+  ${COCOS2D_ROOT}/cocos/math/kazmath/include
+  ${COCOS2D_ROOT}/extensions
+  ${COCOS2D_ROOT}/external
+  ${COCOS2D_ROOT}/external/jpeg/include/linux
+  ${COCOS2D_ROOT}/external/tiff/include/linux
+  ${COCOS2D_ROOT}/external/webp/include/linux
+  ${COCOS2D_ROOT}/external/glfw3/include/linux
+  ${COCOS2D_ROOT}/external/curl/include/linux/${ARCH_DIR}
+  ${COCOS2D_ROOT}/external/tinyxml2
+  ${COCOS2D_ROOT}/external/unzip
+  ${COCOS2D_ROOT}/external/chipmunk/include/chipmunk
+  ${COCOS2D_ROOT}/external/freetype2/include/linux
+  ${COCOS2D_ROOT}/external/linux-specific/fmod/include/${ARCH_DIR}
+)
+
+link_directories(
+  /usr/local/lib
+  ${COCOS2D_ROOT}/lib
+  ${COCOS2D_ROOT}/external/jpeg/prebuilt/linux/${ARCH_DIR}
+  ${COCOS2D_ROOT}/external/tiff/prebuilt/linux/${ARCH_DIR}
+  ${COCOS2D_ROOT}/external/webp/prebuilt/linux/${ARCH_DIR}
+  ${COCOS2D_ROOT}/external/freetype2/prebuilt/linux/${ARCH_DIR}
+  ${COCOS2D_ROOT}/external/curl/prebuilt/linux/${ARCH_DIR}
+  ${COCOS2D_ROOT}/external/linux-specific/fmod/prebuilt/${ARCH_DIR}
+)
+
+# add the executable
+add_executable(${APP_NAME}
+  ${GAME_SRC}
+)
+
+if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+set(FMOD_LIB "fmodex64")
+else()
+set(FMOD_LIB "fmodex")
+endif()
+
+target_link_libraries(${APP_NAME}
+  gui
+  network
+  curl
+  ldap
+  lber
+  idn
+  rtmp
+  spine
+  cocostudio
+  jsoncpp
+  cocosbuilder
+  extensions
+  box2d
+  audio
+  ${FMOD_LIB}
+  cocos2d
+  cocosbase
+  chipmunk
+  tinyxml2
+  kazmath
+  unzip
+  jpeg
+  webp
+  tiff
+  freetype
+  fontconfig
+  png
+  pthread
+  glfw
+  GLEW
+  GL
+  X11
+  rt
+  z
+  )
+
+set(APP_BIN_DIR "${CMAKE_SOURCE_DIR}/bin")
+
+set_target_properties(${APP_NAME} PROPERTIES
+     RUNTIME_OUTPUT_DIRECTORY  "${APP_BIN_DIR}")
+
+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
+  )
+
--- a/template/multi-platform-lua/CMakeLists.txt
+++ b/template/multi-platform-lua/CMakeLists.txt
@ -0,0 +1,149 @@
+cmake_minimum_required(VERSION 2.6)
+
+set(APP_NAME HelloLua)
+project (${APP_NAME})
+
+include(../../build/BuildHelpers.CMakeLists.txt)
+
+option(USE_CHIPMUNK "Use chipmunk for physics library" ON)
+option(USE_BOX2D "Use box2d for physics library" OFF)
+option(DEBUG_MODE "Debug or release?" ON)
+
+if(DEBUG_MODE)
+  set(CMAKE_BUILD_TYPE DEBUG)
+else(DEBUG_MODE)
+  set(CMAKE_BUILD_TYPE RELEASE)
+endif(DEBUG_MODE)
+
+set(CMAKE_C_FLAGS_DEBUG "-g -Wall -DCOCOS2D_DEBUG=1")
+set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
+
+set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} "-std=c99")
+set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++11")
+
+if(USE_CHIPMUNK)
+  message("Using chipmunk ...")
+  add_definitions(-DLINUX -DCC_ENABLE_CHIPMUNK_INTEGRATION=1)
+elseif(USE_BOX2D)
+  message("Using box2d ...")
+  add_definitions(-DLINUX -DCC_ENABLE_BOX2D_INTEGRATION=1)
+else(USE_CHIPMUNK)
+  message(FATAL_ERROR "Must choose a physics library.")
+endif(USE_CHIPMUNK)
+
+# architecture
+if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+set(ARCH_DIR "64-bit")
+else()
+set(ARCH_DIR "32-bit")
+endif()
+
+
+set(GAME_SRC
+  proj.linux/main.cpp
+  Classes/AppDelegate.cpp
+)
+
+set(COCOS2D_ROOT ${CMAKE_SOURCE_DIR}/../..)
+
+include_directories(
+  Classes
+  ${COCOS2D_ROOT}/cocos/scripting/lua/bindings
+  ${COCOS2D_ROOT}/external/lua/lua
+  ${COCOS2D_ROOT}/external/lua/tolua
+  ${COCOS2D_ROOT}
+  ${COCOS2D_ROOT}/cocos
+  ${COCOS2D_ROOT}/cocos/audio/include
+  ${COCOS2D_ROOT}/cocos/2d
+  ${COCOS2D_ROOT}/cocos/2d/platform
+  ${COCOS2D_ROOT}/cocos/2d/platform/linux
+  ${COCOS2D_ROOT}/cocos/base
+  ${COCOS2D_ROOT}/cocos/physics
+  ${COCOS2D_ROOT}/cocos/editor-support
+  ${COCOS2D_ROOT}/cocos/math/kazmath/include
+  ${COCOS2D_ROOT}/extensions
+  ${COCOS2D_ROOT}/external
+  ${COCOS2D_ROOT}/external/jpeg/include/linux
+  ${COCOS2D_ROOT}/external/tiff/include/linux
+  ${COCOS2D_ROOT}/external/webp/include/linux
+  ${COCOS2D_ROOT}/external/glfw3/include/linux
+  ${COCOS2D_ROOT}/external/curl/include/linux/${ARCH_DIR}
+  ${COCOS2D_ROOT}/external/tinyxml2
+  ${COCOS2D_ROOT}/external/unzip
+  ${COCOS2D_ROOT}/external/chipmunk/include/chipmunk
+  ${COCOS2D_ROOT}/external/freetype2/include/linux
+  ${COCOS2D_ROOT}/external/linux-specific/fmod/include/${ARCH_DIR}
+)
+
+link_directories(
+  /usr/local/lib
+  ${COCOS2D_ROOT}/lib
+  ${COCOS2D_ROOT}/external/jpeg/prebuilt/linux/${ARCH_DIR}
+  ${COCOS2D_ROOT}/external/tiff/prebuilt/linux/${ARCH_DIR}
+  ${COCOS2D_ROOT}/external/webp/prebuilt/linux/${ARCH_DIR}
+  ${COCOS2D_ROOT}/external/freetype2/prebuilt/linux/${ARCH_DIR}
+  ${COCOS2D_ROOT}/external/curl/prebuilt/linux/${ARCH_DIR}
+  ${COCOS2D_ROOT}/external/linux-specific/fmod/prebuilt/${ARCH_DIR}
+)
+
+# add the executable
+add_executable(${APP_NAME}
+  ${GAME_SRC}
+)
+
+if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+set(FMOD_LIB "fmodex64")
+else()
+set(FMOD_LIB "fmodex")
+endif()
+
+target_link_libraries(${APP_NAME}
+  luabinding
+  tolua
+  lua
+  gui
+  network
+  curl
+  ldap
+  lber
+  idn
+  rtmp
+  spine
+  cocostudio
+  jsoncpp
+  cocosbuilder
+  extensions
+  box2d
+  audio
+  ${FMOD_LIB}
+  cocos2d
+  cocosbase
+  chipmunk
+  tinyxml2
+  kazmath
+  unzip
+  jpeg
+  webp
+  tiff
+  freetype
+  fontconfig
+  png
+  pthread
+  glfw
+  GLEW
+  GL
+  X11
+  rt
+  z
+  )
+
+set(APP_BIN_DIR "${CMAKE_SOURCE_DIR}/bin")
+
+set_target_properties(${APP_NAME} PROPERTIES
+     RUNTIME_OUTPUT_DIRECTORY  "${APP_BIN_DIR}")
+
+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
+  )
+
--- a/tools/travis-scripts/run-script.sh
+++ b/tools/travis-scripts/run-script.sh
@ -76,6 +76,13 @@ elif [ "$PLATFORM"x = "linux"x ]; then
    cd linux-build
    cmake ../..
    make -j10
+    cd ../../template/multi-platform-cpp
+    cmake .
+    make -j10
+    cd ../multi-platform-lua
+    cmake .
+    make -j10
+
 elif [ "$PLATFORM"x = "emscripten"x ]; then
    # Generate binding glue codes
    echo "Generating bindings glue codes ..."