From 252e5e11831a0522973e9c72fd30bfc78465ced9 Mon Sep 17 00:00:00 2001 From: zhangbin Date: Fri, 24 Apr 2015 10:17:38 +0800 Subject: [PATCH] Make the lua projects temporarily works well. --- CMakeLists.txt | 4 ++-- cocos/base/ccConfig.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c43a3b3ba7e..4359b7c05999 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,8 +58,8 @@ endif() set(BUILD_CPP_TESTS_DEFAULT ON) set(BUILD_LUA_LIBS_DEFAULT ON) set(BUILD_LUA_TESTS_DEFAULT ON) -set(BUILD_JS_LIBS_DEFAULT ON) -set(BUILD_JS_TESTS_DEFAULT ON) +set(BUILD_JS_LIBS_DEFAULT OFF) +set(BUILD_JS_TESTS_DEFAULT OFF) # TODO: fix test samples for MSVC if(MSVC) set(BUILD_CPP_TESTS_DEFAULT OFF) diff --git a/cocos/base/ccConfig.h b/cocos/base/ccConfig.h index f261e025708d..87f59cf9318a 100644 --- a/cocos/base/ccConfig.h +++ b/cocos/base/ccConfig.h @@ -305,7 +305,7 @@ THE SOFTWARE. * protected by default. */ #ifndef CC_CONSTRUCTOR_ACCESS -#define CC_CONSTRUCTOR_ACCESS public +#define CC_CONSTRUCTOR_ACCESS protected #endif /** @def CC_ENABLE_ALLOCATOR