From 6f8bf7dce12f833d35f74a760050a9186421c73f Mon Sep 17 00:00:00 2001 From: CHP Date: Sat, 9 Nov 2019 00:09:39 +0100 Subject: [PATCH 1/3] MINSIZEREL_RELWITHDEBINFO_Support --- cmake/Modules/CocosConfigDefine.cmake | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/cmake/Modules/CocosConfigDefine.cmake b/cmake/Modules/CocosConfigDefine.cmake index 45250835d27f..024ed3be5158 100644 --- a/cmake/Modules/CocosConfigDefine.cmake +++ b/cmake/Modules/CocosConfigDefine.cmake @@ -40,20 +40,6 @@ elseif(CMAKE_GENERATOR MATCHES Visual) endif() message(STATUS "CMAKE_GENERATOR: ${CMAKE_GENERATOR}") -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() - message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") -endif() - # custom target property for lua/js link define_property(TARGET PROPERTY CC_JS_DEPEND From e79ce66d66c7318517ca07429811441ede9e28a3 Mon Sep 17 00:00:00 2001 From: CHP Date: Sat, 9 Nov 2019 00:13:07 +0100 Subject: [PATCH 2/3] Remove DEBUG_MODE --- cmake/Modules/CocosBuildSet.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmake/Modules/CocosBuildSet.cmake b/cmake/Modules/CocosBuildSet.cmake index f93621238af9..a78100e125f6 100644 --- a/cmake/Modules/CocosBuildSet.cmake +++ b/cmake/Modules/CocosBuildSet.cmake @@ -22,8 +22,7 @@ message(STATUS "CMAKE_MODULE_PATH:" ${CMAKE_MODULE_PATH}) message(STATUS "PROJECT_BINARY_DIR:" ${PROJECT_BINARY_DIR}) message(STATUS "ENGINE_BINARY_PATH:" ${ENGINE_BINARY_PATH}) -# the default behavior of build module -option(DEBUG_MODE "Debug or Release?" ON) + option(BUILD_LUA_LIBS "Build lua libraries" OFF) option(BUILD_JS_LIBS "Build js libraries" OFF) From c60b05b012dc4315cbe98f893d01438f8c1cd6fe Mon Sep 17 00:00:00 2001 From: CHP Date: Tue, 12 Nov 2019 07:19:17 +0100 Subject: [PATCH 3/3] Fix clang-tidy --- cocos/base/CCDirector.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos/base/CCDirector.cpp b/cocos/base/CCDirector.cpp index 1e80993ab8ed..c1407a7e41d6 100644 --- a/cocos/base/CCDirector.cpp +++ b/cocos/base/CCDirector.cpp @@ -747,8 +747,8 @@ static void GLToClipTransform(Mat4 *transformOut) Director* director = Director::getInstance(); CCASSERT(nullptr != director, "Director is null when setting matrix stack"); - auto projection = director->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION); - auto modelview = director->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); + const auto& projection = director->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION); + const auto& modelview = director->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); *transformOut = projection * modelview; }