metal support for cocos2d-x

.appveyor.yml

@@ -37,6 +37,7 @@ branches:
   - v3-doc
   - v3.11_backup
   - v35-for-tizen
+  - metal-support
 
 clone_depth: 1
 

.gitignore

@@ -168,3 +168,7 @@ tests/lua-tests/project/proj.tizen/res/
 cmake-build-*/
 .vs
 cmake_build*
+metal-support*.zip
+**/.project
+
+desktop.ini

.travis.yml

@@ -2,6 +2,7 @@ matrix:
   include:
     # linux
     - os: linux
+      dist: xenial
       env: 
         - BUILD_TARGET=linux 
         - GEN_BINDING_AND_COCOSFILE=true
@@ -61,9 +62,10 @@ matrix:
       sudo: required
     - os: linux
       env: BUILD_TARGET=android_cocos_new_test
-      language: cpp
+      language: android
       sudo: required
     - os: linux
+      dist: xenial
       env: BUILD_TARGET=linux_cocos_new_test
       language: cpp
       sudo: required

CMakeLists.txt

@@ -34,15 +34,34 @@ project(Cocos2d-x)
 set(COCOS2DX_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 set(CMAKE_MODULE_PATH ${COCOS2DX_ROOT_PATH}/cmake/Modules/)
 
+# prevent in-source-build
+include(PreventInSourceBuilds)
+AssureOutOfSourceBuilds()
+
 # works before build libcocos2d
 include(CocosBuildSet)
 
-# default tests include lua, js test project, so we set those option on to build libs
-set(BUILD_LUA_LIBS ON)
-set(BUILD_JS_LIBS ON)
+# for metal-support alpha release, we only test cpp
+set(BUILD_LUA_LIBS OFF) 
+set(BUILD_JS_LIBS OFF)
+
+add_subdirectory(${COCOS2DX_ROOT_PATH}/cocos ${ENGINE_BINARY_PATH}/cocos/core)
+
+# prevent tests project to build "cocos2d-x/cocos" again
+set(BUILD_ENGINE_DONE ON)
+
+# add cpp tests default
+add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/cpp-empty-test ${ENGINE_BINARY_PATH}/tests/cpp-empty-test)
+add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/cpp-tests ${ENGINE_BINARY_PATH}/tests/cpp-tests)
+
+if(BUILD_LUA_LIBS)
+  add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/lua-empty-test/project ${ENGINE_BINARY_PATH}/tests/lua-empty-test)
+  add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/lua-tests/project ${ENGINE_BINARY_PATH}/tests/lua-test)
+endif(BUILD_LUA_LIBS)
 
-if(NOT USE_COCOS_PREBUILT)
-    add_subdirectory(${COCOS2DX_ROOT_PATH}/cocos ${ENGINE_BINARY_PATH}/cocos/core)
+if(BUILD_JS_LIBS)
+  add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/js-tests/project ${ENGINE_BINARY_PATH}/tests/js-tests)
 endif()
-add_subdirectory(${COCOS2DX_ROOT_PATH}/tests ${ENGINE_BINARY_PATH}/tests)
 
+# add cpp-template-default into project(Cocos2d-x) for tmp test
+add_subdirectory(${COCOS2DX_ROOT_PATH}/templates/cpp-template-default ${ENGINE_BINARY_PATH}/tests/HelloCpp)