Merge commit '8fc3b7b4064b107d85c15a4895d08e9ad335b5a8' into scgamex-v3

* commit '8fc3b7b4064b107d85c15a4895d08e9ad335b5a8': (43 commits)
  update change log, "allow cleartext HTTP traffic" don't include template
  Add Android P cutout area support (cocos2d#19286)
  refine cmake, allow developer switch Debug/Release in IDE (cocos2d#19329)
  refine cmake, add iOS sign config (cocos2d#19327)
  cmake support set iOS Deployment Target for root project (cocos2d#19315)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19320)
  Ui video player new style looping input options (cocos2d#19297)
  ReFix bug: PremultipliedAlpha is not working for png (cocos2d#19138)
  Add clear request and responses method to httpclient (cocos2d#19294)
  revert ndk-build final target, others need it (cocos2d#19296)
  Fix for COCOS2D_DEBUG is always 1 on Android (cocos2d#19291)
  update 3rd libs & console, fix file issues (cocos2d#19284)
  Install ninja (cocos2d#19298)
  [3rd-libs] upgrade to version 154 (cocos2d#19282)
  Ability to get low coupling inheritance (cocos2d#19276)
  cmake win32 Precompiled header (cocos2d#19273)
  fix spritecache plist parsing issue (cocos2d#19269)
  standardize pause & resume logic on GLSurfaceView (cocos2d#19256)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19267)
  update versoin code (cocos2d#19265)
  ...

# Conflicts:
#	cocos/network/WebSocket.cpp
#	cocos/platform/android/CCFileUtils-android.cpp
#	cocos/scripting/js-bindings/CMakeLists.txt
#	cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_experimental_video_auto_api.js
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.hpp
#	cocos/scripting/js-bindings/manual/ScriptingCore.cpp
#	cocos/scripting/lua-bindings/auto/api/VideoPlayer.lua
#	cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.cpp
#	cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.hpp
#	cocos/scripting/lua-bindings/manual/CCLuaStack.cpp
#	cocos/scripting/lua-bindings/manual/Cocos2dxLuaLoader.cpp
#	cocos/scripting/lua-bindings/proj.android/CMakeLists.txt
#	templates/js-template-default/CMakeLists.txt
#	templates/js-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp
#	templates/js-template-default/frameworks/runtime-src/proj.android/app/jni/Android.mk
#	templates/lua-template-default/CMakeLists.txt
#	templates/lua-template-default/frameworks/runtime-src/proj.android/app/jni/Android.mk
#	tests/game-controller-test/Classes/GameControllerTest.cpp
#	tests/js-tests/project/CMakeLists.txt
#	tests/js-tests/project/Classes/AppDelegate.cpp
#	tests/js-tests/project/proj.android/app/AndroidManifest.xml
#	tests/js-tests/src/tests-main.js
#	tests/lua-empty-test/project/CMakeLists.txt
#	tests/lua-empty-test/project/Classes/AppDelegate.cpp
#	tests/lua-empty-test/project/proj.android/app/AndroidManifest.xml
#	tests/lua-game-controller-test/project/Classes/AppDelegate.cpp
#	tests/lua-game-controller-test/project/proj.android/app/AndroidManifest.xml
#	tests/lua-tests/project/CMakeLists.txt
#	tests/lua-tests/project/proj.android/app/AndroidManifest.xml
#	tests/lua-tests/project/proj.android/app/proguard-rules.pro
#	tests/lua-tests/src/EffectsTest/EffectsTest.lua
#	tests/lua-tests/src/ParticleTest/ParticleTest.lua
#	tests/lua-tests/src/SpriteTest/SpriteTest.lua
#	tests/lua-tests/src/TransitionsTest/TransitionsTest.lua
#	tests/lua-tests/src/WebViewTest/WebViewTest.lua
#	tests/lua-tests/src/mainMenu.lua
#	tests/performance-tests/Classes/tests/BaseTest.cpp
#	tools/cocos2d-console

Author: stevetranby

.gitignore

@@ -182,3 +182,6 @@ tests/*/project/proj.android/.settings/org.eclipse.buildship.core.prefs
 # tmp folder for temp usage
 tmp/
 temp/
+
+# external libs zip
+*.zip

CHANGELOG

@@ -18,14 +18,18 @@ cocos2d-x-3.17.1 Nov.19 2018
 [REFINE]        Action: add ui::LoadingBar support to Progress actions
 [REFINE]        Network: support multiple parameters in SocketIO emit/send method
 [REFINE]        FileUtils: improve thread safety (use single recursive_mutex)
-[REFINE]        FileUitils: add getFileSize impl for Windows
+[REFINE]        FileUtils: add getFileSize impl for Windows
 [REFINE]        FileUtils: add listFiles impl for Android and Windows platform
+[REFINE]        FileUtils: exact fullPathForDirectory from fullPathForFilename, fullPathForFilename should not accept directory
 [REFINE]        CMake: improve libraries link, compile options config
 [REFINE]        CMake: remove un-elegant prebuilt feature at internal cmake build scripts
 [REFINE]        3rd: upgrade libwebsockets to 2.4.2 with libuv enabled
 [REFINE]        3rd: improve cmake build scripts for external libs
+[REFINE]        3rd: upgrade luajit to 2.1.0-beta3, fix random crash in Android release mode
+[REFINE]        3rd: external/lua/lua is not referenced in cmake and it will be removed in the near future
 [REFINE]        Tests: add websocket latency test
 [REFINE]        Tests: add download multi task test case
+[REFINE]        Tests: improve part test cases UI shows
 [REFINE]        cocos console: disable "gen-libs" command
 [REFINE]        Others: add another xbox 360 configuration
 [REFINE]        Others: remove ANT_ROOT env check on setup.py
@@ -46,30 +50,36 @@ cocos2d-x-3.17.1 Nov.19 2018
 [FIX]           UI: fix not support sprite frame when ignoreContentAdaptWithSize is false
 [FIX]           UI: fix out of range access in Label 
 [FIX]           UI: fix Widget::getAncestorWidget error
-[FIX]           UI: fix "known incorrect sRGB profile" by mogrify convert png format
 [FIX]           UI: fix iOS editbox EndAction wrong when single line mode (UITextField)
 [FIX]           UI: Fix for Label and UIRichEdit text trailing space trimming
+[FXI]           JavaScript: fix crash if garbage collection runs between TouchStart and TouchEnd event
 [FIX]           Audio: fix AudioEngine rotateBufferThread crash on iOS
 [FIX]           Audio: add extra init checks in pcm audio service, avoid crash in PcmAudioService 
 [FIX]           Audio: fix AVAudioSessionErrorCodeCannotStartPlaying error may occur on Apple
 [FIX]           Audio: fix background music may resumes even the application is on the background on Android
+[FIX]           Audio: fix AudioCache* holding invalid pointer value
 [FIX]           Network: fix memory leaks in WebSocket
 [FIX]           Network: fix websocket memory zereoing size error
 [FIX]           Network: fix https downloader timeout on win/mac
 [FIX]           Network: fix "cc.loader.load" convert url error
 [FIX]           iOS: fix project build warnings in Xcode
 [FIX]           iOS: fix crash when saving gray colorspace image
+[FIX]           iOS: `js/lua tests` fix double free issue on app exits. 
 [FIX]           Android: shorten C++ build path, reduce long path error on Windows
 [FIX]           Android: keep cocos2dx activity at task root by mark "singleTask" in manifest
 [FIX]           Android: fix crash caused by JNIEnv null pointer in getStringUTFCharsJNI function
 [FIX]           Android: use 'Binary names' style on JNI for ClassLoader.loadClass
+[FIX]           Android: allow cleartext HTTP traffic by default for all tests project
+[FIX]           Windows: Support VS2017 in release mode
 [FIX]           Action: fix repeat CallFunc for some times, may never stop
 [FIX]           Physics: fix PhysicsJointMotor setRate and getRate Bad Access Crash
 [FIX]           FileUtils: fix removeDirectory() failure on win32
 [FIX]           FileUtils: let getContents return an error code when the filename is a directory
 [FIX]           FileUtils: let isFileExistInternal return false when folder as parameter on Linux
+[FIX]           LUA: performance drop bug introduced in 3.17
 [FIX]           CMake: fix project name always be "TemplateCpp" when create a new project
 [FIX]           Tests: fix auto test stop in cpp-tests project
+[FIX]           cocos console: do uninstall only when that app is installed for android
 
 cocos2d-x-3.17 May.21 2018
 
@@ -1237,7 +1247,7 @@ cocos2d-x-3.7rc0  July.1 2015
     [NEW]           C++: Added ActionFloat
     [NEW]           C++: Supported physical keyboard on WinRT
     [NEW]           FileUtils: checked filename case characters on windows
-    [NEW]           FileUitls: added supporting loading files that which file path include utf-8 characters
+    [NEW]           FileUtils: added supporting loading files that which file path include utf-8 characters
     [NEW]           PhysicsShape: added sensor property
     [NEW]           Sprite: used triangle command
     [NEW]           3d: Added `getFarPlane` and `getNearPlane` in `Camera` class

CMakeLists.txt

@@ -46,5 +46,12 @@ set(BUILD_LUA_LIBS ON)
 set(BUILD_JS_LIBS ON)
 
 add_subdirectory(${COCOS2DX_ROOT_PATH}/cocos ${ENGINE_BINARY_PATH}/cocos/core)
-add_subdirectory(${COCOS2DX_ROOT_PATH}/tests ${ENGINE_BINARY_PATH}/tests)
 
+# prevent tests project to build "cocos2d-x/cocos" again
+set(BUILD_ENGINE_DONE ON)
+# add engine all tests project
+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)
+add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/js-tests/project ${ENGINE_BINARY_PATH}/tests/js-tests)
+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)

cmake/Modules/CocosBuildHelpers.cmake

@@ -1,14 +1,17 @@
 include(CMakeParseArguments)
 
-# copy resource `FILES` and `FOLDERS` to `COPY_TO` folder
-function(cocos_copy_res)
+# copy resource `FILES` and `FOLDERS` to TARGET_FILE_DIR/Resources
+function(cocos_copy_target_res cocos_target)
     set(oneValueArgs COPY_TO)
     set(multiValueArgs FILES FOLDERS)
     cmake_parse_arguments(opt "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
     # copy files
     foreach(cc_file ${opt_FILES})
         get_filename_component(file_name ${cc_file} NAME)
-        configure_file(${cc_file} "${opt_COPY_TO}/${file_name}" COPYONLY)
+        add_custom_command(TARGET ${cocos_target} POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E echo "copy file into Resources: ${file_name} ..."
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different ${cc_file} "${opt_COPY_TO}/${file_name}"
+        )
     endforeach()
     # copy folders files
     foreach(cc_folder ${opt_FOLDERS})
@@ -17,7 +20,10 @@ function(cocos_copy_res)
         foreach(res_file ${folder_files})
             get_filename_component(res_file_abs_path ${res_file} ABSOLUTE)
             file(RELATIVE_PATH res_file_relat_path ${folder_abs_path} ${res_file_abs_path})
-            configure_file(${res_file} "${opt_COPY_TO}/${res_file_relat_path}" COPYONLY)
+            add_custom_command(TARGET ${cocos_target} POST_BUILD
+                COMMAND ${CMAKE_COMMAND} -E echo "copy file into Resources: ${res_file_relat_path} ..."
+                COMMAND ${CMAKE_COMMAND} -E copy_if_different ${res_file} "${opt_COPY_TO}/${res_file_relat_path}"
+            )
         endforeach()
     endforeach()
 endfunction()
@@ -79,8 +85,9 @@ function(get_target_depends_ext_dlls cocos_target all_depend_dlls_out)
     search_depend_libs_recursive(${cocos_target} depend_libs)
     foreach(depend_lib ${depend_libs})
         if(TARGET ${depend_lib})
-            get_target_property(tmp_dlls ${depend_lib} CC_DEPEND_DLLS)
-            if(tmp_dlls)
+            get_target_property(found_shared_lib ${depend_lib} IMPORTED_IMPLIB)
+            if(found_shared_lib)
+                get_target_property(tmp_dlls ${depend_lib} IMPORTED_LOCATION)
                 list(APPEND all_depend_ext_dlls ${tmp_dlls})
             endif()
         endif()
@@ -89,20 +96,19 @@ function(get_target_depends_ext_dlls cocos_target all_depend_dlls_out)
     set(${all_depend_dlls_out} ${all_depend_ext_dlls} PARENT_SCOPE)
 endfunction()
 
-# copy the `cocos_target` needed dlls into `COPY_TO` folder
+# copy the `cocos_target` needed dlls into TARGET_FILE_DIR
 function(cocos_copy_target_dll cocos_target)
-    set(oneValueArgs COPY_TO)
-    cmake_parse_arguments(opt "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
     get_target_depends_ext_dlls(${cocos_target} all_depend_dlls)
     # remove repeat items
     if(all_depend_dlls)
         list(REMOVE_DUPLICATES all_depend_dlls)
     endif()
-    # todo, add a option to enable/disable debug print
-    message(STATUS "prepare to copy external dlls for ${cocos_target}:${all_depend_dlls}")
     foreach(cc_dll_file ${all_depend_dlls})
         get_filename_component(cc_dll_name ${cc_dll_file} NAME)
-        configure_file(${cc_dll_file} "${opt_COPY_TO}/${cc_dll_name}" COPYONLY)
+        add_custom_command(TARGET ${cocos_target} POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E echo "copy dll into target file dir: ${cc_dll_name} ..."
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different ${cc_dll_file} "$<TARGET_FILE_DIR:${cocos_target}>/${cc_dll_name}"
+        )
     endforeach()
 endfunction()
 
@@ -168,31 +174,21 @@ function(source_group_single_file single_file)
     source_group("${ide_file_group}" FILES ${single_file})
 endfunction()
 
-# setup a cocos application, include "APP_BIN_DIR", "APP_RES_DIR" config
+# setup a cocos application
 function(setup_cocos_app_config app_name)
-    # set target PROPERTIES, depend different platforms
+    # put all output app into bin/${app_name}
+    set_target_properties(${app_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/${app_name}")
     if(APPLE)
-        set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin")
-        set_target_properties(${app_name} PROPERTIES MACOSX_BUNDLE 1
-                              )
+        # output macOS/iOS .app
+        set_target_properties(${app_name} PROPERTIES MACOSX_BUNDLE 1)
     elseif(MSVC)
-        # only Debug and Release mode was supported when using MSVC.
-        set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin/${APP_NAME}/$<CONFIG>")
-        set(APP_RES_DIR "${CMAKE_BINARY_DIR}/bin/${APP_NAME}/${CMAKE_BUILD_TYPE}/Resources")
-        #Visual Studio Defaults to wrong type
-        set_target_properties(${app_name} PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
-    else(LINUX)
-        set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}/${APP_NAME}")
-        set(APP_RES_DIR "${APP_BIN_DIR}/Resources")
+        # visual studio default is Console app, but we need Windows app
+        set_property(TARGET ${app_name} APPEND PROPERTY LINK_FLAGS "/SUBSYSTEM:WINDOWS")
     endif()
-    set_target_properties(${app_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${APP_BIN_DIR}")
-
     # auto mark code files for IDE when mark app
     if(XCODE OR VS)
-        cocos_mark_code_files(${APP_NAME})
+        cocos_mark_code_files(${app_name})
     endif()
-
-    set(APP_RES_DIR ${APP_RES_DIR} PARENT_SCOPE)
 endfunction()
 
 # if cc_variable not set, then set it cc_value

cmake/Modules/CocosConfigDefine.cmake

@@ -25,41 +25,35 @@
          set(MACOSX TRUE)
          set(PLATFORM_FOLDER mac)
      endif()
-else()
+ else()
      message(FATAL_ERROR "Unsupported platform, CMake will exit")
      return()
  endif()
 
- # build mode, Debug is default value
- if(NOT CMAKE_BUILD_TYPE)
-     if(DEBUG_MODE)
-         set(CMAKE_BUILD_TYPE Debug)
-     else()
-         set(CMAKE_BUILD_TYPE Release)
-     endif()
- endif()
+# generators that are capable of organizing into a hierarchy of folders
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+# simplify generator condition, please use them everywhere
+if(CMAKE_GENERATOR STREQUAL Xcode)
+    set(XCODE TRUE)
+elseif(CMAKE_GENERATOR MATCHES Visual)
+    set(VS TRUE)
+endif()
+message(STATUS "CMAKE_GENERATOR: ${CMAKE_GENERATOR}")
 
- if(CMAKE_GENERATOR)
-    # generators that are capable of organizing into a hierarchy of folders
-    set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-    # simplify generator condition judgement
-    if(CMAKE_GENERATOR STREQUAL Xcode)
-        set(XCODE TRUE)
-    elseif(CMAKE_GENERATOR MATCHES Visual)
-        set(VS TRUE)
+if(CMAKE_CONFIGURATION_TYPES)
+    set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Reset the configurations to what we need" FORCE)
+    message(STATUS "CMAKE_CONFIGURATION_TYPES: ${CMAKE_CONFIGURATION_TYPES}")
+else()
+    if(NOT CMAKE_BUILD_TYPE)
+        if(DEBUG_MODE) # build mode, Debug is default value
+            set(CMAKE_BUILD_TYPE Debug)
+        else()
+            set(CMAKE_BUILD_TYPE Release)
+        endif()
     endif()
-    # make configurations type keep same to cmake build type.
-    set(CMAKE_CONFIGURATION_TYPES "${CMAKE_BUILD_TYPE}" CACHE STRING "Reset the configurations to what we need" FORCE)
- endif()
- message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
-
+    message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+endif()
 
-# custom target property for dll collect
-define_property(TARGET
-    PROPERTY CC_DEPEND_DLLS
-    BRIEF_DOCS "depend dlls of a target"
-    FULL_DOCS "use to save depend dlls of a target"
-)
 # custom target property for lua/js link
 define_property(TARGET
     PROPERTY CC_JS_DEPEND
@@ -96,7 +90,7 @@ endif()
 
  # Set macro definitions for special platforms
  function(use_cocos2dx_compile_define target)
-    target_compile_definitions(${target} PUBLIC "COCOS2D_DEBUG$<$<CONFIG:Debug>:=1>")
+    target_compile_definitions(${target} PUBLIC $<$<CONFIG:Debug>:COCOS2D_DEBUG=1>)
     if(APPLE)
         target_compile_definitions(${target} PUBLIC __APPLE__)
         target_compile_definitions(${target} PUBLIC USE_FILE32API)

cmake/Modules/iOSBundleInfo.plist.in

@@ -38,8 +38,8 @@
 	<string>LaunchScreen</string>
     <key>UISupportedInterfaceOrientations</key>
     <array>
-        <string>UIInterfaceOrientationLandscapeLeft</string>
         <string>UIInterfaceOrientationLandscapeRight</string>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
     </array>
     <key>NSHumanReadableCopyright</key>
     <string>${MACOSX_BUNDLE_COPYRIGHT}</string>

cmake/README.md

@@ -8,7 +8,7 @@ CMake is an open-source, cross-platform family of tools designed to build, test
   ```sh
   cmake --version
   ```
-if the CMake version is lower than 3.1, please upgrade.
+if the CMake version is lower than 3.6, please upgrade.
 
 2. You should use __out-of-source__ builds, this means you need to create a different directory than __cocos2d-x__ to execute the `cmake` command.
 
@@ -33,7 +33,14 @@ mkdir win32-build && cd win32-build
 cmake .. -G"Visual Studio 15 2017" -Tv141
 ```
 
-Execute `cmake --build .` to compile, or open __Cocos2d-x.sln__ in Explorer to use the generated project. 
+Execute `cmake --build .` to compile,
+```
+cmake --build . --config Debug
+cmake --build . --config Release
+```
+or open __Cocos2d-x.sln__ in Explorer to use the generated project. 
+
+If can't found `MSVCR110.dll` issue occurs to you, please install this [Visual C++ Runtime Libraries](https://www.microsoft.com/en-us/download/details.aspx?id=30679), when runing the cpp-tests project
 
 ### Generate macOS Project
 
@@ -53,7 +60,9 @@ cmake .. -GXcode -DCMAKE_TOOLCHAIN_FILE=../cmake/ios.toolchain.cmake
 open Cocos2d-x.xcodeproj
 ```
 
-The default build is for running on actual iOS hardware, if you want to run in the simulator, please add `-DIOS_PLATFORM=SIMULATOR` for architecture i386 or `-DIOS_PLATFORM=SIMULATOR64` for x86_64.
+The default build is for running on iOS device, if you want to run in the simulator, please add `-DIOS_PLATFORM=SIMULATOR` for architecture i386 or `-DIOS_PLATFORM=SIMULATOR64` for x86_64, but remember you can't run metal-support app in simulator because Apple limitation.
+
+if you want to sign iOS app in CMake, you will need to fill development team ID into `set_xcode_property(${APP_NAME} DEVELOPMENT_TEAM "")`, or select to sign in Xcode after project files generated.
 
 ### Android Studio
 
@@ -91,6 +100,11 @@ If you want to add cmake build arguments, please add it at [external Native Buil
 
     * `cmake --build ./msvc_build`, cmake will sellect corresponding build tools.
 
+## Tips
+
+1. Use `cmake ..` to refersh resources and code files, after you modify `Resources` or `CMakeLists.txt`.
+1. Don't need `CMAKE_BUILD_TYPE` options when `-G` Xcode or Visual Studio, CMake scripts will generate both configurations, so you can switch `Debug` and `Release` in IDE.
+
 ## Useful Links
 
 * CMake Official website: [cmake.org](https://cmake.org/)

cmake/ios.toolchain.cmake

@@ -35,8 +35,9 @@ set(UNIX True)
 set(APPLE True)
 set(IOS True)
 
-# Required as of cmake 2.8.10
-set(CMAKE_OSX_DEPLOYMENT_TARGET "" CACHE STRING "Force unset of the deployment target for iOS" FORCE)
+# support iOS on cmake 3.11+
+# cmake 3.11 milestone feature, https://gitlab.kitware.com/cmake/cmake/issues/17431 
+set(CMAKE_OSX_DEPLOYMENT_TARGET "8.0" CACHE STRING "set of the deployment target for iOS" FORCE)
 
 # Determine the cmake host system version so we know where to find the iOS SDKs
 find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin)
@@ -203,4 +204,13 @@ macro(find_host_package)
     set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
     set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
     set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-endmacro(find_host_package)
+endmacro(find_host_package)
+
+# This macro lets you find library on the host system
+macro(find_host_library)
+    set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER)
+
+    find_library(${ARGN})
+
+    set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+endmacro(find_host_library)

cocos/2d/CCSpriteFrameCache.cpp

@@ -377,6 +377,11 @@ void SpriteFrameCache::addSpriteFramesWithFile(const std::string& plist)
 {
     CCASSERT(!plist.empty(), "plist filename should not be nullptr");
 
+    if (_spriteFramesCache.isPlistFull(plist)) 
+    {
+        return;
+    }
+
     std::string fullPath = FileUtils::getInstance()->fullPathForFilename(plist);
     if (fullPath.empty())
     {

cocos/2d/libcocos2d.vcxproj

@@ -113,7 +113,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\OpenalSoft\prebuilt\*.*"
 xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\MP3Decoder\prebuilt\*.*" "$(OutDir)"
 xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\OggDecoder\prebuilt\*.*" "$(OutDir)"
 xcopy /Y /Q "$(ProjectDir)..\..\external\sqlite3\libraries\win32\*.*" "$(OutDir)"
-xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*" "$(OutDir)"
+xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\debug-lib\*.*" "$(OutDir)"
 xcopy /Y /Q "$(ProjectDir)..\..\external\bullet\prebuilt\win32\debug\*.*" "$(OutDir)"
 xcopy /Y /Q "$(ProjectDir)..\..\external\Box2D\prebuilt\win32\debug\*.*" "$(OutDir)"
 xcopy /Y /Q "$(ProjectDir)..\..\external\openssl\prebuilt\win32\*.*" "$(OutDir)"

cocos/CMakeLists.txt

@@ -161,3 +161,12 @@ endif()
 if(XCODE OR VS)
     cocos_mark_code_files("cocos2d")
 endif()
+
+if(WINDOWS)
+    # precompiled header. Compilation time speedup ~4x.
+    target_sources(cocos2d PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/precheader.cpp")
+    set_target_properties(cocos2d PROPERTIES COMPILE_FLAGS "/Yuprecheader.h /FIprecheader.h")
+    set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/precheader.cpp" PROPERTIES COMPILE_FLAGS "/Ycprecheader.h")
+    # compile c as c++. needed for precompiled header
+    set_source_files_properties(${COCOS_SPINE_SRC} base/ccFPSImages.c PROPERTIES LANGUAGE CXX)
+endif()