Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adding files to cmake files

This commit is contained in:
mannewalis 2014-12-18 18:10:13 -05:00
parent 6b1f994c40
commit c05a6c877d
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/base/CMakeLists.txt
View File

@ -8,6 +8,9 @@ endif()
# todo: also base/CCController-android.cpp
set(COCOS_BASE_SRC
base/allocator/CCAllocatorDiagnostics.cpp
base/allocator/CCAllocatorGlobal.cpp
base/allocator/CCAllocatorGlobalNewDelete.cpp
base/ccFPSImages.c
base/CCAutoreleasePool.cpp
base/CCConfiguration.cpp

2
cocos/base/ccConfig.h
View File

@ -307,7 +307,7 @@ To enable set it to a value different than 0. Disabled by default.
as specified by CC_ALLOCATOR_GLOBAL below.
*/
#ifndef CC_ENABLE_ALLOCATOR
# define CC_ENABLE_ALLOCATOR 1
# define CC_ENABLE_ALLOCATOR 0
#endif
/** @def CC_ENABLE_ALLOCATOR_DIAGNOSTICS

1
tests/cpp-tests/CMakeLists.txt
View File

@ -22,6 +22,7 @@ set(TESTS_SRC
Classes/ActionsEaseTest/ActionsEaseTest.cpp
Classes/ActionsProgressTest/ActionsProgressTest.cpp
Classes/ActionsTest/ActionsTest.cpp
Classes/AllocatorTest/AllocatorTest.cpp
Classes/BillBoardTest/BillBoardTest.cpp
Classes/BugsTest/Bug-1159.cpp
Classes/BugsTest/Bug-1174.cpp