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

Merge pull request #6782 from ricardoquesada/files_squash 

Directory structure: fixes
This commit is contained in:
Ricardo Quesada 2014-05-16 14:38:01 -07:00
parent 6837cea2e6 0f67247325
commit 688025017c
372 changed files with 3794 additions and 3985 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -130,6 +130,8 @@ endif()
include_directories( include_directories(
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/cocos ${CMAKE_CURRENT_SOURCE_DIR}/cocos
${CMAKE_CURRENT_SOURCE_DIR}/cocos/platform/desktop
${CMAKE_CURRENT_SOURCE_DIR}/cocos/platform/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/cocos/audio/include ${CMAKE_CURRENT_SOURCE_DIR}/cocos/audio/include
${CMAKE_CURRENT_SOURCE_DIR}/cocos/editor-support ${CMAKE_CURRENT_SOURCE_DIR}/cocos/editor-support
${CMAKE_CURRENT_SOURCE_DIR}/cocos/scripting/lua-bindings/auto ${CMAKE_CURRENT_SOURCE_DIR}/cocos/scripting/lua-bindings/auto
@ -140,8 +142,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/external/unzip ${CMAKE_CURRENT_SOURCE_DIR}/external/unzip
${CMAKE_CURRENT_SOURCE_DIR}/external/edtaa3func ${CMAKE_CURRENT_SOURCE_DIR}/external/edtaa3func
${CMAKE_CURRENT_SOURCE_DIR}/external/chipmunk/include/chipmunk ${CMAKE_CURRENT_SOURCE_DIR}/external/chipmunk/include/chipmunk
${CMAKE_CURRENT_SOURCE_DIR}/cocos/2d/platform/desktop
${CMAKE_CURRENT_SOURCE_DIR}/cocos/2d/platform/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/external/jpeg/include/${PLATFORM_FOLDER} ${CMAKE_CURRENT_SOURCE_DIR}/external/jpeg/include/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/external/png/include/${PLATFORM_FOLDER} ${CMAKE_CURRENT_SOURCE_DIR}/external/png/include/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/external/tiff/include/${PLATFORM_FOLDER} ${CMAKE_CURRENT_SOURCE_DIR}/external/tiff/include/${PLATFORM_FOLDER}

2
build/android-build.py
View File

@ -116,7 +116,7 @@ def do_build(cocos_root, ndk_root, app_android_root, ndk_build_param,sdk_root,an
raise Exception("Build dynamic library for project [ " + app_android_root + " ] fails!") raise Exception("Build dynamic library for project [ " + app_android_root + " ] fails!")
elif android_platform is not None: elif android_platform is not None:
sdk_tool_path = os.path.join(sdk_root, "tools/android") sdk_tool_path = os.path.join(sdk_root, "tools/android")
cocoslib_path = os.path.join(cocos_root, "cocos/2d/platform/android/java") cocoslib_path = os.path.join(cocos_root, "cocos/platform/android/java")
command = '%s update lib-project -t %s -p %s' % (sdk_tool_path,android_platform,cocoslib_path) command = '%s update lib-project -t %s -p %s' % (sdk_tool_path,android_platform,cocoslib_path)
if os.system(command) != 0: if os.system(command) != 0:
raise Exception("update cocos lib-project [ " + cocoslib_path + " ] fails!") raise Exception("update cocos lib-project [ " + cocoslib_path + " ] fails!")

2513
build/cocos2d_libs.xcodeproj/project.pbxproj
View File

File diff suppressed because it is too large Load Diff

32
build/cocos2d_tests.xcodeproj/project.pbxproj
View File

@ -5228,7 +5228,7 @@
CC_TARGET_OS_MAC, CC_TARGET_OS_MAC,
); );
INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-empty-test/proj.mac/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-empty-test/proj.mac/Info.plist";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac";
}; };
name = Debug; name = Debug;
}; };
@ -5242,7 +5242,7 @@
CC_TARGET_OS_MAC, CC_TARGET_OS_MAC,
); );
INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-empty-test/proj.mac/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-empty-test/proj.mac/Info.plist";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac";
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
}; };
name = Release; name = Release;
@ -5262,7 +5262,7 @@
"-image_base", "-image_base",
100000000, 100000000,
); );
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto";
}; };
name = Debug; name = Debug;
}; };
@ -5281,7 +5281,7 @@
"-image_base", "-image_base",
100000000, 100000000,
); );
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto";
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
}; };
name = Release; name = Release;
@ -5298,7 +5298,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
SDKROOT = iphoneos; SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../cocos/2d/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios";
}; };
name = Debug; name = Debug;
}; };
@ -5314,7 +5314,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
SDKROOT = iphoneos; SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../cocos/2d/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios";
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
}; };
name = Release; name = Release;
@ -5331,7 +5331,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
SDKROOT = iphoneos; SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto";
}; };
name = Debug; name = Debug;
}; };
@ -5347,7 +5347,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
SDKROOT = iphoneos; SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto";
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
}; };
name = Release; name = Release;
@ -5367,7 +5367,7 @@
"-image_base", "-image_base",
100000000, 100000000,
); );
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto";
}; };
name = Debug; name = Debug;
}; };
@ -5386,7 +5386,7 @@
"-image_base", "-image_base",
100000000, 100000000,
); );
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto";
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
}; };
name = Release; name = Release;
@ -5405,7 +5405,7 @@
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
SDKROOT = iphoneos; SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto";
}; };
name = Debug; name = Debug;
}; };
@ -5423,7 +5423,7 @@
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
SDKROOT = iphoneos; SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto";
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
}; };
name = Release; name = Release;
@ -5437,7 +5437,7 @@
CC_TARGET_OS_MAC, CC_TARGET_OS_MAC,
); );
INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-tests/proj.mac/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-tests/proj.mac/Info.plist";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac";
}; };
name = Debug; name = Debug;
}; };
@ -5450,7 +5450,7 @@
CC_TARGET_OS_MAC, CC_TARGET_OS_MAC,
); );
INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-tests/proj.mac/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-tests/proj.mac/Info.plist";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac";
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
}; };
name = Release; name = Release;
@ -5497,7 +5497,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
SDKROOT = iphoneos; SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../cocos/2d/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios";
}; };
name = Debug; name = Debug;
}; };
@ -5513,7 +5513,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
SDKROOT = iphoneos; SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../cocos/2d/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios";
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
}; };
name = Release; name = Release;

4
cocos/2d/CCActionGrid.cpp
View File

@ -23,10 +23,12 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "2d/CCActionGrid.h" #include "2d/CCActionGrid.h"
#include "base/CCDirector.h"
#include "2d/CCGrid.h" #include "2d/CCGrid.h"
#include "2d/CCNodeGrid.h" #include "2d/CCNodeGrid.h"
#include "base/CCDirector.h"
NS_CC_BEGIN NS_CC_BEGIN
// implementation of GridAction // implementation of GridAction

2
cocos/2d/CCActionInstant.cpp
View File

@ -28,7 +28,7 @@
#include "2d/CCActionInstant.h" #include "2d/CCActionInstant.h"
#include "2d/CCNode.h" #include "2d/CCNode.h"
#include "2d/CCSprite.h" #include "2d/CCSprite.h"
#include "2d/CCScriptSupport.h" #include "base/CCScriptSupport.h"
#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))) #if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"

5
cocos/2d/CCActionInterval.h
View File

@ -28,13 +28,14 @@ THE SOFTWARE.
#ifndef __ACTION_CCINTERVAL_ACTION_H__ #ifndef __ACTION_CCINTERVAL_ACTION_H__
#define __ACTION_CCINTERVAL_ACTION_H__ #define __ACTION_CCINTERVAL_ACTION_H__
#include <vector>
#include "2d/CCNode.h" #include "2d/CCNode.h"
#include "2d/CCAction.h" #include "2d/CCAction.h"
#include "2d/CCProtocols.h"
#include "2d/CCSpriteFrame.h" #include "2d/CCSpriteFrame.h"
#include "2d/CCAnimation.h" #include "2d/CCAnimation.h"
#include "base/CCProtocols.h"
#include "base/CCVector.h" #include "base/CCVector.h"
#include <vector>
NS_CC_BEGIN NS_CC_BEGIN

4
cocos/2d/CCActionManager.cpp
View File

@ -30,8 +30,8 @@ THE SOFTWARE.
#include "2d/CCNode.h" #include "2d/CCNode.h"
#include "base/CCScheduler.h" #include "base/CCScheduler.h"
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "2d/ccCArray.h" #include "base/ccCArray.h"
#include "2d/uthash.h" #include "base/uthash.h"
NS_CC_BEGIN NS_CC_BEGIN
// //

6
cocos/2d/CCAnimation.cpp
View File

@ -25,10 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "2d/CCAnimation.h" #include "2d/CCAnimation.h"
#include "2d/CCTextureCache.h"
#include "2d/CCTexture2D.h"
#include "base/ccMacros.h"
#include "2d/CCSpriteFrame.h" #include "2d/CCSpriteFrame.h"
#include "renderer/CCTextureCache.h"
#include "renderer/CCTexture2D.h"
#include "base/ccMacros.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/2d/CCAnimationCache.cpp
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#include "2d/CCAnimation.h" #include "2d/CCAnimation.h"
#include "2d/CCSpriteFrame.h" #include "2d/CCSpriteFrame.h"
#include "2d/CCSpriteFrameCache.h" #include "2d/CCSpriteFrameCache.h"
#include "2d/platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "deprecated/CCString.h" #include "deprecated/CCString.h"
using namespace std; using namespace std;

4
cocos/2d/CCAtlasNode.cpp
View File

@ -26,10 +26,10 @@ THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCAtlasNode.h" #include "CCAtlasNode.h"
#include "2d/CCTextureAtlas.h" #include "renderer/CCTextureAtlas.h"
#include "2d/CCTextureCache.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "renderer/CCTextureCache.h"
#include "renderer/CCRenderer.h" #include "renderer/CCRenderer.h"
#include "renderer/CCGLProgram.h" #include "renderer/CCGLProgram.h"
#include "renderer/CCGLProgramState.h" #include "renderer/CCGLProgramState.h"

2
cocos/2d/CCAtlasNode.h
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#define __CCATLAS_NODE_H__ #define __CCATLAS_NODE_H__
#include "2d/CCNode.h" #include "2d/CCNode.h"
#include "2d/CCProtocols.h" #include "base/CCProtocols.h"
#include "base/ccTypes.h" #include "base/ccTypes.h"
#include "renderer/CCQuadCommand.h" #include "renderer/CCQuadCommand.h"

2
cocos/2d/CCComponent.cpp
View File

@ -23,7 +23,7 @@ THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "2d/CCComponent.h" #include "2d/CCComponent.h"
#include "2d/CCScriptSupport.h" #include "base/CCScriptSupport.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/2d/CCComponent.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#define __CC_FRAMEWORK_COMPONENT_H__ #define __CC_FRAMEWORK_COMPONENT_H__
#include "base/CCRef.h" #include "base/CCRef.h"
#include "2d/CCScriptSupport.h" #include "base/CCScriptSupport.h"
#include <string> #include <string>
NS_CC_BEGIN NS_CC_BEGIN

4
cocos/2d/CCFont.cpp
View File

@ -23,8 +23,8 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCFont.h" #include "2d/CCFont.h"
#include "ccUTF8.h" #include "base/ccUTF8.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/2d/CCFontAtlas.cpp
View File

@ -25,7 +25,7 @@
#include "2d/CCFontAtlas.h" #include "2d/CCFontAtlas.h"
#include "2d/CCFontFreeType.h" #include "2d/CCFontFreeType.h"
#include "ccUTF8.h" #include "base/ccUTF8.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "base/CCEventListenerCustom.h" #include "base/CCEventListenerCustom.h"
#include "base/CCEventDispatcher.h" #include "base/CCEventDispatcher.h"

6
cocos/2d/CCFontCharMap.cpp
View File

@ -25,10 +25,10 @@
#include "CCFontCharMap.h" #include "CCFontCharMap.h"
#include "2d/CCFontAtlas.h" #include "2d/CCFontAtlas.h"
#include "2d/platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "base/ccUTF8.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "2d/CCTextureCache.h" #include "renderer/CCTextureCache.h"
#include "ccUTF8.h"
NS_CC_BEGIN NS_CC_BEGIN

11
cocos/2d/CCFontFNT.cpp
View File

@ -24,15 +24,16 @@
****************************************************************************/ ****************************************************************************/
#include "2d/CCFontFNT.h" #include "2d/CCFontFNT.h"
#include "2d/uthash.h" #include "base/uthash.h"
#include "2d/CCFontAtlas.h"
#include "base/ccUTF8.h"
#include "platform/CCFileUtils.h"
#include "base/CCConfiguration.h" #include "base/CCConfiguration.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "2d/CCFontAtlas.h"
#include "base/CCMap.h" #include "base/CCMap.h"
#include "renderer/CCTextureCache.h"
#include "deprecated/CCString.h" #include "deprecated/CCString.h"
#include "2d/CCTextureCache.h"
#include "ccUTF8.h"
#include "2d/platform/CCFileUtils.h"
using namespace std; using namespace std;
NS_CC_BEGIN NS_CC_BEGIN

9
cocos/2d/CCFontFreeType.cpp
View File

@ -23,12 +23,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "2d/CCFontFreeType.h"
#include <stdio.h> #include <stdio.h>
#include <algorithm> #include <algorithm>
#include "ccUTF8.h" #include "base/ccUTF8.h"
#include "2d/CCFontFreeType.h" #include "platform/CCFileUtils.h"
#include "2d/platform/CCFileUtils.h"
#include "edtaa3func.h" #include "edtaa3func.h"
#include FT_BBOX_H #include FT_BBOX_H
@ -563,4 +564,4 @@ void FontFreeType::renderCharAt(unsigned char *dest,int posX, int posY, unsigned
} }
} }
NS_CC_END NS_CC_END

2
cocos/2d/CCGrabber.cpp
View File

@ -25,7 +25,7 @@ THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCGrabber.h" #include "CCGrabber.h"
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "2d/CCTexture2D.h" #include "renderer/CCTexture2D.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/2d/CCGrid.cpp
View File

@ -27,7 +27,7 @@ THE SOFTWARE.
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "2d/CCGrabber.h" #include "2d/CCGrabber.h"
#include "2d/ccUtils.h" #include "base/ccUtils.h"
#include "2d/CCGrid.h" #include "2d/CCGrid.h"
#include "renderer/CCGLProgram.h" #include "renderer/CCGLProgram.h"
#include "renderer/CCGLProgramCache.h" #include "renderer/CCGLProgramCache.h"

2
cocos/2d/CCGrid.h
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#include "base/ccTypes.h" #include "base/ccTypes.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "2d/CCNode.h" #include "2d/CCNode.h"
#include "2d/CCTexture2D.h" #include "renderer/CCTexture2D.h"
#ifdef EMSCRIPTEN #ifdef EMSCRIPTEN
#include "CCGLBufferedNode.h" #include "CCGLBufferedNode.h"
#endif // EMSCRIPTEN #endif // EMSCRIPTEN

4
cocos/2d/CCLabel.cpp
View File

@ -27,9 +27,9 @@
#include "2d/CCFontAtlasCache.h" #include "2d/CCFontAtlasCache.h"
#include "2d/CCSprite.h" #include "2d/CCSprite.h"
#include "2d/CCLabelTextFormatter.h" #include "2d/CCLabelTextFormatter.h"
#include "2d/ccUTF8.h" #include "base/ccUTF8.h"
#include "2d/CCSpriteFrame.h" #include "2d/CCSpriteFrame.h"
#include "2d/platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "2d/CCFont.h" #include "2d/CCFont.h"
#include "renderer/CCGLProgramState.h" #include "renderer/CCGLProgramState.h"
#include "renderer/CCRenderer.h" #include "renderer/CCRenderer.h"

10
cocos/2d/CCLabelAtlas.cpp
View File

@ -25,17 +25,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCLabelAtlas.h" #include "CCLabelAtlas.h"
#include "2d/CCTextureAtlas.h" #include "renderer/CCTextureAtlas.h"
#include "2d/CCTextureCache.h"
#include "2d/CCDrawingPrimitives.h" #include "2d/CCDrawingPrimitives.h"
#include "platform/CCFileUtils.h"
#include "base/ccConfig.h" #include "base/ccConfig.h"
#include "base/CCDirector.h"
#include "renderer/CCTextureCache.h"
#include "renderer/CCGLProgramCache.h" #include "renderer/CCGLProgramCache.h"
#include "renderer/CCGLProgram.h" #include "renderer/CCGLProgram.h"
#include "renderer/ccGLStateCache.h" #include "renderer/ccGLStateCache.h"
#include "base/CCDirector.h"
#include "math/TransformUtils.h" #include "math/TransformUtils.h"
#include "2d/platform/CCFileUtils.h"
// external
#include "deprecated/CCString.h" #include "deprecated/CCString.h"
#if CC_LABELATLAS_DEBUG_DRAW #if CC_LABELATLAS_DEBUG_DRAW

5
cocos/2d/CCLabelTextFormatter.cpp
View File

@ -23,10 +23,11 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "2d/CCLabelTextFormatter.h"
#include <vector> #include <vector>
#include "ccUTF8.h" #include "base/ccUTF8.h"
#include "CCLabelTextFormatter.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "2d/CCLabel.h" #include "2d/CCLabel.h"

2
cocos/2d/CCLabelTextFormatter.h
View File

@ -26,6 +26,8 @@
#ifndef _CCLabelTextFormatter_h_ #ifndef _CCLabelTextFormatter_h_
#define _CCLabelTextFormatter_h_ #define _CCLabelTextFormatter_h_
#include "base/CCPlatformMacros.h"
NS_CC_BEGIN NS_CC_BEGIN
class Label; class Label;

4
cocos/2d/CCLayer.cpp
View File

@ -27,8 +27,8 @@ THE SOFTWARE.
#include <stdarg.h> #include <stdarg.h>
#include "2d/CCLayer.h" #include "2d/CCLayer.h"
#include "2d/CCScriptSupport.h" #include "base/CCScriptSupport.h"
#include "2d/platform/CCDevice.h" #include "platform/CCDevice.h"
#include "2d/CCScene.h" #include "2d/CCScene.h"
#include "renderer/CCGLProgramState.h" #include "renderer/CCGLProgramState.h"
#include "renderer/CCGLProgram.h" #include "renderer/CCGLProgram.h"

2
cocos/2d/CCLayer.h
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#define __CCLAYER_H__ #define __CCLAYER_H__
#include "2d/CCNode.h" #include "2d/CCNode.h"
#include "2d/CCProtocols.h" #include "base/CCProtocols.h"
#include "base/CCEventTouch.h" #include "base/CCEventTouch.h"
#ifdef EMSCRIPTEN #ifdef EMSCRIPTEN
#include "CCGLBufferedNode.h" #include "CCGLBufferedNode.h"

2
cocos/2d/CCMenuItem.cpp
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#include "2d/CCSprite.h" #include "2d/CCSprite.h"
#include "CCLabelAtlas.h" #include "CCLabelAtlas.h"
#include "2d/CCLabel.h" #include "2d/CCLabel.h"
#include "2d/CCScriptSupport.h" #include "base/CCScriptSupport.h"
#include "deprecated/CCString.h" #include "deprecated/CCString.h"
#include <stdarg.h> #include <stdarg.h>
#include <cstring> #include <cstring>

2
cocos/2d/CCMenuItem.h
View File

@ -33,7 +33,7 @@ THE SOFTWARE.
// cocos2d includes // cocos2d includes
#include "2d/CCNode.h" #include "2d/CCNode.h"
#include "2d/CCProtocols.h" #include "base/CCProtocols.h"
NS_CC_BEGIN NS_CC_BEGIN

9
cocos/2d/CCMotionStreak.cpp
View File

@ -23,16 +23,17 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "2d/CCMotionStreak.h" #include "2d/CCMotionStreak.h"
#include "2d/CCTextureCache.h" #include "math/CCVertex.h"
#include "2d/CCVertex.h" #include "base/ccMacros.h"
#include "base/CCDirector.h"
#include "renderer/CCTextureCache.h"
#include "renderer/ccGLStateCache.h" #include "renderer/ccGLStateCache.h"
#include "renderer/CCGLProgram.h" #include "renderer/CCGLProgram.h"
#include "renderer/CCGLProgramState.h" #include "renderer/CCGLProgramState.h"
#include "renderer/CCCustomCommand.h" #include "renderer/CCCustomCommand.h"
#include "renderer/CCRenderer.h" #include "renderer/CCRenderer.h"
#include "base/ccMacros.h"
#include "base/CCDirector.h"
NS_CC_BEGIN NS_CC_BEGIN

4
cocos/2d/CCMotionStreak.h
View File

@ -26,8 +26,8 @@ THE SOFTWARE.
#ifndef __CCMOTION_STREAK_H__ #ifndef __CCMOTION_STREAK_H__
#define __CCMOTION_STREAK_H__ #define __CCMOTION_STREAK_H__
#include "2d/CCProtocols.h" #include "base/CCProtocols.h"
#include "2d/CCTexture2D.h" #include "renderer/CCTexture2D.h"
#include "base/ccTypes.h" #include "base/ccTypes.h"
#include "2d/CCNode.h" #include "2d/CCNode.h"
#include "renderer/CCCustomCommand.h" #include "renderer/CCCustomCommand.h"

4
cocos/2d/CCNode.cpp
View File

@ -36,10 +36,10 @@ THE SOFTWARE.
#include "base/CCEventDispatcher.h" #include "base/CCEventDispatcher.h"
#include "base/CCEvent.h" #include "base/CCEvent.h"
#include "base/CCEventTouch.h" #include "base/CCEventTouch.h"
#include "2d/ccCArray.h" #include "base/ccCArray.h"
#include "2d/CCGrid.h" #include "2d/CCGrid.h"
#include "2d/CCActionManager.h" #include "2d/CCActionManager.h"
#include "2d/CCScriptSupport.h" #include "base/CCScriptSupport.h"
#include "2d/CCScene.h" #include "2d/CCScene.h"
#include "2d/CCComponent.h" #include "2d/CCComponent.h"
#include "2d/CCComponentContainer.h" #include "2d/CCComponentContainer.h"

4
cocos/2d/CCNode.h
View File

@ -32,11 +32,11 @@
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "base/CCEventDispatcher.h" #include "base/CCEventDispatcher.h"
#include "base/CCVector.h" #include "base/CCVector.h"
#include "base/CCScriptSupport.h"
#include "base/CCProtocols.h"
#include "math/CCAffineTransform.h" #include "math/CCAffineTransform.h"
#include "math/CCMath.h" #include "math/CCMath.h"
#include "renderer/ccGLStateCache.h" #include "renderer/ccGLStateCache.h"
#include "2d/CCScriptSupport.h"
#include "2d/CCProtocols.h"
#include "CCGL.h" #include "CCGL.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/2d/CCParallaxNode.cpp
View File

@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCParallaxNode.h" #include "CCParallaxNode.h"
#include "2d/ccCArray.h" #include "base/ccCArray.h"
NS_CC_BEGIN NS_CC_BEGIN

6
cocos/2d/CCParticleBatchNode.cpp
View File

@ -30,16 +30,16 @@
#include "2d/CCParticleBatchNode.h" #include "2d/CCParticleBatchNode.h"
#include "2d/CCTextureCache.h" #include "renderer/CCTextureAtlas.h"
#include "2d/CCTextureAtlas.h"
#include "2d/CCGrid.h" #include "2d/CCGrid.h"
#include "2d/CCParticleSystem.h" #include "2d/CCParticleSystem.h"
#include "2d/platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "base/CCProfiling.h" #include "base/CCProfiling.h"
#include "base/ccConfig.h" #include "base/ccConfig.h"
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "base/base64.h" #include "base/base64.h"
#include "base/ZipUtils.h" #include "base/ZipUtils.h"
#include "renderer/CCTextureCache.h"
#include "renderer/CCGLProgramState.h" #include "renderer/CCGLProgramState.h"
#include "renderer/CCGLProgram.h" #include "renderer/CCGLProgram.h"
#include "renderer/ccGLStateCache.h" #include "renderer/ccGLStateCache.h"

2
cocos/2d/CCParticleBatchNode.h
View File

@ -31,7 +31,7 @@
#define __CCPARTICLEBATCHNODE_H__ #define __CCPARTICLEBATCHNODE_H__
#include "2d/CCNode.h" #include "2d/CCNode.h"
#include "2d/CCProtocols.h" #include "base/CCProtocols.h"
#include "renderer/CCBatchCommand.h" #include "renderer/CCBatchCommand.h"
NS_CC_BEGIN NS_CC_BEGIN

9
cocos/2d/CCParticleExamples.cpp
View File

@ -24,11 +24,12 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCParticleExamples.h"
#include "2d/CCParticleExamples.h"
#include "platform/CCImage.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "2d/CCTextureCache.h" #include "base/firePngData.h"
#include "firePngData.h" #include "renderer/CCTextureCache.h"
#include "2d/platform/CCImage.h"
NS_CC_BEGIN NS_CC_BEGIN
// //

14
cocos/2d/CCParticleSystem.cpp
View File

@ -42,21 +42,21 @@ THE SOFTWARE.
// cocos2d uses a another approach, but the results are almost identical. // cocos2d uses a another approach, but the results are almost identical.
// //
#include "CCParticleSystem.h" #include "2d/CCParticleSystem.h"
#include <string> #include <string>
#include "CCParticleBatchNode.h" #include "2d/CCParticleBatchNode.h"
#include "renderer/CCTextureAtlas.h"
#include "platform/CCFileUtils.h"
#include "platform/CCImage.h"
#include "base/ccTypes.h" #include "base/ccTypes.h"
#include "2d/CCTextureCache.h"
#include "2d/CCTextureAtlas.h"
#include "base/base64.h" #include "base/base64.h"
#include "2d/platform/CCFileUtils.h"
#include "2d/platform/CCImage.h"
#include "base/ZipUtils.h" #include "base/ZipUtils.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "base/CCProfiling.h" #include "base/CCProfiling.h"
// opengl #include "renderer/CCTextureCache.h"
#include "CCGL.h" #include "CCGL.h"
using namespace std; using namespace std;

2
cocos/2d/CCParticleSystem.h
View File

@ -27,7 +27,7 @@ THE SOFTWARE.
#ifndef __CCPARTICLE_SYSTEM_H__ #ifndef __CCPARTICLE_SYSTEM_H__
#define __CCPARTICLE_SYSTEM_H__ #define __CCPARTICLE_SYSTEM_H__
#include "2d/CCProtocols.h" #include "base/CCProtocols.h"
#include "2d/CCNode.h" #include "2d/CCNode.h"
#include "base/CCValue.h" #include "base/CCValue.h"
#include "deprecated/CCString.h" #include "deprecated/CCString.h"

2
cocos/2d/CCParticleSystemQuad.cpp
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#include "2d/CCParticleSystemQuad.h" #include "2d/CCParticleSystemQuad.h"
#include "2d/CCSpriteFrame.h" #include "2d/CCSpriteFrame.h"
#include "2d/CCParticleBatchNode.h" #include "2d/CCParticleBatchNode.h"
#include "2d/CCTextureAtlas.h" #include "renderer/CCTextureAtlas.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "base/CCEventType.h" #include "base/CCEventType.h"
#include "base/CCConfiguration.h" #include "base/CCConfiguration.h"

2
cocos/2d/CCProgressTimer.cpp
View File

@ -27,8 +27,8 @@ THE SOFTWARE.
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "2d/CCTextureCache.h"
#include "2d/CCDrawingPrimitives.h" #include "2d/CCDrawingPrimitives.h"
#include "renderer/CCTextureCache.h"
#include "renderer/CCGLProgram.h" #include "renderer/CCGLProgram.h"
#include "renderer/CCGLProgramState.h" #include "renderer/CCGLProgramState.h"
#include "renderer/ccGLStateCache.h" #include "renderer/ccGLStateCache.h"

26
cocos/2d/CCRenderTexture.cpp
View File

@ -24,27 +24,27 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "base/CCConfiguration.h"
#include "2d/CCRenderTexture.h" #include "2d/CCRenderTexture.h"
#include "base/ccUtils.h"
#include "platform/CCImage.h"
#include "platform/CCFileUtils.h"
#include "2d/CCGrid.h"
#include "base/CCEventType.h"
#include "base/CCConfiguration.h"
#include "base/CCConfiguration.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "2d/platform/CCImage.h" #include "base/CCEventListenerCustom.h"
#include "base/CCEventDispatcher.h"
#include "renderer/CCGLProgram.h" #include "renderer/CCGLProgram.h"
#include "renderer/ccGLStateCache.h" #include "renderer/ccGLStateCache.h"
#include "base/CCConfiguration.h" #include "renderer/CCTextureCache.h"
#include "2d/ccUtils.h"
#include "2d/CCTextureCache.h"
#include "2d/platform/CCFileUtils.h"
#include "CCGL.h"
#include "base/CCEventType.h"
#include "2d/CCGrid.h"
#include "renderer/CCRenderer.h" #include "renderer/CCRenderer.h"
#include "renderer/CCGroupCommand.h" #include "renderer/CCGroupCommand.h"
#include "renderer/CCCustomCommand.h" #include "renderer/CCCustomCommand.h"
// extern #include "CCGL.h"
#include "base/CCEventListenerCustom.h"
#include "base/CCEventDispatcher.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/2d/CCRenderTexture.h
View File

@ -28,7 +28,7 @@ THE SOFTWARE.
#include "2d/CCNode.h" #include "2d/CCNode.h"
#include "2d/CCSprite.h" #include "2d/CCSprite.h"
#include "2d/platform/CCImage.h" #include "platform/CCImage.h"
#include "renderer/CCGroupCommand.h" #include "renderer/CCGroupCommand.h"
#include "renderer/CCCustomCommand.h" #include "renderer/CCCustomCommand.h"

10
cocos/2d/CCSprite.cpp
View File

@ -26,14 +26,18 @@ THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "2d/CCSprite.h" #include "2d/CCSprite.h"
#include <string.h>
#include <algorithm>
#include "2d/CCSpriteBatchNode.h" #include "2d/CCSpriteBatchNode.h"
#include "2d/CCAnimation.h" #include "2d/CCAnimation.h"
#include "2d/CCAnimationCache.h" #include "2d/CCAnimationCache.h"
#include "2d/CCSpriteFrame.h" #include "2d/CCSpriteFrame.h"
#include "2d/CCSpriteFrameCache.h" #include "2d/CCSpriteFrameCache.h"
#include "2d/CCTextureCache.h"
#include "2d/CCDrawingPrimitives.h" #include "2d/CCDrawingPrimitives.h"
#include "2d/CCTexture2D.h" #include "renderer/CCTextureCache.h"
#include "renderer/CCTexture2D.h"
#include "renderer/CCGLProgramState.h" #include "renderer/CCGLProgramState.h"
#include "renderer/ccGLStateCache.h" #include "renderer/ccGLStateCache.h"
#include "renderer/CCGLProgram.h" #include "renderer/CCGLProgram.h"
@ -48,8 +52,6 @@ THE SOFTWARE.
#include "deprecated/CCString.h" #include "deprecated/CCString.h"
#include <string.h>
#include <algorithm>
NS_CC_BEGIN NS_CC_BEGIN

4
cocos/2d/CCSprite.h
View File

@ -29,8 +29,8 @@ THE SOFTWARE.
#define __SPRITE_NODE_CCSPRITE_H__ #define __SPRITE_NODE_CCSPRITE_H__
#include "2d/CCNode.h" #include "2d/CCNode.h"
#include "2d/CCProtocols.h" #include "base/CCProtocols.h"
#include "2d/CCTextureAtlas.h" #include "renderer/CCTextureAtlas.h"
#include "base/ccTypes.h" #include "base/ccTypes.h"
#include <string> #include <string>
#ifdef EMSCRIPTEN #ifdef EMSCRIPTEN

6
cocos/2d/CCSpriteBatchNode.cpp
View File

@ -28,15 +28,17 @@ THE SOFTWARE.
#include "2d/CCSpriteBatchNode.h" #include "2d/CCSpriteBatchNode.h"
#include <algorithm>
#include "2d/CCSprite.h" #include "2d/CCSprite.h"
#include "2d/CCGrid.h" #include "2d/CCGrid.h"
#include "2d/CCDrawingPrimitives.h" #include "2d/CCDrawingPrimitives.h"
#include "2d/CCTextureCache.h"
#include "2d/CCLayer.h" #include "2d/CCLayer.h"
#include "2d/CCScene.h" #include "2d/CCScene.h"
#include "base/ccConfig.h" #include "base/ccConfig.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "base/CCProfiling.h" #include "base/CCProfiling.h"
#include "renderer/CCTextureCache.h"
#include "renderer/CCGLProgramState.h" #include "renderer/CCGLProgramState.h"
#include "renderer/CCGLProgram.h" #include "renderer/CCGLProgram.h"
#include "renderer/ccGLStateCache.h" #include "renderer/ccGLStateCache.h"
@ -46,8 +48,6 @@ THE SOFTWARE.
#include "deprecated/CCString.h" // For StringUtils::format #include "deprecated/CCString.h" // For StringUtils::format
// external
#include <algorithm>
NS_CC_BEGIN NS_CC_BEGIN

4
cocos/2d/CCSpriteBatchNode.h
View File

@ -32,9 +32,9 @@ THE SOFTWARE.
#include <vector> #include <vector>
#include "2d/CCNode.h" #include "2d/CCNode.h"
#include "2d/CCProtocols.h" #include "base/CCProtocols.h"
#include "2d/CCTextureAtlas.h"
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "renderer/CCTextureAtlas.h"
#include "renderer/CCBatchCommand.h" #include "renderer/CCBatchCommand.h"
NS_CC_BEGIN NS_CC_BEGIN

3
cocos/2d/CCSpriteFrame.cpp
View File

@ -24,7 +24,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "2d/CCTextureCache.h"
#include "renderer/CCTextureCache.h"
#include "2d/CCSpriteFrame.h" #include "2d/CCSpriteFrame.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"

2
cocos/2d/CCSpriteFrame.h
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#define __SPRITE_CCSPRITE_FRAME_H__ #define __SPRITE_CCSPRITE_FRAME_H__
#include "2d/CCNode.h" #include "2d/CCNode.h"
#include "2d/CCProtocols.h" #include "base/CCProtocols.h"
#include "base/CCRef.h" #include "base/CCRef.h"
#include "math/CCGeometry.h" #include "math/CCGeometry.h"

18
cocos/2d/CCSpriteFrameCache.cpp
View File

@ -27,17 +27,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "base/CCNS.h"
#include "base/ccMacros.h"
#include "2d/CCTextureCache.h"
#include "2d/CCSpriteFrameCache.h" #include "2d/CCSpriteFrameCache.h"
#include <vector>
#include "2d/CCSpriteFrame.h" #include "2d/CCSpriteFrame.h"
#include "2d/CCSprite.h" #include "2d/CCSprite.h"
#include "math/TransformUtils.h" #include "platform/CCFileUtils.h"
#include "2d/platform/CCFileUtils.h" #include "base/CCNS.h"
#include "deprecated/CCString.h" #include "base/ccMacros.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include <vector> #include "renderer/CCTextureCache.h"
#include "math/TransformUtils.h"
#include "deprecated/CCString.h"
using namespace std; using namespace std;

2
cocos/2d/CCSpriteFrameCache.h
View File

@ -36,7 +36,7 @@ THE SOFTWARE.
*/ */
#include "2d/CCSpriteFrame.h" #include "2d/CCSpriteFrame.h"
#include "2d/CCTexture2D.h" #include "renderer/CCTexture2D.h"
#include "base/CCRef.h" #include "base/CCRef.h"
#include "base/CCValue.h" #include "base/CCValue.h"
#include "base/CCMap.h" #include "base/CCMap.h"

8
cocos/2d/CCTMXLayer.cpp
View File

@ -24,15 +24,17 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "2d/CCTMXLayer.h" #include "2d/CCTMXLayer.h"
#include "2d/CCTMXXMLParser.h" #include "2d/CCTMXXMLParser.h"
#include "2d/CCTMXTiledMap.h" #include "2d/CCTMXTiledMap.h"
#include "2d/CCSprite.h" #include "2d/CCSprite.h"
#include "2d/CCTextureCache.h" #include "base/ccCArray.h"
#include "2d/ccCArray.h" #include "base/CCDirector.h"
#include "renderer/CCTextureCache.h"
#include "renderer/CCGLProgramState.h" #include "renderer/CCGLProgramState.h"
#include "renderer/CCGLProgram.h" #include "renderer/CCGLProgram.h"
#include "base/CCDirector.h"
#include "deprecated/CCString.h" // For StringUtils::format #include "deprecated/CCString.h" // For StringUtils::format

2
cocos/2d/CCTMXLayer.h
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include "CCAtlasNode.h" #include "CCAtlasNode.h"
#include "2d/CCSpriteBatchNode.h" #include "2d/CCSpriteBatchNode.h"
#include "CCTMXXMLParser.h" #include "CCTMXXMLParser.h"
#include "2d/ccCArray.h" #include "base/ccCArray.h"
NS_CC_BEGIN NS_CC_BEGIN
class TMXMapInfo; class TMXMapInfo;

2
cocos/2d/CCTMXXMLParser.cpp
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include "CCTMXXMLParser.h" #include "CCTMXXMLParser.h"
#include "CCTMXTiledMap.h" #include "CCTMXTiledMap.h"
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "2d/platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "base/ZipUtils.h" #include "base/ZipUtils.h"
#include "base/base64.h" #include "base/base64.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"

2
cocos/2d/CCTMXXMLParser.h
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#define __CC_TM_XML_PARSER__ #define __CC_TM_XML_PARSER__
#include "math/CCGeometry.h" #include "math/CCGeometry.h"
#include "2d/platform/CCSAXParser.h" #include "platform/CCSAXParser.h"
#include "base/CCVector.h" #include "base/CCVector.h"
#include "base/CCValue.h" #include "base/CCValue.h"

2
cocos/2d/CCTextFieldTTF.h
View File

@ -27,7 +27,7 @@ THE SOFTWARE.
#define __CC_TEXT_FIELD_H__ #define __CC_TEXT_FIELD_H__
#include "2d/CCLabel.h" #include "2d/CCLabel.h"
#include "2d/CCIMEDelegate.h" #include "base/CCIMEDelegate.h"
NS_CC_BEGIN NS_CC_BEGIN

6
cocos/2d/CCTileMapAtlas.cpp
View File

@ -25,9 +25,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCTileMapAtlas.h" #include "CCTileMapAtlas.h"
#include "2d/platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "2d/CCTextureAtlas.h" #include "renderer/CCTextureAtlas.h"
#include "TGAlib.h" #include "base/TGAlib.h"
#include "base/ccConfig.h" #include "base/ccConfig.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "deprecated/CCString.h" #include "deprecated/CCString.h"

70
cocos/2d/CMakeLists.txt
View File

@ -2,43 +2,19 @@ if(WIN32)
ADD_DEFINITIONS(-DUNICODE -D_UNICODE) ADD_DEFINITIONS(-DUNICODE -D_UNICODE)
set(COCOS_2D_PLATFORM_SRC
2d/platform/win32/CCStdC.cpp
2d/platform/win32/CCFileUtilsWin32.cpp
2d/platform/win32/CCCommon.cpp
2d/platform/win32/CCApplication.cpp
2d/platform/desktop/CCGLView.cpp
2d/platform/win32/CCDevice.cpp
)
elseif(APPLE)
else()
set(COCOS_2D_PLATFORM_SRC
2d/platform/linux/CCStdC.cpp
2d/platform/linux/CCFileUtilsLinux.cpp
2d/platform/linux/CCCommon.cpp
2d/platform/linux/CCApplication.cpp
2d/platform/desktop/CCGLView.cpp
2d/platform/linux/CCDevice.cpp
)
endif() endif()
include_directories( include_directories(
../external/ConvertUTF ../external/ConvertUTF
) )
set(COCOS_2D_SRC set(COCOS_2D_SRC
2d/ccFPSImages.c
2d/CCAction.cpp
2d/CCActionCamera.cpp 2d/CCActionCamera.cpp
2d/CCActionCatmullRom.cpp 2d/CCActionCatmullRom.cpp
2d/CCAction.cpp
2d/CCActionEase.cpp 2d/CCActionEase.cpp
2d/CCActionGrid.cpp
2d/CCActionGrid3D.cpp 2d/CCActionGrid3D.cpp
2d/CCActionGrid.cpp
2d/CCActionInstant.cpp 2d/CCActionInstant.cpp
2d/CCActionInterval.cpp 2d/CCActionInterval.cpp
2d/CCActionManager.cpp 2d/CCActionManager.cpp
@ -46,29 +22,28 @@ set(COCOS_2D_SRC
2d/CCActionProgressTimer.cpp 2d/CCActionProgressTimer.cpp
2d/CCActionTiledGrid.cpp 2d/CCActionTiledGrid.cpp
2d/CCActionTween.cpp 2d/CCActionTween.cpp
2d/CCAnimation.cpp
2d/CCAnimationCache.cpp 2d/CCAnimationCache.cpp
2d/CCAnimation.cpp
2d/CCAtlasNode.cpp 2d/CCAtlasNode.cpp
2d/CCClippingNode.cpp 2d/CCClippingNode.cpp
2d/CCComponent.cpp
2d/CCComponentContainer.cpp 2d/CCComponentContainer.cpp
2d/CCDrawNode.cpp 2d/CCComponent.cpp
2d/CCDrawingPrimitives.cpp 2d/CCDrawingPrimitives.cpp
2d/CCFont.cpp 2d/CCDrawNode.cpp
2d/CCFontAtlas.cpp
2d/CCFontAtlasCache.cpp 2d/CCFontAtlasCache.cpp
2d/CCFontAtlas.cpp
2d/CCFontCharMap.cpp 2d/CCFontCharMap.cpp
2d/CCFont.cpp
2d/CCFontFNT.cpp 2d/CCFontFNT.cpp
2d/CCFontFreeType.cpp 2d/CCFontFreeType.cpp
2d/CCGLBufferedNode.cpp 2d/CCGLBufferedNode.cpp
2d/CCGrabber.cpp 2d/CCGrabber.cpp
2d/CCGrid.cpp 2d/CCGrid.cpp
2d/CCIMEDispatcher.cpp
2d/CCLabel.cpp
2d/CCLabelAtlas.cpp 2d/CCLabelAtlas.cpp
2d/CCLabelBMFont.cpp 2d/CCLabelBMFont.cpp
2d/CCLabelTTF.cpp 2d/CCLabel.cpp
2d/CCLabelTextFormatter.cpp 2d/CCLabelTextFormatter.cpp
2d/CCLabelTTF.cpp
2d/CCLayer.cpp 2d/CCLayer.cpp
2d/CCMenu.cpp 2d/CCMenu.cpp
2d/CCMenuItem.cpp 2d/CCMenuItem.cpp
@ -83,38 +58,19 @@ set(COCOS_2D_SRC
2d/CCProgressTimer.cpp 2d/CCProgressTimer.cpp
2d/CCRenderTexture.cpp 2d/CCRenderTexture.cpp
2d/CCScene.cpp 2d/CCScene.cpp
2d/CCScriptSupport.cpp
2d/CCSprite.cpp
2d/CCSpriteBatchNode.cpp 2d/CCSpriteBatchNode.cpp
2d/CCSpriteFrame.cpp 2d/CCSprite.cpp
2d/CCSpriteFrameCache.cpp 2d/CCSpriteFrameCache.cpp
2d/CCSpriteFrame.cpp
2d/CCTextFieldTTF.cpp
2d/CCTileMapAtlas.cpp
2d/CCTMXLayer.cpp 2d/CCTMXLayer.cpp
2d/CCTMXObjectGroup.cpp 2d/CCTMXObjectGroup.cpp
2d/CCTMXTiledMap.cpp 2d/CCTMXTiledMap.cpp
2d/CCTMXXMLParser.cpp 2d/CCTMXXMLParser.cpp
2d/CCTextFieldTTF.cpp
2d/CCTexture2D.cpp
2d/CCTextureAtlas.cpp
2d/CCTextureCache.cpp
2d/CCTileMapAtlas.cpp
2d/CCTransition.cpp 2d/CCTransition.cpp
2d/CCTransitionPageTurn.cpp 2d/CCTransitionPageTurn.cpp
2d/CCTransitionProgress.cpp 2d/CCTransitionProgress.cpp
2d/CCTweenFunction.cpp 2d/CCTweenFunction.cpp
2d/CCUserDefault.cpp
2d/CCUserDefaultAndroid.cpp
2d/CCVertex.cpp
2d/TGAlib.cpp
2d/ccCArray.cpp
2d/ccUTF8.cpp
2d/ccUtils.cpp
2d/platform/CCSAXParser.cpp
2d/platform/CCThread.cpp
2d/platform/CCGLViewProtocol.cpp
2d/platform/CCFileUtils.cpp
2d/platform/CCImage.cpp
../external/edtaa3func/edtaa3func.cpp
../external/ConvertUTF/ConvertUTFWrapper.cpp
../external/ConvertUTF/ConvertUTF.c
) )

161
cocos/2d/cocos2d.vcxproj
View File

@ -178,6 +178,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="..\base\atitc.cpp" /> <ClCompile Include="..\base\atitc.cpp" />
<ClCompile Include="..\base\base64.cpp" /> <ClCompile Include="..\base\base64.cpp" />
<ClCompile Include="..\base\CCAutoreleasePool.cpp" /> <ClCompile Include="..\base\CCAutoreleasePool.cpp" />
<ClCompile Include="..\base\ccCArray.cpp" />
<ClCompile Include="..\base\CCConfiguration.cpp" /> <ClCompile Include="..\base\CCConfiguration.cpp" />
<ClCompile Include="..\base\CCConsole.cpp" /> <ClCompile Include="..\base\CCConsole.cpp" />
<ClCompile Include="..\base\CCData.cpp" /> <ClCompile Include="..\base\CCData.cpp" />
@ -198,15 +199,23 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="..\base\CCEventListenerTouch.cpp" /> <ClCompile Include="..\base\CCEventListenerTouch.cpp" />
<ClCompile Include="..\base\CCEventMouse.cpp" /> <ClCompile Include="..\base\CCEventMouse.cpp" />
<ClCompile Include="..\base\CCEventTouch.cpp" /> <ClCompile Include="..\base\CCEventTouch.cpp" />
<ClCompile Include="..\base\ccFPSImages.c" />
<ClCompile Include="..\base\CCIMEDispatcher.cpp" />
<ClCompile Include="..\base\CCNS.cpp" /> <ClCompile Include="..\base\CCNS.cpp" />
<ClCompile Include="..\base\CCProfiling.cpp" /> <ClCompile Include="..\base\CCProfiling.cpp" />
<ClCompile Include="..\base\CCRef.cpp" /> <ClCompile Include="..\base\CCRef.cpp" />
<ClCompile Include="..\base\CCScheduler.cpp" /> <ClCompile Include="..\base\CCScheduler.cpp" />
<ClCompile Include="..\base\CCScriptSupport.cpp" />
<ClCompile Include="..\base\CCTouch.cpp" /> <ClCompile Include="..\base\CCTouch.cpp" />
<ClCompile Include="..\base\ccTypes.cpp" /> <ClCompile Include="..\base\ccTypes.cpp" />
<ClCompile Include="..\base\CCUserDefault.cpp" />
<ClCompile Include="..\base\CCUserDefaultAndroid.cpp" />
<ClCompile Include="..\base\ccUTF8.cpp" />
<ClCompile Include="..\base\ccUtils.cpp" />
<ClCompile Include="..\base\CCValue.cpp" /> <ClCompile Include="..\base\CCValue.cpp" />
<ClCompile Include="..\base\etc1.cpp" /> <ClCompile Include="..\base\etc1.cpp" />
<ClCompile Include="..\base\s3tc.cpp" /> <ClCompile Include="..\base\s3tc.cpp" />
<ClCompile Include="..\base\TGAlib.cpp" />
<ClCompile Include="..\base\ZipUtils.cpp" /> <ClCompile Include="..\base\ZipUtils.cpp" />
<ClCompile Include="..\cocos2d.cpp" /> <ClCompile Include="..\cocos2d.cpp" />
<ClCompile Include="..\deprecated\CCArray.cpp" /> <ClCompile Include="..\deprecated\CCArray.cpp" />
@ -217,13 +226,14 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="..\deprecated\CCString.cpp" /> <ClCompile Include="..\deprecated\CCString.cpp" />
<ClCompile Include="..\math\CCAffineTransform.cpp" /> <ClCompile Include="..\math\CCAffineTransform.cpp" />
<ClCompile Include="..\math\CCGeometry.cpp" /> <ClCompile Include="..\math\CCGeometry.cpp" />
<ClCompile Include="..\math\CCVertex.cpp" />
<ClCompile Include="..\math\Mat4.cpp" />
<ClCompile Include="..\math\MathUtil.cpp" /> <ClCompile Include="..\math\MathUtil.cpp" />
<ClCompile Include="..\math\Matrix.cpp" />
<ClCompile Include="..\math\Quaternion.cpp" /> <ClCompile Include="..\math\Quaternion.cpp" />
<ClCompile Include="..\math\TransformUtils.cpp" /> <ClCompile Include="..\math\TransformUtils.cpp" />
<ClCompile Include="..\math\Vector2.cpp" /> <ClCompile Include="..\math\Vec2.cpp" />
<ClCompile Include="..\math\Vector3.cpp" /> <ClCompile Include="..\math\Vec3.cpp" />
<ClCompile Include="..\math\Vector4.cpp" /> <ClCompile Include="..\math\Vec4.cpp" />
<ClCompile Include="..\physics\CCPhysicsBody.cpp" /> <ClCompile Include="..\physics\CCPhysicsBody.cpp" />
<ClCompile Include="..\physics\CCPhysicsContact.cpp" /> <ClCompile Include="..\physics\CCPhysicsContact.cpp" />
<ClCompile Include="..\physics\CCPhysicsJoint.cpp" /> <ClCompile Include="..\physics\CCPhysicsJoint.cpp" />
@ -234,6 +244,17 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.cpp" /> <ClCompile Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.cpp" />
<ClCompile Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.cpp" /> <ClCompile Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.cpp" />
<ClCompile Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.cpp" /> <ClCompile Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.cpp" />
<ClCompile Include="..\platform\CCFileUtils.cpp" />
<ClCompile Include="..\platform\CCGLViewProtocol.cpp" />
<ClCompile Include="..\platform\CCImage.cpp" />
<ClCompile Include="..\platform\CCSAXParser.cpp" />
<ClCompile Include="..\platform\CCThread.cpp" />
<ClCompile Include="..\platform\desktop\CCGLView.cpp" />
<ClCompile Include="..\platform\win32\CCApplication.cpp" />
<ClCompile Include="..\platform\win32\CCCommon.cpp" />
<ClCompile Include="..\platform\win32\CCDevice.cpp" />
<ClCompile Include="..\platform\win32\CCFileUtilsWin32.cpp" />
<ClCompile Include="..\platform\win32\CCStdC.cpp" />
<ClCompile Include="..\renderer\CCBatchCommand.cpp" /> <ClCompile Include="..\renderer\CCBatchCommand.cpp" />
<ClCompile Include="..\renderer\CCCustomCommand.cpp" /> <ClCompile Include="..\renderer\CCCustomCommand.cpp" />
<ClCompile Include="..\renderer\CCGLProgram.cpp" /> <ClCompile Include="..\renderer\CCGLProgram.cpp" />
@ -246,6 +267,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="..\renderer\CCRenderCommand.cpp" /> <ClCompile Include="..\renderer\CCRenderCommand.cpp" />
<ClCompile Include="..\renderer\CCRenderer.cpp" /> <ClCompile Include="..\renderer\CCRenderer.cpp" />
<ClCompile Include="..\renderer\ccShaders.cpp" /> <ClCompile Include="..\renderer\ccShaders.cpp" />
<ClCompile Include="..\renderer\CCTexture2D.cpp" />
<ClCompile Include="..\renderer\CCTextureAtlas.cpp" />
<ClCompile Include="..\renderer\CCTextureCache.cpp" />
<ClCompile Include="CCAction.cpp" /> <ClCompile Include="CCAction.cpp" />
<ClCompile Include="CCActionCamera.cpp" /> <ClCompile Include="CCActionCamera.cpp" />
<ClCompile Include="CCActionCatmullRom.cpp" /> <ClCompile Include="CCActionCatmullRom.cpp" />
@ -262,7 +286,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="CCAnimation.cpp" /> <ClCompile Include="CCAnimation.cpp" />
<ClCompile Include="CCAnimationCache.cpp" /> <ClCompile Include="CCAnimationCache.cpp" />
<ClCompile Include="CCAtlasNode.cpp" /> <ClCompile Include="CCAtlasNode.cpp" />
<ClCompile Include="ccCArray.cpp" />
<ClCompile Include="CCClippingNode.cpp" /> <ClCompile Include="CCClippingNode.cpp" />
<ClCompile Include="CCComponent.cpp" /> <ClCompile Include="CCComponent.cpp" />
<ClCompile Include="CCComponentContainer.cpp" /> <ClCompile Include="CCComponentContainer.cpp" />
@ -274,11 +297,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="CCFontCharMap.cpp" /> <ClCompile Include="CCFontCharMap.cpp" />
<ClCompile Include="CCFontFNT.cpp" /> <ClCompile Include="CCFontFNT.cpp" />
<ClCompile Include="CCFontFreeType.cpp" /> <ClCompile Include="CCFontFreeType.cpp" />
<ClCompile Include="ccFPSImages.c" /> <ClCompile Include="CCGLBufferedNode.cpp" />
<ClCompile Include="CCGrabber.cpp" /> <ClCompile Include="CCGrabber.cpp" />
<ClCompile Include="CCGrid.cpp" /> <ClCompile Include="CCGrid.cpp" />
<ClCompile Include="CCNodeGrid.cpp" />
<ClCompile Include="CCIMEDispatcher.cpp" />
<ClCompile Include="CCLabel.cpp" /> <ClCompile Include="CCLabel.cpp" />
<ClCompile Include="CCLabelAtlas.cpp" /> <ClCompile Include="CCLabelAtlas.cpp" />
<ClCompile Include="CCLabelBMFont.cpp" /> <ClCompile Include="CCLabelBMFont.cpp" />
@ -289,6 +310,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="CCMenuItem.cpp" /> <ClCompile Include="CCMenuItem.cpp" />
<ClCompile Include="CCMotionStreak.cpp" /> <ClCompile Include="CCMotionStreak.cpp" />
<ClCompile Include="CCNode.cpp" /> <ClCompile Include="CCNode.cpp" />
<ClCompile Include="CCNodeGrid.cpp" />
<ClCompile Include="CCParallaxNode.cpp" /> <ClCompile Include="CCParallaxNode.cpp" />
<ClCompile Include="CCParticleBatchNode.cpp" /> <ClCompile Include="CCParticleBatchNode.cpp" />
<ClCompile Include="CCParticleExamples.cpp" /> <ClCompile Include="CCParticleExamples.cpp" />
@ -297,15 +319,11 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="CCProgressTimer.cpp" /> <ClCompile Include="CCProgressTimer.cpp" />
<ClCompile Include="CCRenderTexture.cpp" /> <ClCompile Include="CCRenderTexture.cpp" />
<ClCompile Include="CCScene.cpp" /> <ClCompile Include="CCScene.cpp" />
<ClCompile Include="CCScriptSupport.cpp" />
<ClCompile Include="CCSprite.cpp" /> <ClCompile Include="CCSprite.cpp" />
<ClCompile Include="CCSpriteBatchNode.cpp" /> <ClCompile Include="CCSpriteBatchNode.cpp" />
<ClCompile Include="CCSpriteFrame.cpp" /> <ClCompile Include="CCSpriteFrame.cpp" />
<ClCompile Include="CCSpriteFrameCache.cpp" /> <ClCompile Include="CCSpriteFrameCache.cpp" />
<ClCompile Include="CCTextFieldTTF.cpp" /> <ClCompile Include="CCTextFieldTTF.cpp" />
<ClCompile Include="CCTexture2D.cpp" />
<ClCompile Include="CCTextureAtlas.cpp" />
<ClCompile Include="CCTextureCache.cpp" />
<ClCompile Include="CCTileMapAtlas.cpp" /> <ClCompile Include="CCTileMapAtlas.cpp" />
<ClCompile Include="CCTMXLayer.cpp" /> <ClCompile Include="CCTMXLayer.cpp" />
<ClCompile Include="CCTMXObjectGroup.cpp" /> <ClCompile Include="CCTMXObjectGroup.cpp" />
@ -315,22 +333,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="CCTransitionPageTurn.cpp" /> <ClCompile Include="CCTransitionPageTurn.cpp" />
<ClCompile Include="CCTransitionProgress.cpp" /> <ClCompile Include="CCTransitionProgress.cpp" />
<ClCompile Include="CCTweenFunction.cpp" /> <ClCompile Include="CCTweenFunction.cpp" />
<ClCompile Include="CCUserDefault.cpp" />
<ClCompile Include="ccUTF8.cpp" />
<ClCompile Include="ccUtils.cpp" />
<ClCompile Include="CCVertex.cpp" />
<ClCompile Include="platform\CCGLViewProtocol.cpp" />
<ClCompile Include="platform\CCFileUtils.cpp" />
<ClCompile Include="platform\CCImage.cpp" />
<ClCompile Include="platform\CCSAXParser.cpp" />
<ClCompile Include="platform\CCThread.cpp" />
<ClCompile Include="platform\desktop\CCGLView.cpp" />
<ClCompile Include="platform\win32\CCApplication.cpp" />
<ClCompile Include="platform\win32\CCCommon.cpp" />
<ClCompile Include="platform\win32\CCDevice.cpp" />
<ClCompile Include="platform\win32\CCFileUtilsWin32.cpp" />
<ClCompile Include="platform\win32\CCStdC.cpp" />
<ClCompile Include="TGAlib.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\external\ConvertUTF\ConvertUTF.h" /> <ClInclude Include="..\..\external\ConvertUTF\ConvertUTF.h" />
@ -342,6 +344,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="..\base\atitc.h" /> <ClInclude Include="..\base\atitc.h" />
<ClInclude Include="..\base\base64.h" /> <ClInclude Include="..\base\base64.h" />
<ClInclude Include="..\base\CCAutoreleasePool.h" /> <ClInclude Include="..\base\CCAutoreleasePool.h" />
<ClInclude Include="..\base\ccCArray.h" />
<ClInclude Include="..\base\ccConfig.h" /> <ClInclude Include="..\base\ccConfig.h" />
<ClInclude Include="..\base\CCConfiguration.h" /> <ClInclude Include="..\base\CCConfiguration.h" />
<ClInclude Include="..\base\CCConsole.h" /> <ClInclude Include="..\base\CCConsole.h" />
@ -364,21 +367,33 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="..\base\CCEventMouse.h" /> <ClInclude Include="..\base\CCEventMouse.h" />
<ClInclude Include="..\base\CCEventTouch.h" /> <ClInclude Include="..\base\CCEventTouch.h" />
<ClInclude Include="..\base\CCEventType.h" /> <ClInclude Include="..\base\CCEventType.h" />
<ClInclude Include="..\base\ccFPSImages.h" />
<ClInclude Include="..\base\CCIMEDelegate.h" />
<ClInclude Include="..\base\CCIMEDispatcher.h" />
<ClInclude Include="..\base\ccMacros.h" /> <ClInclude Include="..\base\ccMacros.h" />
<ClInclude Include="..\base\CCMap.h" /> <ClInclude Include="..\base\CCMap.h" />
<ClInclude Include="..\base\CCNS.h" /> <ClInclude Include="..\base\CCNS.h" />
<ClInclude Include="..\base\CCPlatformConfig.h" /> <ClInclude Include="..\base\CCPlatformConfig.h" />
<ClInclude Include="..\base\CCPlatformMacros.h" /> <ClInclude Include="..\base\CCPlatformMacros.h" />
<ClInclude Include="..\base\CCProfiling.h" /> <ClInclude Include="..\base\CCProfiling.h" />
<ClInclude Include="..\base\CCProtocols.h" />
<ClInclude Include="..\base\CCRef.h" /> <ClInclude Include="..\base\CCRef.h" />
<ClInclude Include="..\base\CCRefPtr.h" /> <ClInclude Include="..\base\CCRefPtr.h" />
<ClInclude Include="..\base\CCScheduler.h" /> <ClInclude Include="..\base\CCScheduler.h" />
<ClInclude Include="..\base\CCScriptSupport.h" />
<ClInclude Include="..\base\CCTouch.h" /> <ClInclude Include="..\base\CCTouch.h" />
<ClInclude Include="..\base\ccTypes.h" /> <ClInclude Include="..\base\ccTypes.h" />
<ClInclude Include="..\base\CCUserDefault.h" />
<ClInclude Include="..\base\ccUTF8.h" />
<ClInclude Include="..\base\ccUtils.h" />
<ClInclude Include="..\base\CCValue.h" /> <ClInclude Include="..\base\CCValue.h" />
<ClInclude Include="..\base\CCVector.h" /> <ClInclude Include="..\base\CCVector.h" />
<ClInclude Include="..\base\etc1.h" /> <ClInclude Include="..\base\etc1.h" />
<ClInclude Include="..\base\firePngData.h" />
<ClInclude Include="..\base\s3tc.h" /> <ClInclude Include="..\base\s3tc.h" />
<ClInclude Include="..\base\TGAlib.h" />
<ClInclude Include="..\base\uthash.h" />
<ClInclude Include="..\base\utlist.h" />
<ClInclude Include="..\base\ZipUtils.h" /> <ClInclude Include="..\base\ZipUtils.h" />
<ClInclude Include="..\cocos2d.h" /> <ClInclude Include="..\cocos2d.h" />
<ClInclude Include="..\deprecated\CCArray.h" /> <ClInclude Include="..\deprecated\CCArray.h" />
@ -395,13 +410,14 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="..\math\CCGeometry.h" /> <ClInclude Include="..\math\CCGeometry.h" />
<ClInclude Include="..\math\CCMath.h" /> <ClInclude Include="..\math\CCMath.h" />
<ClInclude Include="..\math\CCMathBase.h" /> <ClInclude Include="..\math\CCMathBase.h" />
<ClInclude Include="..\math\CCVertex.h" />
<ClInclude Include="..\math\Mat4.h" />
<ClInclude Include="..\math\MathUtil.h" /> <ClInclude Include="..\math\MathUtil.h" />
<ClInclude Include="..\math\Matrix.h" />
<ClInclude Include="..\math\Quaternion.h" /> <ClInclude Include="..\math\Quaternion.h" />
<ClInclude Include="..\math\TransformUtils.h" /> <ClInclude Include="..\math\TransformUtils.h" />
<ClInclude Include="..\math\Vector2.h" /> <ClInclude Include="..\math\Vec2.h" />
<ClInclude Include="..\math\Vector3.h" /> <ClInclude Include="..\math\Vec3.h" />
<ClInclude Include="..\math\Vector4.h" /> <ClInclude Include="..\math\Vec4.h" />
<ClInclude Include="..\physics\CCPhysicsBody.h" /> <ClInclude Include="..\physics\CCPhysicsBody.h" />
<ClInclude Include="..\physics\CCPhysicsContact.h" /> <ClInclude Include="..\physics\CCPhysicsContact.h" />
<ClInclude Include="..\physics\CCPhysicsJoint.h" /> <ClInclude Include="..\physics\CCPhysicsJoint.h" />
@ -413,6 +429,21 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.h" /> <ClInclude Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.h" />
<ClInclude Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.h" /> <ClInclude Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.h" />
<ClInclude Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.h" /> <ClInclude Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.h" />
<ClInclude Include="..\platform\CCApplicationProtocol.h" />
<ClInclude Include="..\platform\CCCommon.h" />
<ClInclude Include="..\platform\CCDevice.h" />
<ClInclude Include="..\platform\CCFileUtils.h" />
<ClInclude Include="..\platform\CCGLViewProtocol.h" />
<ClInclude Include="..\platform\CCImage.h" />
<ClInclude Include="..\platform\CCSAXParser.h" />
<ClInclude Include="..\platform\CCThread.h" />
<ClInclude Include="..\platform\desktop\CCGLView.h" />
<ClInclude Include="..\platform\win32\CCApplication.h" />
<ClInclude Include="..\platform\win32\CCFileUtilsWin32.h" />
<ClInclude Include="..\platform\win32\CCGL.h" />
<ClInclude Include="..\platform\win32\CCPlatformDefine.h" />
<ClInclude Include="..\platform\win32\CCStdC.h" />
<ClInclude Include="..\platform\win32\compat\stdint.h" />
<ClInclude Include="..\renderer\CCBatchCommand.h" /> <ClInclude Include="..\renderer\CCBatchCommand.h" />
<ClInclude Include="..\renderer\CCCustomCommand.h" /> <ClInclude Include="..\renderer\CCCustomCommand.h" />
<ClInclude Include="..\renderer\CCGLProgram.h" /> <ClInclude Include="..\renderer\CCGLProgram.h" />
@ -426,6 +457,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="..\renderer\CCRenderCommandPool.h" /> <ClInclude Include="..\renderer\CCRenderCommandPool.h" />
<ClInclude Include="..\renderer\CCRenderer.h" /> <ClInclude Include="..\renderer\CCRenderer.h" />
<ClInclude Include="..\renderer\ccShaders.h" /> <ClInclude Include="..\renderer\ccShaders.h" />
<ClInclude Include="..\renderer\CCTexture2D.h" />
<ClInclude Include="..\renderer\CCTextureAtlas.h" />
<ClInclude Include="..\renderer\CCTextureCache.h" />
<ClInclude Include="CCAction.h" /> <ClInclude Include="CCAction.h" />
<ClInclude Include="CCActionCamera.h" /> <ClInclude Include="CCActionCamera.h" />
<ClInclude Include="CCActionCatmullRom.h" /> <ClInclude Include="CCActionCatmullRom.h" />
@ -442,7 +476,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="CCAnimation.h" /> <ClInclude Include="CCAnimation.h" />
<ClInclude Include="CCAnimationCache.h" /> <ClInclude Include="CCAnimationCache.h" />
<ClInclude Include="CCAtlasNode.h" /> <ClInclude Include="CCAtlasNode.h" />
<ClInclude Include="ccCArray.h" />
<ClInclude Include="CCClippingNode.h" /> <ClInclude Include="CCClippingNode.h" />
<ClInclude Include="CCComponent.h" /> <ClInclude Include="CCComponent.h" />
<ClInclude Include="CCComponentContainer.h" /> <ClInclude Include="CCComponentContainer.h" />
@ -454,12 +487,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="CCFontCharMap.h" /> <ClInclude Include="CCFontCharMap.h" />
<ClInclude Include="CCFontFNT.h" /> <ClInclude Include="CCFontFNT.h" />
<ClInclude Include="CCFontFreeType.h" /> <ClInclude Include="CCFontFreeType.h" />
<ClInclude Include="ccFPSImages.h" /> <ClInclude Include="CCGLBufferedNode.h" />
<ClInclude Include="CCGrabber.h" /> <ClInclude Include="CCGrabber.h" />
<ClInclude Include="CCGrid.h" /> <ClInclude Include="CCGrid.h" />
<ClInclude Include="CCNodeGrid.h" />
<ClInclude Include="CCIMEDelegate.h" />
<ClInclude Include="CCIMEDispatcher.h" />
<ClInclude Include="CCLabel.h" /> <ClInclude Include="CCLabel.h" />
<ClInclude Include="CCLabelAtlas.h" /> <ClInclude Include="CCLabelAtlas.h" />
<ClInclude Include="CCLabelBMFont.h" /> <ClInclude Include="CCLabelBMFont.h" />
@ -470,24 +500,20 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="CCMenuItem.h" /> <ClInclude Include="CCMenuItem.h" />
<ClInclude Include="CCMotionStreak.h" /> <ClInclude Include="CCMotionStreak.h" />
<ClInclude Include="CCNode.h" /> <ClInclude Include="CCNode.h" />
<ClInclude Include="CCNodeGrid.h" />
<ClInclude Include="CCParallaxNode.h" /> <ClInclude Include="CCParallaxNode.h" />
<ClInclude Include="CCParticleBatchNode.h" /> <ClInclude Include="CCParticleBatchNode.h" />
<ClInclude Include="CCParticleExamples.h" /> <ClInclude Include="CCParticleExamples.h" />
<ClInclude Include="CCParticleSystem.h" /> <ClInclude Include="CCParticleSystem.h" />
<ClInclude Include="CCParticleSystemQuad.h" /> <ClInclude Include="CCParticleSystemQuad.h" />
<ClInclude Include="CCProgressTimer.h" /> <ClInclude Include="CCProgressTimer.h" />
<ClInclude Include="CCProtocols.h" />
<ClInclude Include="CCRenderTexture.h" /> <ClInclude Include="CCRenderTexture.h" />
<ClInclude Include="CCScene.h" /> <ClInclude Include="CCScene.h" />
<ClInclude Include="CCScriptSupport.h" />
<ClInclude Include="CCSprite.h" /> <ClInclude Include="CCSprite.h" />
<ClInclude Include="CCSpriteBatchNode.h" /> <ClInclude Include="CCSpriteBatchNode.h" />
<ClInclude Include="CCSpriteFrame.h" /> <ClInclude Include="CCSpriteFrame.h" />
<ClInclude Include="CCSpriteFrameCache.h" /> <ClInclude Include="CCSpriteFrameCache.h" />
<ClInclude Include="CCTextFieldTTF.h" /> <ClInclude Include="CCTextFieldTTF.h" />
<ClInclude Include="CCTexture2D.h" />
<ClInclude Include="CCTextureAtlas.h" />
<ClInclude Include="CCTextureCache.h" />
<ClInclude Include="CCTileMapAtlas.h" /> <ClInclude Include="CCTileMapAtlas.h" />
<ClInclude Include="CCTMXLayer.h" /> <ClInclude Include="CCTMXLayer.h" />
<ClInclude Include="CCTMXObjectGroup.h" /> <ClInclude Include="CCTMXObjectGroup.h" />
@ -497,58 +523,15 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="CCTransitionPageTurn.h" /> <ClInclude Include="CCTransitionPageTurn.h" />
<ClInclude Include="CCTransitionProgress.h" /> <ClInclude Include="CCTransitionProgress.h" />
<ClInclude Include="CCTweenFunction.h" /> <ClInclude Include="CCTweenFunction.h" />
<ClInclude Include="CCUserDefault.h" />
<ClInclude Include="ccUTF8.h" />
<ClInclude Include="ccUtils.h" />
<ClInclude Include="CCVertex.h" />
<ClInclude Include="platform\CCApplicationProtocol.h" />
<ClInclude Include="platform\CCCommon.h" />
<ClInclude Include="platform\CCDevice.h" />
<ClInclude Include="platform\CCGLViewProtocol.h" />
<ClInclude Include="platform\CCFileUtils.h" />
<ClInclude Include="platform\CCImage.h" />
<ClInclude Include="platform\CCSAXParser.h" />
<ClInclude Include="platform\CCThread.h" />
<ClInclude Include="platform\desktop\CCGLView.h" />
<ClInclude Include="platform\win32\CCApplication.h" />
<ClInclude Include="platform\win32\CCFileUtilsWin32.h" />
<ClInclude Include="platform\win32\CCGL.h" />
<ClInclude Include="platform\win32\CCPlatformDefine.h" />
<ClInclude Include="platform\win32\CCStdC.h" />
<ClInclude Include="TGAlib.h" />
<ClInclude Include="uthash.h" />
<ClInclude Include="utlist.h" />
</ItemGroup>
<ItemGroup>
<Text Include="..\math\CMakeLists.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\math\Mat4.inl" />
<None Include="..\math\MathUtil.inl" /> <None Include="..\math\MathUtil.inl" />
<None Include="..\math\MathUtilNeon.inl" /> <None Include="..\math\MathUtilNeon.inl" />
<None Include="..\math\Matrix.inl" />
<None Include="..\math\Quaternion.inl" /> <None Include="..\math\Quaternion.inl" />
<None Include="..\math\Vector2.inl" /> <None Include="..\math\Vec2.inl" />
<None Include="..\math\Vector3.inl" /> <None Include="..\math\Vec3.inl" />
<None Include="..\math\Vector4.inl" /> <None Include="..\math\Vec4.inl" />
<None Include="..\renderer\ccShader_Label.vert" />
<None Include="..\renderer\ccShader_Label_df.frag" />
<None Include="..\renderer\ccShader_Label_df_glow.frag" />
<None Include="..\renderer\ccShader_Label_normal.frag" />
<None Include="..\renderer\ccShader_Label_outline.frag" />
<None Include="..\renderer\ccShader_PositionColor.frag" />
<None Include="..\renderer\ccShader_PositionColor.vert" />
<None Include="..\renderer\ccShader_PositionColorLengthTexture.frag" />
<None Include="..\renderer\ccShader_PositionColorLengthTexture.vert" />
<None Include="..\renderer\ccShader_PositionTexture.frag" />
<None Include="..\renderer\ccShader_PositionTexture.vert" />
<None Include="..\renderer\ccShader_PositionTextureA8Color.frag" />
<None Include="..\renderer\ccShader_PositionTextureA8Color.vert" />
<None Include="..\renderer\ccShader_PositionTextureColor.frag" />
<None Include="..\renderer\ccShader_PositionTextureColor.vert" />
<None Include="..\renderer\ccShader_PositionTexture_uColor.frag" />
<None Include="..\renderer\ccShader_PositionTexture_uColor.vert" />
<None Include="..\renderer\ccShader_Position_uColor.frag" />
<None Include="..\renderer\ccShader_Position_uColor.vert" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

1568
cocos/2d/cocos2d.vcxproj.filters
View File

File diff suppressed because it is too large Load Diff

2
cocos/2d/cocos2d_headers.props
View File

@ -7,7 +7,7 @@
<PropertyGroup /> <PropertyGroup />
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(EngineRoot)cocos;$(EngineRoot)cocos\2d\platform\win32;$(EngineRoot)cocos\2d\platform\desktop;$(EngineRoot)external\glfw3\include\win32;$(EngineRoot)external\win32-specific\gles\include\OGLES</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(EngineRoot)cocos;$(EngineRoot)cocos\platform\win32;$(EngineRoot)cocos\platform\desktop;$(EngineRoot)external\glfw3\include\win32;$(EngineRoot)external\win32-specific\gles\include\OGLES</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_VARIADIC_MAX=10;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_VARIADIC_MAX=10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>

2
cocos/2d/cocos2d_winrt_headers.props
View File

@ -7,7 +7,7 @@
<PropertyGroup /> <PropertyGroup />
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(EngineRoot)cocos;$(EngineRoot)cocos\2d\platform\winrt;$(EngineRoot)\external\winrt-specific\angle\include;$(EngineRoot)\external\xxhash;$(EngineRoot)\external\winrt-specific;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\2d\renderer;$(EngineRoot)cocos\math\kazmath;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\base;$(EngineRoot)cocos\physics;$(EngineRoot)cocos\math\kazmath\include;$(GeneratedFilesDir);$(EngineRoot)external\ConvertUTF;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(EngineRoot)cocos;$(EngineRoot)cocos\platform\winrt;$(EngineRoot)\external\winrt-specific\angle\include;$(EngineRoot)\external\xxhash;$(EngineRoot)\external\winrt-specific;$(GeneratedFilesDir);$(EngineRoot)external\ConvertUTF;</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>

246
cocos/2d/cocos2d_wp8.vcxproj
View File

@ -75,7 +75,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories> <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -100,7 +100,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
<PreprocessorDefinitions>_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories> <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -225,6 +225,7 @@
<ClCompile Include="..\base\atitc.cpp" /> <ClCompile Include="..\base\atitc.cpp" />
<ClCompile Include="..\base\base64.cpp" /> <ClCompile Include="..\base\base64.cpp" />
<ClCompile Include="..\base\CCAutoreleasePool.cpp" /> <ClCompile Include="..\base\CCAutoreleasePool.cpp" />
<ClCompile Include="..\base\ccCArray.cpp" />
<ClCompile Include="..\base\CCConfiguration.cpp" /> <ClCompile Include="..\base\CCConfiguration.cpp" />
<ClCompile Include="..\base\CCConsole.cpp" /> <ClCompile Include="..\base\CCConsole.cpp" />
<ClCompile Include="..\base\CCData.cpp" /> <ClCompile Include="..\base\CCData.cpp" />
@ -245,15 +246,34 @@
<ClCompile Include="..\base\CCEventListenerTouch.cpp" /> <ClCompile Include="..\base\CCEventListenerTouch.cpp" />
<ClCompile Include="..\base\CCEventMouse.cpp" /> <ClCompile Include="..\base\CCEventMouse.cpp" />
<ClCompile Include="..\base\CCEventTouch.cpp" /> <ClCompile Include="..\base\CCEventTouch.cpp" />
<ClCompile Include="..\base\ccFPSImages.c">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</PrecompiledHeaderFile>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</PrecompiledHeaderFile>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="..\base\CCIMEDispatcher.cpp" />
<ClCompile Include="..\base\CCNS.cpp" /> <ClCompile Include="..\base\CCNS.cpp" />
<ClCompile Include="..\base\CCProfiling.cpp" /> <ClCompile Include="..\base\CCProfiling.cpp" />
<ClCompile Include="..\base\CCRef.cpp" /> <ClCompile Include="..\base\CCRef.cpp" />
<ClCompile Include="..\base\CCScheduler.cpp" /> <ClCompile Include="..\base\CCScheduler.cpp" />
<ClCompile Include="..\base\CCScriptSupport.cpp" />
<ClCompile Include="..\base\CCTouch.cpp" /> <ClCompile Include="..\base\CCTouch.cpp" />
<ClCompile Include="..\base\ccTypes.cpp" /> <ClCompile Include="..\base\ccTypes.cpp" />
<ClCompile Include="..\base\CCUserDefault.cpp" />
<ClCompile Include="..\base\CCUserDefaultAndroid.cpp" />
<ClCompile Include="..\base\ccUTF8.cpp" />
<ClCompile Include="..\base\ccUtils.cpp" />
<ClCompile Include="..\base\CCValue.cpp" /> <ClCompile Include="..\base\CCValue.cpp" />
<ClCompile Include="..\base\etc1.cpp" /> <ClCompile Include="..\base\etc1.cpp" />
<ClCompile Include="..\base\s3tc.cpp" /> <ClCompile Include="..\base\s3tc.cpp" />
<ClCompile Include="..\base\TGAlib.cpp" />
<ClCompile Include="..\base\ZipUtils.cpp" /> <ClCompile Include="..\base\ZipUtils.cpp" />
<ClCompile Include="..\cocos2d.cpp" /> <ClCompile Include="..\cocos2d.cpp" />
<ClCompile Include="..\deprecated\CCArray.cpp" /> <ClCompile Include="..\deprecated\CCArray.cpp" />
@ -264,13 +284,14 @@
<ClCompile Include="..\deprecated\CCString.cpp" /> <ClCompile Include="..\deprecated\CCString.cpp" />
<ClCompile Include="..\math\CCAffineTransform.cpp" /> <ClCompile Include="..\math\CCAffineTransform.cpp" />
<ClCompile Include="..\math\CCGeometry.cpp" /> <ClCompile Include="..\math\CCGeometry.cpp" />
<ClCompile Include="..\math\CCVertex.cpp" />
<ClCompile Include="..\math\Mat4.cpp" />
<ClCompile Include="..\math\MathUtil.cpp" /> <ClCompile Include="..\math\MathUtil.cpp" />
<ClCompile Include="..\math\Matrix.cpp" />
<ClCompile Include="..\math\Quaternion.cpp" /> <ClCompile Include="..\math\Quaternion.cpp" />
<ClCompile Include="..\math\TransformUtils.cpp" /> <ClCompile Include="..\math\TransformUtils.cpp" />
<ClCompile Include="..\math\Vector2.cpp" /> <ClCompile Include="..\math\Vec2.cpp" />
<ClCompile Include="..\math\Vector3.cpp" /> <ClCompile Include="..\math\Vec3.cpp" />
<ClCompile Include="..\math\Vector4.cpp" /> <ClCompile Include="..\math\Vec4.cpp" />
<ClCompile Include="..\physics\CCPhysicsBody.cpp" /> <ClCompile Include="..\physics\CCPhysicsBody.cpp" />
<ClCompile Include="..\physics\CCPhysicsContact.cpp" /> <ClCompile Include="..\physics\CCPhysicsContact.cpp" />
<ClCompile Include="..\physics\CCPhysicsJoint.cpp" /> <ClCompile Include="..\physics\CCPhysicsJoint.cpp" />
@ -281,6 +302,29 @@
<ClCompile Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.cpp" /> <ClCompile Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.cpp" />
<ClCompile Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.cpp" /> <ClCompile Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.cpp" />
<ClCompile Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.cpp" /> <ClCompile Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.cpp" />
<ClCompile Include="..\platform\CCFileUtils.cpp" />
<ClCompile Include="..\platform\CCGLViewProtocol.cpp" />
<ClCompile Include="..\platform\CCImage.cpp" />
<ClCompile Include="..\platform\CCSAXParser.cpp" />
<ClCompile Include="..\platform\CCThread.cpp" />
<ClCompile Include="..\platform\winrt\CCApplication.cpp" />
<ClCompile Include="..\platform\winrt\CCCommon.cpp" />
<ClCompile Include="..\platform\winrt\CCDevice.cpp" />
<ClCompile Include="..\platform\winrt\CCFileUtilsWinRT.cpp" />
<ClCompile Include="..\platform\winrt\CCFreeTypeFont.cpp" />
<ClCompile Include="..\platform\winrt\CCGLView.cpp" />
<ClCompile Include="..\platform\winrt\CCPrecompiledShaders.cpp" />
<ClCompile Include="..\platform\winrt\CCPThreadWinRT.cpp" />
<ClCompile Include="..\platform\winrt\CCStdC.cpp" />
<ClCompile Include="..\platform\winrt\CCWinRTUtils.cpp" />
<ClCompile Include="..\platform\winrt\DirectXBase.cpp" />
<ClCompile Include="..\platform\winrt\inet_ntop_winrt.cpp" />
<ClCompile Include="..\platform\winrt\InputEvent.cpp" />
<ClCompile Include="..\platform\winrt\pch.cpp" />
<ClCompile Include="..\platform\winrt\sha1.cpp" />
<ClCompile Include="..\platform\wp8\CCGLView.cpp" />
<ClCompile Include="..\platform\wp8\Direct3DBase.cpp" />
<ClCompile Include="..\platform\wp8\DirectXBase.cpp" />
<ClCompile Include="..\renderer\CCBatchCommand.cpp" /> <ClCompile Include="..\renderer\CCBatchCommand.cpp" />
<ClCompile Include="..\renderer\CCCustomCommand.cpp" /> <ClCompile Include="..\renderer\CCCustomCommand.cpp" />
<ClCompile Include="..\renderer\CCGLProgram.cpp" /> <ClCompile Include="..\renderer\CCGLProgram.cpp" />
@ -293,6 +337,9 @@
<ClCompile Include="..\renderer\CCRenderCommand.cpp" /> <ClCompile Include="..\renderer\CCRenderCommand.cpp" />
<ClCompile Include="..\renderer\CCRenderer.cpp" /> <ClCompile Include="..\renderer\CCRenderer.cpp" />
<ClCompile Include="..\renderer\ccShaders.cpp" /> <ClCompile Include="..\renderer\ccShaders.cpp" />
<ClCompile Include="..\renderer\CCTexture2D.cpp" />
<ClCompile Include="..\renderer\CCTextureAtlas.cpp" />
<ClCompile Include="..\renderer\CCTextureCache.cpp" />
<ClCompile Include="CCAction.cpp" /> <ClCompile Include="CCAction.cpp" />
<ClCompile Include="CCActionCamera.cpp" /> <ClCompile Include="CCActionCamera.cpp" />
<ClCompile Include="CCActionCatmullRom.cpp" /> <ClCompile Include="CCActionCatmullRom.cpp" />
@ -309,7 +356,6 @@
<ClCompile Include="CCAnimation.cpp" /> <ClCompile Include="CCAnimation.cpp" />
<ClCompile Include="CCAnimationCache.cpp" /> <ClCompile Include="CCAnimationCache.cpp" />
<ClCompile Include="CCAtlasNode.cpp" /> <ClCompile Include="CCAtlasNode.cpp" />
<ClCompile Include="ccCArray.cpp" />
<ClCompile Include="CCClippingNode.cpp" /> <ClCompile Include="CCClippingNode.cpp" />
<ClCompile Include="CCComponent.cpp" /> <ClCompile Include="CCComponent.cpp" />
<ClCompile Include="CCComponentContainer.cpp" /> <ClCompile Include="CCComponentContainer.cpp" />
@ -321,28 +367,9 @@
<ClCompile Include="CCFontCharMap.cpp" /> <ClCompile Include="CCFontCharMap.cpp" />
<ClCompile Include="CCFontFNT.cpp" /> <ClCompile Include="CCFontFNT.cpp" />
<ClCompile Include="CCFontFreeType.cpp" /> <ClCompile Include="CCFontFreeType.cpp" />
<ClCompile Include="ccFPSImages.c"> <ClCompile Include="CCGLBufferedNode.cpp" />
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="CCGrabber.cpp" /> <ClCompile Include="CCGrabber.cpp" />
<ClCompile Include="CCGrid.cpp" /> <ClCompile Include="CCGrid.cpp" />
<ClCompile Include="CCNodeGrid.cpp" />
<ClCompile Include="CCIMEDispatcher.cpp" />
<ClCompile Include="CCLabel.cpp" /> <ClCompile Include="CCLabel.cpp" />
<ClCompile Include="CCLabelAtlas.cpp" /> <ClCompile Include="CCLabelAtlas.cpp" />
<ClCompile Include="CCLabelBMFont.cpp" /> <ClCompile Include="CCLabelBMFont.cpp" />
@ -353,6 +380,7 @@
<ClCompile Include="CCMenuItem.cpp" /> <ClCompile Include="CCMenuItem.cpp" />
<ClCompile Include="CCMotionStreak.cpp" /> <ClCompile Include="CCMotionStreak.cpp" />
<ClCompile Include="CCNode.cpp" /> <ClCompile Include="CCNode.cpp" />
<ClCompile Include="CCNodeGrid.cpp" />
<ClCompile Include="CCParallaxNode.cpp" /> <ClCompile Include="CCParallaxNode.cpp" />
<ClCompile Include="CCParticleBatchNode.cpp" /> <ClCompile Include="CCParticleBatchNode.cpp" />
<ClCompile Include="CCParticleExamples.cpp" /> <ClCompile Include="CCParticleExamples.cpp" />
@ -361,15 +389,11 @@
<ClCompile Include="CCProgressTimer.cpp" /> <ClCompile Include="CCProgressTimer.cpp" />
<ClCompile Include="CCRenderTexture.cpp" /> <ClCompile Include="CCRenderTexture.cpp" />
<ClCompile Include="CCScene.cpp" /> <ClCompile Include="CCScene.cpp" />
<ClCompile Include="CCScriptSupport.cpp" />
<ClCompile Include="CCSprite.cpp" /> <ClCompile Include="CCSprite.cpp" />
<ClCompile Include="CCSpriteBatchNode.cpp" /> <ClCompile Include="CCSpriteBatchNode.cpp" />
<ClCompile Include="CCSpriteFrame.cpp" /> <ClCompile Include="CCSpriteFrame.cpp" />
<ClCompile Include="CCSpriteFrameCache.cpp" /> <ClCompile Include="CCSpriteFrameCache.cpp" />
<ClCompile Include="CCTextFieldTTF.cpp" /> <ClCompile Include="CCTextFieldTTF.cpp" />
<ClCompile Include="CCTexture2D.cpp" />
<ClCompile Include="CCTextureAtlas.cpp" />
<ClCompile Include="CCTextureCache.cpp" />
<ClCompile Include="CCTileMapAtlas.cpp" /> <ClCompile Include="CCTileMapAtlas.cpp" />
<ClCompile Include="CCTMXLayer.cpp" /> <ClCompile Include="CCTMXLayer.cpp" />
<ClCompile Include="CCTMXObjectGroup.cpp" /> <ClCompile Include="CCTMXObjectGroup.cpp" />
@ -379,54 +403,6 @@
<ClCompile Include="CCTransitionPageTurn.cpp" /> <ClCompile Include="CCTransitionPageTurn.cpp" />
<ClCompile Include="CCTransitionProgress.cpp" /> <ClCompile Include="CCTransitionProgress.cpp" />
<ClCompile Include="CCTweenFunction.cpp" /> <ClCompile Include="CCTweenFunction.cpp" />
<ClCompile Include="CCUserDefault.cpp" />
<ClCompile Include="ccUTF8.cpp" />
<ClCompile Include="ccUtils.cpp" />
<ClCompile Include="CCVertex.cpp" />
<ClCompile Include="platform\CCGLViewProtocol.cpp" />
<ClCompile Include="platform\CCFileUtils.cpp" />
<ClCompile Include="platform\CCImage.cpp" />
<ClCompile Include="platform\CCSAXParser.cpp" />
<ClCompile Include="platform\CCThread.cpp" />
<ClCompile Include="platform\winrt\CCApplication.cpp" />
<ClCompile Include="platform\winrt\CCCommon.cpp" />
<ClCompile Include="platform\winrt\CCDevice.cpp" />
<ClCompile Include="platform\winrt\CCFileUtilsWinRT.cpp" />
<ClCompile Include="platform\winrt\CCFreeTypeFont.cpp" />
<ClCompile Include="platform\winrt\CCPrecompiledShaders.cpp" />
<ClCompile Include="platform\winrt\CCStdC.cpp" />
<ClCompile Include="platform\winrt\CCWinRTUtils.cpp" />
<ClCompile Include="platform\winrt\inet_ntop_winrt.cpp">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</CompileAsWinRT>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
<CallingConvention Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Cdecl</CallingConvention>
<CallingConvention Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Cdecl</CallingConvention>
<CallingConvention Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Cdecl</CallingConvention>
<CallingConvention Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Cdecl</CallingConvention>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">pch.h</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="platform\winrt\InputEvent.cpp" />
<ClCompile Include="platform\winrt\pch.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</MultiProcessorCompilation>
<MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</MultiProcessorCompilation>
<MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</MultiProcessorCompilation>
<MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</MultiProcessorCompilation>
</ClCompile>
<ClCompile Include="platform\winrt\sha1.cpp" />
<ClCompile Include="platform\wp8\CCGLView.cpp" />
<ClCompile Include="platform\wp8\DirectXBase.cpp" />
<ClCompile Include="TGAlib.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\external\ConvertUTF\ConvertUTF.h" /> <ClInclude Include="..\..\external\ConvertUTF\ConvertUTF.h" />
@ -438,6 +414,7 @@
<ClInclude Include="..\base\atitc.h" /> <ClInclude Include="..\base\atitc.h" />
<ClInclude Include="..\base\base64.h" /> <ClInclude Include="..\base\base64.h" />
<ClInclude Include="..\base\CCAutoreleasePool.h" /> <ClInclude Include="..\base\CCAutoreleasePool.h" />
<ClInclude Include="..\base\ccCArray.h" />
<ClInclude Include="..\base\ccConfig.h" /> <ClInclude Include="..\base\ccConfig.h" />
<ClInclude Include="..\base\CCConfiguration.h" /> <ClInclude Include="..\base\CCConfiguration.h" />
<ClInclude Include="..\base\CCConsole.h" /> <ClInclude Include="..\base\CCConsole.h" />
@ -460,21 +437,33 @@
<ClInclude Include="..\base\CCEventMouse.h" /> <ClInclude Include="..\base\CCEventMouse.h" />
<ClInclude Include="..\base\CCEventTouch.h" /> <ClInclude Include="..\base\CCEventTouch.h" />
<ClInclude Include="..\base\CCEventType.h" /> <ClInclude Include="..\base\CCEventType.h" />
<ClInclude Include="..\base\ccFPSImages.h" />
<ClInclude Include="..\base\CCIMEDelegate.h" />
<ClInclude Include="..\base\CCIMEDispatcher.h" />
<ClInclude Include="..\base\ccMacros.h" /> <ClInclude Include="..\base\ccMacros.h" />
<ClInclude Include="..\base\CCMap.h" /> <ClInclude Include="..\base\CCMap.h" />
<ClInclude Include="..\base\CCNS.h" /> <ClInclude Include="..\base\CCNS.h" />
<ClInclude Include="..\base\CCPlatformConfig.h" /> <ClInclude Include="..\base\CCPlatformConfig.h" />
<ClInclude Include="..\base\CCPlatformMacros.h" /> <ClInclude Include="..\base\CCPlatformMacros.h" />
<ClInclude Include="..\base\CCProfiling.h" /> <ClInclude Include="..\base\CCProfiling.h" />
<ClInclude Include="..\base\CCProtocols.h" />
<ClInclude Include="..\base\CCRef.h" /> <ClInclude Include="..\base\CCRef.h" />
<ClInclude Include="..\base\CCRefPtr.h" /> <ClInclude Include="..\base\CCRefPtr.h" />
<ClInclude Include="..\base\CCScheduler.h" /> <ClInclude Include="..\base\CCScheduler.h" />
<ClInclude Include="..\base\CCScriptSupport.h" />
<ClInclude Include="..\base\CCTouch.h" /> <ClInclude Include="..\base\CCTouch.h" />
<ClInclude Include="..\base\ccTypes.h" /> <ClInclude Include="..\base\ccTypes.h" />
<ClInclude Include="..\base\CCUserDefault.h" />
<ClInclude Include="..\base\ccUTF8.h" />
<ClInclude Include="..\base\ccUtils.h" />
<ClInclude Include="..\base\CCValue.h" /> <ClInclude Include="..\base\CCValue.h" />
<ClInclude Include="..\base\CCVector.h" /> <ClInclude Include="..\base\CCVector.h" />
<ClInclude Include="..\base\etc1.h" /> <ClInclude Include="..\base\etc1.h" />
<ClInclude Include="..\base\firePngData.h" />
<ClInclude Include="..\base\s3tc.h" /> <ClInclude Include="..\base\s3tc.h" />
<ClInclude Include="..\base\TGAlib.h" />
<ClInclude Include="..\base\uthash.h" />
<ClInclude Include="..\base\utlist.h" />
<ClInclude Include="..\base\ZipUtils.h" /> <ClInclude Include="..\base\ZipUtils.h" />
<ClInclude Include="..\deprecated\CCArray.h" /> <ClInclude Include="..\deprecated\CCArray.h" />
<ClInclude Include="..\deprecated\CCBool.h" /> <ClInclude Include="..\deprecated\CCBool.h" />
@ -490,13 +479,14 @@
<ClInclude Include="..\math\CCGeometry.h" /> <ClInclude Include="..\math\CCGeometry.h" />
<ClInclude Include="..\math\CCMath.h" /> <ClInclude Include="..\math\CCMath.h" />
<ClInclude Include="..\math\CCMathBase.h" /> <ClInclude Include="..\math\CCMathBase.h" />
<ClInclude Include="..\math\CCVertex.h" />
<ClInclude Include="..\math\Mat4.h" />
<ClInclude Include="..\math\MathUtil.h" /> <ClInclude Include="..\math\MathUtil.h" />
<ClInclude Include="..\math\Matrix.h" />
<ClInclude Include="..\math\Quaternion.h" /> <ClInclude Include="..\math\Quaternion.h" />
<ClInclude Include="..\math\TransformUtils.h" /> <ClInclude Include="..\math\TransformUtils.h" />
<ClInclude Include="..\math\Vector2.h" /> <ClInclude Include="..\math\Vec2.h" />
<ClInclude Include="..\math\Vector3.h" /> <ClInclude Include="..\math\Vec3.h" />
<ClInclude Include="..\math\Vector4.h" /> <ClInclude Include="..\math\Vec4.h" />
<ClInclude Include="..\physics\CCPhysicsBody.h" /> <ClInclude Include="..\physics\CCPhysicsBody.h" />
<ClInclude Include="..\physics\CCPhysicsContact.h" /> <ClInclude Include="..\physics\CCPhysicsContact.h" />
<ClInclude Include="..\physics\CCPhysicsJoint.h" /> <ClInclude Include="..\physics\CCPhysicsJoint.h" />
@ -508,6 +498,35 @@
<ClInclude Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.h" /> <ClInclude Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.h" />
<ClInclude Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.h" /> <ClInclude Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.h" />
<ClInclude Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.h" /> <ClInclude Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.h" />
<ClInclude Include="..\platform\CCApplicationProtocol.h" />
<ClInclude Include="..\platform\CCCommon.h" />
<ClInclude Include="..\platform\CCDevice.h" />
<ClInclude Include="..\platform\CCFileUtils.h" />
<ClInclude Include="..\platform\CCGLViewProtocol.h" />
<ClInclude Include="..\platform\CCImage.h" />
<ClInclude Include="..\platform\CCSAXParser.h" />
<ClInclude Include="..\platform\CCThread.h" />
<ClInclude Include="..\platform\winrt\CCApplication.h" />
<ClInclude Include="..\platform\winrt\CCFileUtilsWinRT.h" />
<ClInclude Include="..\platform\winrt\CCFreeTypeFont.h" />
<ClInclude Include="..\platform\winrt\CCGL.h" />
<ClInclude Include="..\platform\winrt\CCGLView.h" />
<ClInclude Include="..\platform\winrt\CCGL_Angle.h" />
<ClInclude Include="..\platform\winrt\CCPlatformDefine.h" />
<ClInclude Include="..\platform\winrt\CCPrecompiledShaders.h" />
<ClInclude Include="..\platform\winrt\CCPThreadWinRT.h" />
<ClInclude Include="..\platform\winrt\CCStdC.h" />
<ClInclude Include="..\platform\winrt\CCWinRTUtils.h" />
<ClInclude Include="..\platform\winrt\DirectXBase.h" />
<ClInclude Include="..\platform\winrt\DirectXHelper.h" />
<ClInclude Include="..\platform\winrt\inet_ntop_winrt.h" />
<ClInclude Include="..\platform\winrt\InputEvent.h" />
<ClInclude Include="..\platform\winrt\InputEventTypes.h" />
<ClInclude Include="..\platform\winrt\pch.h" />
<ClInclude Include="..\platform\winrt\sha1.h" />
<ClInclude Include="..\platform\wp8\CCGLView.h" />
<ClInclude Include="..\platform\wp8\Direct3DBase.h" />
<ClInclude Include="..\platform\wp8\DirectXBase.h" />
<ClInclude Include="..\renderer\CCBatchCommand.h" /> <ClInclude Include="..\renderer\CCBatchCommand.h" />
<ClInclude Include="..\renderer\CCCustomCommand.h" /> <ClInclude Include="..\renderer\CCCustomCommand.h" />
<ClInclude Include="..\renderer\CCGLProgram.h" /> <ClInclude Include="..\renderer\CCGLProgram.h" />
@ -521,6 +540,9 @@
<ClInclude Include="..\renderer\CCRenderCommandPool.h" /> <ClInclude Include="..\renderer\CCRenderCommandPool.h" />
<ClInclude Include="..\renderer\CCRenderer.h" /> <ClInclude Include="..\renderer\CCRenderer.h" />
<ClInclude Include="..\renderer\ccShaders.h" /> <ClInclude Include="..\renderer\ccShaders.h" />
<ClInclude Include="..\renderer\CCTexture2D.h" />
<ClInclude Include="..\renderer\CCTextureAtlas.h" />
<ClInclude Include="..\renderer\CCTextureCache.h" />
<ClInclude Include="CCAction.h" /> <ClInclude Include="CCAction.h" />
<ClInclude Include="CCActionCamera.h" /> <ClInclude Include="CCActionCamera.h" />
<ClInclude Include="CCActionCatmullRom.h" /> <ClInclude Include="CCActionCatmullRom.h" />
@ -537,55 +559,44 @@
<ClInclude Include="CCAnimation.h" /> <ClInclude Include="CCAnimation.h" />
<ClInclude Include="CCAnimationCache.h" /> <ClInclude Include="CCAnimationCache.h" />
<ClInclude Include="CCAtlasNode.h" /> <ClInclude Include="CCAtlasNode.h" />
<ClInclude Include="ccCArray.h" />
<ClInclude Include="CCClippingNode.h" /> <ClInclude Include="CCClippingNode.h" />
<ClInclude Include="CCComponent.h" /> <ClInclude Include="CCComponent.h" />
<ClInclude Include="CCComponentContainer.h" /> <ClInclude Include="CCComponentContainer.h" />
<ClInclude Include="ccConfig.h" />
<ClInclude Include="CCDrawingPrimitives.h" /> <ClInclude Include="CCDrawingPrimitives.h" />
<ClInclude Include="CCDrawNode.h" /> <ClInclude Include="CCDrawNode.h" />
<ClInclude Include="CCEventType.h" />
<ClInclude Include="CCFont.h" /> <ClInclude Include="CCFont.h" />
<ClInclude Include="CCFontAtlas.h" /> <ClInclude Include="CCFontAtlas.h" />
<ClInclude Include="CCFontAtlasCache.h" /> <ClInclude Include="CCFontAtlasCache.h" />
<ClInclude Include="CCFontCharMap.h" /> <ClInclude Include="CCFontCharMap.h" />
<ClInclude Include="CCFontFNT.h" /> <ClInclude Include="CCFontFNT.h" />
<ClInclude Include="CCFontFreeType.h" /> <ClInclude Include="CCFontFreeType.h" />
<ClInclude Include="ccFPSImages.h" /> <ClInclude Include="CCGLBufferedNode.h" />
<ClInclude Include="CCGrabber.h" /> <ClInclude Include="CCGrabber.h" />
<ClInclude Include="CCGrid.h" /> <ClInclude Include="CCGrid.h" />
<ClInclude Include="CCNodeGrid.h" />
<ClInclude Include="CCIMEDelegate.h" />
<ClInclude Include="CCIMEDispatcher.h" />
<ClInclude Include="CCLabel.h" /> <ClInclude Include="CCLabel.h" />
<ClInclude Include="CCLabelAtlas.h" /> <ClInclude Include="CCLabelAtlas.h" />
<ClInclude Include="CCLabelBMFont.h" /> <ClInclude Include="CCLabelBMFont.h" />
<ClInclude Include="CCLabelTextFormatter.h" /> <ClInclude Include="CCLabelTextFormatter.h" />
<ClInclude Include="CCLabelTTF.h" /> <ClInclude Include="CCLabelTTF.h" />
<ClInclude Include="CCLayer.h" /> <ClInclude Include="CCLayer.h" />
<ClInclude Include="ccMacros.h" />
<ClInclude Include="CCMenu.h" /> <ClInclude Include="CCMenu.h" />
<ClInclude Include="CCMenuItem.h" /> <ClInclude Include="CCMenuItem.h" />
<ClInclude Include="CCMotionStreak.h" /> <ClInclude Include="CCMotionStreak.h" />
<ClInclude Include="CCNode.h" /> <ClInclude Include="CCNode.h" />
<ClInclude Include="CCNodeGrid.h" />
<ClInclude Include="CCParallaxNode.h" /> <ClInclude Include="CCParallaxNode.h" />
<ClInclude Include="CCParticleBatchNode.h" /> <ClInclude Include="CCParticleBatchNode.h" />
<ClInclude Include="CCParticleExamples.h" /> <ClInclude Include="CCParticleExamples.h" />
<ClInclude Include="CCParticleSystem.h" /> <ClInclude Include="CCParticleSystem.h" />
<ClInclude Include="CCParticleSystemQuad.h" /> <ClInclude Include="CCParticleSystemQuad.h" />
<ClInclude Include="CCProgressTimer.h" /> <ClInclude Include="CCProgressTimer.h" />
<ClInclude Include="CCProtocols.h" />
<ClInclude Include="CCRenderTexture.h" /> <ClInclude Include="CCRenderTexture.h" />
<ClInclude Include="CCScene.h" /> <ClInclude Include="CCScene.h" />
<ClInclude Include="CCScriptSupport.h" />
<ClInclude Include="CCSprite.h" /> <ClInclude Include="CCSprite.h" />
<ClInclude Include="CCSpriteBatchNode.h" /> <ClInclude Include="CCSpriteBatchNode.h" />
<ClInclude Include="CCSpriteFrame.h" /> <ClInclude Include="CCSpriteFrame.h" />
<ClInclude Include="CCSpriteFrameCache.h" /> <ClInclude Include="CCSpriteFrameCache.h" />
<ClInclude Include="CCTextFieldTTF.h" /> <ClInclude Include="CCTextFieldTTF.h" />
<ClInclude Include="CCTexture2D.h" />
<ClInclude Include="CCTextureAtlas.h" />
<ClInclude Include="CCTextureCache.h" />
<ClInclude Include="CCTileMapAtlas.h" /> <ClInclude Include="CCTileMapAtlas.h" />
<ClInclude Include="CCTMXLayer.h" /> <ClInclude Include="CCTMXLayer.h" />
<ClInclude Include="CCTMXObjectGroup.h" /> <ClInclude Include="CCTMXObjectGroup.h" />
@ -594,49 +605,16 @@
<ClInclude Include="CCTransition.h" /> <ClInclude Include="CCTransition.h" />
<ClInclude Include="CCTransitionPageTurn.h" /> <ClInclude Include="CCTransitionPageTurn.h" />
<ClInclude Include="CCTransitionProgress.h" /> <ClInclude Include="CCTransitionProgress.h" />
<ClInclude Include="ccTypes.h" />
<ClInclude Include="CCTweenFunction.h" /> <ClInclude Include="CCTweenFunction.h" />
<ClInclude Include="CCUserDefault.h" />
<ClInclude Include="ccUTF8.h" />
<ClInclude Include="ccUtils.h" />
<ClInclude Include="CCVertex.h" />
<ClInclude Include="cocos2d.h" />
<ClInclude Include="platform\CCApplicationProtocol.h" />
<ClInclude Include="platform\CCCommon.h" />
<ClInclude Include="platform\CCDevice.h" />
<ClInclude Include="platform\CCGLViewProtocol.h" />
<ClInclude Include="platform\CCFileUtils.h" />
<ClInclude Include="platform\CCImage.h" />
<ClInclude Include="platform\CCSAXParser.h" />
<ClInclude Include="platform\CCThread.h" />
<ClInclude Include="platform\winrt\CCApplication.h" />
<ClInclude Include="platform\winrt\CCFileUtilsWinRT.h" />
<ClInclude Include="platform\winrt\CCFreeTypeFont.h" />
<ClInclude Include="platform\winrt\CCGL.h" />
<ClInclude Include="platform\winrt\CCGL_Angle.h" />
<ClInclude Include="platform\winrt\CCPlatformDefine.h" />
<ClInclude Include="platform\winrt\CCPrecompiledShaders.h" />
<ClInclude Include="platform\winrt\CCStdC.h" />
<ClInclude Include="platform\winrt\CCWinRTUtils.h" />
<ClInclude Include="platform\winrt\inet_ntop_winrt.h" />
<ClInclude Include="platform\winrt\InputEvent.h" />
<ClInclude Include="platform\winrt\InputEventTypes.h" />
<ClInclude Include="platform\winrt\pch.h" />
<ClInclude Include="platform\winrt\sha1.h" />
<ClInclude Include="platform\wp8\CCGLView.h" />
<ClInclude Include="platform\wp8\DirectXBase.h" />
<ClInclude Include="TGAlib.h" />
<ClInclude Include="uthash.h" />
<ClInclude Include="utlist.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\math\Mat4.inl" />
<None Include="..\math\MathUtil.inl" /> <None Include="..\math\MathUtil.inl" />
<None Include="..\math\MathUtilNeon.inl" /> <None Include="..\math\MathUtilNeon.inl" />
<None Include="..\math\Matrix.inl" />
<None Include="..\math\Quaternion.inl" /> <None Include="..\math\Quaternion.inl" />
<None Include="..\math\Vector2.inl" /> <None Include="..\math\Vec2.inl" />
<None Include="..\math\Vector3.inl" /> <None Include="..\math\Vec3.inl" />
<None Include="..\math\Vector4.inl" /> <None Include="..\math\Vec4.inl" />
<None Include="..\renderer\ccShader_Label.vert" /> <None Include="..\renderer\ccShader_Label.vert" />
<None Include="..\renderer\ccShader_Label_df.frag" /> <None Include="..\renderer\ccShader_Label_df.frag" />
<None Include="..\renderer\ccShader_Label_df_glow.frag" /> <None Include="..\renderer\ccShader_Label_df_glow.frag" />
@ -661,6 +639,6 @@
<None Include="..\renderer\ccShader_Position_uColor.vert" /> <None Include="..\renderer\ccShader_Position_uColor.vert" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Text Include="..\base\CMakeLists.txt" /> <Text Include="..\renderer\CMakeLists.txt" />
</ItemGroup> </ItemGroup>
</Project> </Project>

1675
cocos/2d/cocos2d_wp8.vcxproj.filters
View File

File diff suppressed because it is too large Load Diff

2
cocos/2d/cocos2d_wp8_headers.props
View File

@ -7,7 +7,7 @@
<PropertyGroup /> <PropertyGroup />
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(EngineRoot)cocos\2d\platform\wp8;$(EngineRoot)cocos\2d\platform\winrt;$(EngineRoot)\external\winrt-specific\angle\include;$(EngineRoot)\external\curl\include\wp8;$(EngineRoot)\external\winrt-specific;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\math\kazmath;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\2d\renderer;$(EngineRoot)cocos\ui;$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\physics;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external;$(EngineRoot)cocos\editor-support;$(EngineRoot);$(EngineRoot)cocos\math\kazmath\include;$(EngineRoot)cocos\deprecated;$(EngineRoot)external\ConvertUTF;$(GeneratedFilesDir)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(EngineRoot)cocos\platform\wp8;$(EngineRoot)cocos\platform\winrt;$(EngineRoot)\external\winrt-specific\angle\include;$(EngineRoot)\external\curl\include\wp8;$(EngineRoot)\external\winrt-specific;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external;$(EngineRoot)cocos\editor-support;$(EngineRoot);$(EngineRoot)external\ConvertUTF;$(GeneratedFilesDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_VARIADIC_MAX=10;NOMINMAX;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_VARIADIC_MAX=10;NOMINMAX;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<CompileAsWinRT>true</CompileAsWinRT> <CompileAsWinRT>true</CompileAsWinRT>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>

15
cocos/2d/platform/android/java/project.properties
View File

@ -1,15 +0,0 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system edit
# "ant.properties", and override values to adapt the script to your
# project structure.
#
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
android.library=true
# Project target.
target=android-10

6
cocos/2d/platform/wp8-xaml/CopyTemplateFiles.vcxproj.user
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<FullDeploy>true</FullDeploy>
</PropertyGroup>
</Project>

85
cocos/Android.mk
View File

@ -12,8 +12,8 @@ cocos2d.cpp \
2d/CCActionCamera.cpp \ 2d/CCActionCamera.cpp \
2d/CCActionCatmullRom.cpp \ 2d/CCActionCatmullRom.cpp \
2d/CCActionEase.cpp \ 2d/CCActionEase.cpp \
2d/CCActionGrid3D.cpp \
2d/CCActionGrid.cpp \ 2d/CCActionGrid.cpp \
2d/CCActionGrid3D.cpp \
2d/CCActionInstant.cpp \ 2d/CCActionInstant.cpp \
2d/CCActionInterval.cpp \ 2d/CCActionInterval.cpp \
2d/CCActionManager.cpp \ 2d/CCActionManager.cpp \
@ -21,30 +21,28 @@ cocos2d.cpp \
2d/CCActionProgressTimer.cpp \ 2d/CCActionProgressTimer.cpp \
2d/CCActionTiledGrid.cpp \ 2d/CCActionTiledGrid.cpp \
2d/CCActionTween.cpp \ 2d/CCActionTween.cpp \
2d/CCAnimationCache.cpp \
2d/CCAnimation.cpp \ 2d/CCAnimation.cpp \
2d/CCAnimationCache.cpp \
2d/CCAtlasNode.cpp \ 2d/CCAtlasNode.cpp \
2d/ccCArray.cpp \
2d/CCClippingNode.cpp \ 2d/CCClippingNode.cpp \
2d/CCComponentContainer.cpp \
2d/CCComponent.cpp \ 2d/CCComponent.cpp \
2d/CCDrawingPrimitives.cpp \ 2d/CCComponentContainer.cpp \
2d/CCDrawNode.cpp \ 2d/CCDrawNode.cpp \
2d/CCFontAtlasCache.cpp \ 2d/CCDrawingPrimitives.cpp \
2d/CCFontAtlas.cpp \
2d/CCFontCharMap.cpp \
2d/CCFont.cpp \ 2d/CCFont.cpp \
2d/CCFontAtlas.cpp \
2d/CCFontAtlasCache.cpp \
2d/CCFontCharMap.cpp \
2d/CCFontFNT.cpp \ 2d/CCFontFNT.cpp \
2d/CCFontFreeType.cpp \ 2d/CCFontFreeType.cpp \
2d/CCGLBufferedNode.cpp \ 2d/CCGLBufferedNode.cpp \
2d/CCGrabber.cpp \ 2d/CCGrabber.cpp \
2d/CCGrid.cpp \ 2d/CCGrid.cpp \
2d/CCIMEDispatcher.cpp \ 2d/CCLabel.cpp \
2d/CCLabelAtlas.cpp \ 2d/CCLabelAtlas.cpp \
2d/CCLabelBMFont.cpp \ 2d/CCLabelBMFont.cpp \
2d/CCLabel.cpp \
2d/CCLabelTextFormatter.cpp \
2d/CCLabelTTF.cpp \ 2d/CCLabelTTF.cpp \
2d/CCLabelTextFormatter.cpp \
2d/CCLayer.cpp \ 2d/CCLayer.cpp \
2d/CCMenu.cpp \ 2d/CCMenu.cpp \
2d/CCMenuItem.cpp \ 2d/CCMenuItem.cpp \
@ -59,45 +57,35 @@ cocos2d.cpp \
2d/CCProgressTimer.cpp \ 2d/CCProgressTimer.cpp \
2d/CCRenderTexture.cpp \ 2d/CCRenderTexture.cpp \
2d/CCScene.cpp \ 2d/CCScene.cpp \
2d/CCScriptSupport.cpp \
2d/CCSpriteBatchNode.cpp \
2d/CCSprite.cpp \ 2d/CCSprite.cpp \
2d/CCSpriteFrameCache.cpp \ 2d/CCSpriteBatchNode.cpp \
2d/CCSpriteFrame.cpp \ 2d/CCSpriteFrame.cpp \
2d/CCTextFieldTTF.cpp \ 2d/CCSpriteFrameCache.cpp \
2d/CCTexture2D.cpp \
2d/CCTextureAtlas.cpp \
2d/CCTextureCache.cpp \
2d/CCTileMapAtlas.cpp \
2d/CCTMXLayer.cpp \ 2d/CCTMXLayer.cpp \
2d/CCTMXObjectGroup.cpp \ 2d/CCTMXObjectGroup.cpp \
2d/CCTMXTiledMap.cpp \ 2d/CCTMXTiledMap.cpp \
2d/CCTMXXMLParser.cpp \ 2d/CCTMXXMLParser.cpp \
2d/CCTextFieldTTF.cpp \
2d/CCTileMapAtlas.cpp \
2d/CCTransition.cpp \ 2d/CCTransition.cpp \
2d/CCTransitionPageTurn.cpp \ 2d/CCTransitionPageTurn.cpp \
2d/CCTransitionProgress.cpp \ 2d/CCTransitionProgress.cpp \
2d/CCTweenFunction.cpp \ 2d/CCTweenFunction.cpp \
2d/CCUserDefaultAndroid.cpp \ platform/CCGLViewProtocol.cpp \
2d/CCUserDefault.cpp \ platform/CCFileUtils.cpp \
2d/ccUTF8.cpp \ platform/CCSAXParser.cpp \
2d/ccUtils.cpp \ platform/CCThread.cpp \
2d/CCVertex.cpp \ platform/CCImage.cpp \
2d/TGAlib.cpp \
2d/ccFPSImages.c \
2d/platform/CCGLViewProtocol.cpp \
2d/platform/CCFileUtils.cpp \
2d/platform/CCSAXParser.cpp \
2d/platform/CCThread.cpp \
2d/platform/CCImage.cpp \
math/CCAffineTransform.cpp \ math/CCAffineTransform.cpp \
math/CCGeometry.cpp \ math/CCGeometry.cpp \
math/CCVertex.cpp \
math/Mat4.cpp \
math/MathUtil.cpp \ math/MathUtil.cpp \
math/Matrix.cpp \
math/Quaternion.cpp \ math/Quaternion.cpp \
math/TransformUtils.cpp \ math/TransformUtils.cpp \
math/Vector2.cpp \ math/Vec2.cpp \
math/Vector3.cpp \ math/Vec3.cpp \
math/Vector4.cpp \ math/Vec4.cpp \
base/CCAutoreleasePool.cpp \ base/CCAutoreleasePool.cpp \
base/CCConfiguration.cpp \ base/CCConfiguration.cpp \
base/CCConsole.cpp \ base/CCConsole.cpp \
@ -108,40 +96,52 @@ base/CCEvent.cpp \
base/CCEventAcceleration.cpp \ base/CCEventAcceleration.cpp \
base/CCEventCustom.cpp \ base/CCEventCustom.cpp \
base/CCEventDispatcher.cpp \ base/CCEventDispatcher.cpp \
base/CCEventFocus.cpp \
base/CCEventKeyboard.cpp \ base/CCEventKeyboard.cpp \
base/CCEventListener.cpp \ base/CCEventListener.cpp \
base/CCEventListenerAcceleration.cpp \ base/CCEventListenerAcceleration.cpp \
base/CCEventListenerCustom.cpp \ base/CCEventListenerCustom.cpp \
base/CCEventListenerFocus.cpp \
base/CCEventListenerKeyboard.cpp \ base/CCEventListenerKeyboard.cpp \
base/CCEventListenerMouse.cpp \ base/CCEventListenerMouse.cpp \
base/CCEventListenerTouch.cpp \ base/CCEventListenerTouch.cpp \
base/CCEventMouse.cpp \ base/CCEventMouse.cpp \
base/CCEventTouch.cpp \ base/CCEventTouch.cpp \
base/CCEventFocus.cpp \ base/CCIMEDispatcher.cpp \
base/CCEventListenerFocus.cpp \
base/CCNS.cpp \ base/CCNS.cpp \
base/CCProfiling.cpp \ base/CCProfiling.cpp \
base/CCRef.cpp \ base/CCRef.cpp \
base/CCScheduler.cpp \ base/CCScheduler.cpp \
base/CCScriptSupport.cpp \
base/CCTouch.cpp \ base/CCTouch.cpp \
base/CCUserDefault.cpp \
base/CCUserDefaultAndroid.cpp \
base/CCValue.cpp \ base/CCValue.cpp \
base/TGAlib.cpp \
base/ZipUtils.cpp \ base/ZipUtils.cpp \
base/atitc.cpp \ base/atitc.cpp \
base/base64.cpp \ base/base64.cpp \
base/ccCArray.cpp \
base/ccFPSImages.c \
base/ccTypes.cpp \ base/ccTypes.cpp \
base/ccUTF8.cpp \
base/ccUtils.cpp \
base/etc1.cpp \ base/etc1.cpp \
base/s3tc.cpp \ base/s3tc.cpp \
renderer/CCBatchCommand.cpp \ renderer/CCBatchCommand.cpp \
renderer/CCCustomCommand.cpp \ renderer/CCCustomCommand.cpp \
renderer/CCGLProgram.cpp \ renderer/CCGLProgram.cpp \
renderer/CCGLProgramCache.cpp \
renderer/CCGLProgramState.cpp \ renderer/CCGLProgramState.cpp \
renderer/CCGLProgramStateCache.cpp \ renderer/CCGLProgramStateCache.cpp \
renderer/ccGLStateCache.cpp \
renderer/CCGroupCommand.cpp \ renderer/CCGroupCommand.cpp \
renderer/CCQuadCommand.cpp \ renderer/CCQuadCommand.cpp \
renderer/CCRenderCommand.cpp \ renderer/CCRenderCommand.cpp \
renderer/CCRenderer.cpp \ renderer/CCRenderer.cpp \
renderer/CCGLProgramCache.cpp \ renderer/CCTexture2D.cpp \
renderer/CCTextureAtlas.cpp \
renderer/CCTextureCache.cpp \
renderer/ccGLStateCache.cpp \
renderer/ccShaders.cpp \ renderer/ccShaders.cpp \
deprecated/CCArray.cpp \ deprecated/CCArray.cpp \
deprecated/CCSet.cpp \ deprecated/CCSet.cpp \
@ -170,8 +170,7 @@ physics/chipmunk/CCPhysicsWorldInfo_chipmunk.cpp \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/. \ $(LOCAL_PATH)/. \
$(LOCAL_PATH)/2d \ $(LOCAL_PATH)/platform/android \
$(LOCAL_PATH)/2d/platform/android \
$(LOCAL_PATH)/../external/tinyxml2 \ $(LOCAL_PATH)/../external/tinyxml2 \
$(LOCAL_PATH)/../external/unzip \ $(LOCAL_PATH)/../external/unzip \
$(LOCAL_PATH)/../external/chipmunk/include/chipmunk \ $(LOCAL_PATH)/../external/chipmunk/include/chipmunk \
@ -179,7 +178,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
LOCAL_C_INCLUDES := $(LOCAL_PATH) \ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/. \ $(LOCAL_PATH)/. \
$(LOCAL_PATH)/2d/platform/android \ $(LOCAL_PATH)/platform/android \
$(LOCAL_PATH)/../external/tinyxml2 \ $(LOCAL_PATH)/../external/tinyxml2 \
$(LOCAL_PATH)/../external/unzip \ $(LOCAL_PATH)/../external/unzip \
$(LOCAL_PATH)/../external/chipmunk/include/chipmunk \ $(LOCAL_PATH)/../external/chipmunk/include/chipmunk \
@ -212,4 +211,4 @@ include $(BUILD_STATIC_LIBRARY)
$(call import-module,freetype2/prebuilt/android) $(call import-module,freetype2/prebuilt/android)
$(call import-module,chipmunk) $(call import-module,chipmunk)
$(call import-module,2d/platform/android) $(call import-module,platform/android)

3
cocos/CMakeLists.txt
View File

@ -8,6 +8,7 @@ set(COCOS_SRC
) )
include(2d/CMakeLists.txt) include(2d/CMakeLists.txt)
include(platform/CMakeLists.txt)
include(physics/CMakeLists.txt) include(physics/CMakeLists.txt)
include(math/CMakeLists.txt) include(math/CMakeLists.txt)
include(renderer/CMakeLists.txt) include(renderer/CMakeLists.txt)
@ -20,7 +21,7 @@ include(storage/CMakeLists.txt)
add_library(cocos2d STATIC add_library(cocos2d STATIC
${COCOS_SRC} ${COCOS_SRC}
${COCOS_2D_SRC} ${COCOS_2D_SRC}
${COCOS_2D_PLATFORM_SRC} ${COCOS_PLATFORM_SRC}
${COCOS_BASE_SRC} ${COCOS_BASE_SRC}
${COCOS_RENDERER_SRC} ${COCOS_RENDERER_SRC}
${COCOS_MATH_SRC} ${COCOS_MATH_SRC}

6
cocos/audio/android/Android.mk
View File

@ -13,11 +13,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../include
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include \
$(LOCAL_PATH)/../.. \ $(LOCAL_PATH)/../.. \
$(LOCAL_PATH)/../../math \ $(LOCAL_PATH)/../../platform/android
$(LOCAL_PATH)/../../2d \
$(LOCAL_PATH)/../../2d/platform/android \
$(LOCAL_PATH)/../../base \
$(LOCAL_PATH)/../../physics
LOCAL_CFLAGS += -Wno-psabi LOCAL_CFLAGS += -Wno-psabi
LOCAL_EXPORT_CFLAGS += -Wno-psabi LOCAL_EXPORT_CFLAGS += -Wno-psabi

2
cocos/base/CCConfiguration.cpp
View File

@ -28,7 +28,7 @@ THE SOFTWARE.
#include <string.h> #include <string.h>
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "base/ccConfig.h" #include "base/ccConfig.h"
#include "2d/platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
NS_CC_BEGIN NS_CC_BEGIN

4
cocos/base/CCConsole.cpp
View File

@ -59,8 +59,8 @@
#include "base/CCPlatformConfig.h" #include "base/CCPlatformConfig.h"
#include "base/CCConfiguration.h" #include "base/CCConfiguration.h"
#include "2d/CCScene.h" #include "2d/CCScene.h"
#include "2d/platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "2d/CCTextureCache.h" #include "renderer/CCTextureCache.h"
#include "CCGLView.h" #include "CCGLView.h"
#include "base/base64.h" #include "base/base64.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/base/CCData.cpp
View File

@ -24,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "base/CCData.h" #include "base/CCData.h"
#include "2d/platform/CCCommon.h" #include "platform/CCCommon.h"
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include <string> #include <string>

18
cocos/base/CCDirector.cpp
View File

@ -31,23 +31,24 @@ THE SOFTWARE.
// standard includes // standard includes
#include <string> #include <string>
#include "2d/ccFPSImages.h"
#include "2d/CCDrawingPrimitives.h" #include "2d/CCDrawingPrimitives.h"
#include "2d/CCScene.h" #include "2d/CCScene.h"
#include "2d/CCSpriteFrameCache.h" #include "2d/CCSpriteFrameCache.h"
#include "2d/platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "renderer/ccGLStateCache.h" #include "platform/CCImage.h"
#include "2d/platform/CCImage.h"
#include "2d/CCActionManager.h" #include "2d/CCActionManager.h"
#include "2d/CCFontFNT.h" #include "2d/CCFontFNT.h"
#include "2d/CCFontAtlasCache.h" #include "2d/CCFontAtlasCache.h"
#include "2d/CCAnimationCache.h" #include "2d/CCAnimationCache.h"
#include "2d/CCUserDefault.h" #include "2d/CCTransition.h"
#include "2d/CCFontFreeType.h"
#include "renderer/CCGLProgramCache.h" #include "renderer/CCGLProgramCache.h"
#include "renderer/CCGLProgramStateCache.h" #include "renderer/CCGLProgramStateCache.h"
#include "2d/CCTransition.h" #include "renderer/CCTextureCache.h"
#include "2d/CCTextureCache.h" #include "renderer/ccGLStateCache.h"
#include "2d/CCFontFreeType.h" #include "renderer/CCRenderer.h"
#include "base/CCUserDefault.h"
#include "base/ccFPSImages.h"
#include "base/CCScheduler.h" #include "base/CCScheduler.h"
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "base/CCEventDispatcher.h" #include "base/CCEventDispatcher.h"
@ -57,7 +58,6 @@ THE SOFTWARE.
#include "base/CCAutoreleasePool.h" #include "base/CCAutoreleasePool.h"
#include "base/CCProfiling.h" #include "base/CCProfiling.h"
#include "base/CCConfiguration.h" #include "base/CCConfiguration.h"
#include "renderer/CCRenderer.h"
#include "base/CCNS.h" #include "base/CCNS.h"
#include "math/CCMath.h" #include "math/CCMath.h"
#include "CCApplication.h" #include "CCApplication.h"

2
cocos/base/CCEventListener.cpp
View File

@ -23,7 +23,7 @@
****************************************************************************/ ****************************************************************************/
#include "base/CCEventListener.h" #include "base/CCEventListener.h"
#include "2d/platform/CCCommon.h" #include "platform/CCCommon.h"
NS_CC_BEGIN NS_CC_BEGIN

0
cocos/2d/CCIMEDelegate.h → cocos/base/CCIMEDelegate.h
View File

2
cocos/2d/CCIMEDispatcher.cpp → cocos/base/CCIMEDispatcher.cpp
View File

@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "2d/CCIMEDispatcher.h" #include "base/CCIMEDispatcher.h"
#include <list> #include <list>

2
cocos/2d/CCIMEDispatcher.h → cocos/base/CCIMEDispatcher.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __CC_IME_DISPATCHER_H__ #ifndef __CC_IME_DISPATCHER_H__
#define __CC_IME_DISPATCHER_H__ #define __CC_IME_DISPATCHER_H__
#include "2d/CCIMEDelegate.h" #include "base/CCIMEDelegate.h"
NS_CC_BEGIN NS_CC_BEGIN

6
cocos/base/CCPlatformConfig.h
View File

@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#ifndef __CC_PLATFORM_CONFIG_H__ #ifndef __BASE_CC_PLATFORM_CONFIG_H__
#define __CC_PLATFORM_CONFIG_H__ #define __BASE_CC_PLATFORM_CONFIG_H__
/** /**
Config of cocos2d-x project, per target platform. Config of cocos2d-x project, per target platform.
@ -154,5 +154,5 @@ Config of cocos2d-x project, per target platform.
#endif #endif
#endif // CC_PLATFORM_WIN32 #endif // CC_PLATFORM_WIN32
#endif // __CC_PLATFORM_CONFIG_H__ #endif // __BASE_CC_PLATFORM_CONFIG_H__

11
cocos/2d/CCProtocols.h → cocos/base/CCProtocols.h
View File

@ -24,12 +24,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#ifndef __CCPROTOCOLS_H__ #ifndef __BASE_CCPROTOCOLS_H__
#define __CCPROTOCOLS_H__ #define __BASE_CCPROTOCOLS_H__
#include <string>
#include "base/ccTypes.h" #include "base/ccTypes.h"
#include "2d/CCTexture2D.h" #include "renderer/CCTexture2D.h"
#include <string>
NS_CC_BEGIN NS_CC_BEGIN
@ -267,4 +268,4 @@ public:
NS_CC_END NS_CC_END
#endif // __CCPROTOCOLS_H__ #endif // __BASE_CCPROTOCOLS_H__

2
cocos/base/CCRef.cpp
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#include "base/CCRef.h" #include "base/CCRef.h"
#include "base/CCAutoreleasePool.h" #include "base/CCAutoreleasePool.h"
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "2d/CCScriptSupport.h" #include "base/CCScriptSupport.h"
#if CC_USE_MEM_LEAK_DETECTION #if CC_USE_MEM_LEAK_DETECTION
#include <algorithm> // std::find #include <algorithm> // std::find

6
cocos/base/CCRef.h
View File

@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#ifndef __CCREF_H__ #ifndef __BASE_CCREF_H__
#define __CCREF_H__ #define __BASE_CCREF_H__
#include "base/CCPlatformMacros.h" #include "base/CCPlatformMacros.h"
#include "base/ccConfig.h" #include "base/ccConfig.h"
@ -172,4 +172,4 @@ typedef void (Ref::*SEL_SCHEDULE)(float);
NS_CC_END NS_CC_END
#endif // __CCREF_H__ #endif // __BASE_CCREF_H__

6
cocos/base/CCScheduler.cpp
View File

@ -28,9 +28,9 @@ THE SOFTWARE.
#include "base/CCScheduler.h" #include "base/CCScheduler.h"
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "2d/utlist.h" #include "base/utlist.h"
#include "2d/ccCArray.h" #include "base/ccCArray.h"
#include "2d/CCScriptSupport.h" #include "base/CCScriptSupport.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/base/CCScheduler.h
View File

@ -34,7 +34,7 @@ THE SOFTWARE.
#include "base/CCRef.h" #include "base/CCRef.h"
#include "base/CCVector.h" #include "base/CCVector.h"
#include "2d/uthash.h" #include "base/uthash.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/2d/CCScriptSupport.cpp → cocos/base/CCScriptSupport.cpp
View File

@ -23,7 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "2d/CCScriptSupport.h" #include "base/CCScriptSupport.h"
#if CC_ENABLE_SCRIPT_BINDING #if CC_ENABLE_SCRIPT_BINDING

2
cocos/2d/CCScriptSupport.h → cocos/base/CCScriptSupport.h
View File

@ -29,7 +29,7 @@
#include "base/ccConfig.h" #include "base/ccConfig.h"
#if CC_ENABLE_SCRIPT_BINDING #if CC_ENABLE_SCRIPT_BINDING
#include "2d/platform/CCCommon.h" #include "platform/CCCommon.h"
#include "base/CCTouch.h" #include "base/CCTouch.h"
#include "base/CCEventTouch.h" #include "base/CCEventTouch.h"
#include "base/CCEventKeyboard.h" #include "base/CCEventKeyboard.h"

6
cocos/2d/CCUserDefault.cpp → cocos/base/CCUserDefault.cpp
View File

@ -22,9 +22,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "2d/CCUserDefault.h" #include "base/CCUserDefault.h"
#include "2d/platform/CCCommon.h" #include "platform/CCCommon.h"
#include "2d/platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "tinyxml2.h" #include "tinyxml2.h"
#include "base/base64.h" #include "base/base64.h"

0
cocos/2d/CCUserDefault.h → cocos/base/CCUserDefault.h
View File

0
cocos/2d/CCUserDefault.mm → cocos/base/CCUserDefault.mm
View File

8
cocos/2d/CCUserDefaultAndroid.cpp → cocos/base/CCUserDefaultAndroid.cpp
View File

@ -22,13 +22,13 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "2d/CCUserDefault.h" #include "base/CCUserDefault.h"
#include "base/CCPlatformConfig.h" #include "base/CCPlatformConfig.h"
#include "2d/platform/CCCommon.h" #include "platform/CCCommon.h"
#include "base/base64.h" #include "base/base64.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
#include "2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" #include "platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h"
// root name of xml // root name of xml
#define USERDEFAULT_ROOT_NAME "userDefaultRoot" #define USERDEFAULT_ROOT_NAME "userDefaultRoot"
@ -38,7 +38,7 @@ THE SOFTWARE.
#define XML_FILE_NAME "UserDefault.xml" #define XML_FILE_NAME "UserDefault.xml"
#ifdef KEEP_COMPATABILITY #ifdef KEEP_COMPATABILITY
#include "2d/platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "../tinyxml2/tinyxml2.h" #include "../tinyxml2/tinyxml2.h"
#endif #endif

26
cocos/base/CMakeLists.txt
View File

@ -1,36 +1,44 @@
set(COCOS_BASE_SRC set(COCOS_BASE_SRC
base/atitc.cpp
base/base64.cpp
base/CCAutoreleasePool.cpp base/CCAutoreleasePool.cpp
base/CCConfiguration.cpp base/CCConfiguration.cpp
base/CCConsole.cpp base/CCConsole.cpp
base/CCData.cpp base/CCData.cpp
base/CCDataVisitor.cpp base/CCDataVisitor.cpp
base/CCDirector.cpp base/CCDirector.cpp
base/CCEventAcceleration.cpp
base/CCEvent.cpp base/CCEvent.cpp
base/CCEventAcceleration.cpp
base/CCEventCustom.cpp base/CCEventCustom.cpp
base/CCEventDispatcher.cpp base/CCEventDispatcher.cpp
base/CCEventFocus.cpp
base/CCEventKeyboard.cpp base/CCEventKeyboard.cpp
base/CCEventListenerAcceleration.cpp
base/CCEventListener.cpp base/CCEventListener.cpp
base/CCEventListenerAcceleration.cpp
base/CCEventListenerCustom.cpp base/CCEventListenerCustom.cpp
base/CCEventListenerFocus.cpp
base/CCEventListenerKeyboard.cpp base/CCEventListenerKeyboard.cpp
base/CCEventListenerMouse.cpp base/CCEventListenerMouse.cpp
base/CCEventListenerTouch.cpp base/CCEventListenerTouch.cpp
base/CCEventMouse.cpp base/CCEventMouse.cpp
base/CCEventTouch.cpp base/CCEventTouch.cpp
base/CCEventFocus.cpp base/CCIMEDispatcher.cpp
base/CCEventListenerFocus.cpp
base/CCNS.cpp base/CCNS.cpp
base/CCProfiling.cpp base/CCProfiling.cpp
base/CCRef.cpp base/CCRef.cpp
base/CCScheduler.cpp base/CCScheduler.cpp
base/CCScriptSupport.cpp
base/CCTouch.cpp base/CCTouch.cpp
base/ccTypes.cpp base/CCUserDefault.cpp
base/CCUserDefaultAndroid.cpp
base/CCValue.cpp base/CCValue.cpp
base/TGAlib.cpp
base/ZipUtils.cpp
base/atitc.cpp
base/base64.cpp
base/ccCArray.cpp
base/ccFPSImages.c
base/ccTypes.cpp
base/ccUTF8.cpp
base/ccUtils.cpp
base/etc1.cpp base/etc1.cpp
base/s3tc.cpp base/s3tc.cpp
base/ZipUtils.cpp
) )

2
cocos/2d/TGAlib.cpp → cocos/base/TGAlib.cpp
View File

@ -28,7 +28,7 @@ THE SOFTWARE.
#include "TGAlib.h" #include "TGAlib.h"
#include "base/CCData.h" #include "base/CCData.h"
#include "2d/platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
NS_CC_BEGIN NS_CC_BEGIN

0
cocos/2d/TGAlib.h → cocos/base/TGAlib.h
View File

2
cocos/base/ZipUtils.cpp
View File

@ -29,7 +29,7 @@
#include "base/ZipUtils.h" #include "base/ZipUtils.h"
#include "base/CCData.h" #include "base/CCData.h"
#include "base/ccMacros.h" #include "base/ccMacros.h"
#include "2d/platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "unzip.h" #include "unzip.h"
#include <map> #include <map>

2
cocos/base/ZipUtils.h
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include "base/CCPlatformMacros.h" #include "base/CCPlatformMacros.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
#include "2d/platform/android/CCFileUtilsAndroid.h" #include "platform/android/CCFileUtilsAndroid.h"
#elif(CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) #elif(CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
// for import ssize_t on win32 platform // for import ssize_t on win32 platform
#include "CCStdC.h" #include "CCStdC.h"

2
cocos/2d/ccCArray.cpp → cocos/base/ccCArray.cpp
View File

@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "2d/ccCArray.h" #include "base/ccCArray.h"
#include "base/CCRef.h" #include "base/CCRef.h"
#include "base/ccTypes.h" #include "base/ccTypes.h"

0
cocos/2d/ccCArray.h → cocos/base/ccCArray.h
View File

2
cocos/2d/ccFPSImages.c → cocos/base/ccFPSImages.c
View File

@ -23,7 +23,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "ccFPSImages.h" #include "base/ccFPSImages.h"
unsigned char cc_fps_images_png[] = { unsigned char cc_fps_images_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,

6
cocos/2d/ccFPSImages.h → cocos/base/ccFPSImages.h
View File

@ -22,8 +22,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef __CCFPSIMAGES__H #ifndef __BASE_CCFPSIMAGES__H
#define __CCFPSIMAGES__H #define __BASE_CCFPSIMAGES__H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -36,4 +36,4 @@ unsigned int cc_fps_images_len(void);
} }
#endif #endif
#endif // __CCFPSIMAGES__H #endif // __BASE_CCFPSIMAGES__H

Some files were not shown because too many files have changed in this diff Show More