Merge pull request #20 from cocos2d/v4

Sync with master
rh101 · Dec 29, 2019 · 3085453 · 3085453
2 parents 310d717 + 90299f6
commit 3085453
Show file tree

Hide file tree

Showing 235 changed files with 32,147 additions and 18,578 deletions.
diff --git a/cocos/CMakeLists.txt b/cocos/CMakeLists.txt
@@ -49,7 +49,7 @@ include(audio/CMakeLists.txt)
 
 # default value for cocos2dx extensions modules build
 option(BUILD_EDITOR_COCOSTUDIO "Build editor support for cocostudio" ON)
-option(BUILD_EDITOR_SPINE "Build editor support for spine" OFF)
+option(BUILD_EDITOR_SPINE "Build editor support for spine" ON)
 option(BUILD_EXTENSIONS "Build extension library" ON)
 
 if(BUILD_EDITOR_COCOSTUDIO)
@@ -58,7 +58,11 @@ if(BUILD_EDITOR_COCOSTUDIO)
 endif(BUILD_EDITOR_COCOSTUDIO)
 
 if(BUILD_EDITOR_SPINE)
-    include(editor-support/spine/CMakeLists.txt)
+    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/editor-support/spine/CMakeLists.txt")
+        include(editor-support/spine/CMakeLists.txt)
+    else()
+        message(WARNING "${CMAKE_CURRENT_SOURCE_DIR}/editor-support/spine/CMakeLists.txt not found!")
+    endif()
     set(COCOS_EDITOR_SUPPORT_SRC ${COCOS_EDITOR_SUPPORT_SRC} ${COCOS_SPINE_SRC} ${COCOS_SPINE_HEADER})
 endif(BUILD_EDITOR_SPINE)
 

diff --git a/cocos/editor-support/spine/Android.mk b/cocos/editor-support/spine/Android.mk