Merge branch 'newcode' into v3

This commit is contained in:
yangxiao 2014-08-25 21:20:49 +08:00
commit cff5b65314
131 changed files with 5512 additions and 13609 deletions

View File

@ -6,6 +6,7 @@ cocos2d-x-3.3alpha0 ??
[NEW] Added method for custom precompiled shader program loading on WP8
[NEW] Added c++11 random support
[NEW] Added better reskin model support
[NEW] Added consistent way to set GL context attributes
[NEW] Device: added setKeepScreenOn() for iOS and Android
[NEW] EventMouse: support getDelta, getDeltaX, getDeltaY functions
[NEW] FileUtils: add isDirectoryExist(), createDirectory(), removeDirectory(), removeFile(), renameFile()

View File

@ -34,18 +34,6 @@ include(build/BuildHelpers.CMakeLists.txt)
message(${BUILDING_STRING})
option(USE_CHIPMUNK "Use chipmunk for physics library" ON)
option(USE_BOX2D "Use box2d for physics library" OFF)
option(DEBUG_MODE "Debug or release?" ON)
option(BUILD_EXTENSIONS "Build extension library" ON)
option(BUILD_EDITOR_SPINE "Build editor support for spine" ON)
option(BUILD_EDITOR_COCOSTUDIO "Build editor support for cocostudio" ON)
option(BUILD_EDITOR_COCOSBUILDER "Build editor support for cocosbuilder" ON)
option(BUILD_EXTERN_LIBS "Build Box2d, Chipmunk, Tinyxml2 from source" ON)
option(BUILD_CppTests "Build TestCpp samples" ON)
option(BUILD_LIBS_LUA "Build lua libraries" ON)
option(BUILD_LuaTests "Build TestLua samples" ON)
if(DEBUG_MODE)
set(CMAKE_BUILD_TYPE DEBUG)
else(DEBUG_MODE)
@ -63,7 +51,7 @@ else()
set(CMAKE_C_FLAGS_DEBUG "-g -Wall -DCOCOS2D_DEBUG=1")
set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -std=c99")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -std=c++11")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -std=c++11 -Wno-deprecated-declarations -Wno-reorder")
endif(MSVC)
if(WINDOWS)
@ -88,16 +76,6 @@ if(MINGW)
endif()
endif()
if(USE_CHIPMUNK)
message("Using chipmunk ...")
add_definitions(-DCC_ENABLE_CHIPMUNK_INTEGRATION=1)
elseif(USE_BOX2D)
message("Using box2d ...")
add_definitions(-DCC_ENABLE_BOX2D_INTEGRATION=1)
else(USE_CHIPMUNK)
message(FATAL_ERROR "Must choose a physics library.")
endif(USE_CHIPMUNK)
# architecture
if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
set(ARCH_DIR "64-bit")
@ -106,160 +84,36 @@ set(ARCH_DIR "32-bit")
endif()
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
/usr/include
/usr/include/GLFW
/usr/local/include/GLFW
${CMAKE_CURRENT_SOURCE_DIR}/cocos
${CMAKE_CURRENT_SOURCE_DIR}/cocos/platform/desktop
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/cocos/platform/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/cocos/audio/include
${CMAKE_CURRENT_SOURCE_DIR}/cocos/editor-support
${CMAKE_CURRENT_SOURCE_DIR}/cocos/scripting/lua-bindings/auto
${CMAKE_CURRENT_SOURCE_DIR}/cocos/scripting/lua-bindings/manual
${CMAKE_CURRENT_SOURCE_DIR}/extensions
${CMAKE_CURRENT_SOURCE_DIR}/external
${CMAKE_CURRENT_SOURCE_DIR}/external/tinyxml2
${CMAKE_CURRENT_SOURCE_DIR}/external/unzip
${CMAKE_CURRENT_SOURCE_DIR}/external/edtaa3func
${CMAKE_CURRENT_SOURCE_DIR}/external/chipmunk/include/chipmunk
${CMAKE_CURRENT_SOURCE_DIR}/external/jpeg/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/webp/include/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/external/glfw3/include/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/external/freetype2/include/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/external/websockets/include/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/external/xxhash
${CMAKE_CURRENT_SOURCE_DIR}/external/xxtea
)
if(MSVC)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/external/${PLATFORM_FOLDER}-specific/gles/include/OGLES
${CMAKE_CURRENT_SOURCE_DIR}/external/${PLATFORM_FOLDER}-specific/icon/include
${CMAKE_CURRENT_SOURCE_DIR}/external/${PLATFORM_FOLDER}-specific/zlib/include
external/curl/include/${PLATFORM_FOLDER}
)
elseif(MACOSX)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/external/curl/include/${PLATFORM_FOLDER}
)
elseif(LINUX)
include_directories(
/usr/include
/usr/include/GLFW
/usr/local/include/GLFW
${CMAKE_CURRENT_SOURCE_DIR}/external/${PLATFORM_FOLDER}-specific/fmod/include/${ARCH_DIR}
)
endif()
link_directories(
/usr/local/lib
${CMAKE_CURRENT_SOURCE_DIR}/external/jpeg/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/external/tiff/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/external/webp/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/external/png/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/external/freetype2/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/external/websockets/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/external/${PLATFORM_FOLDER}-specific/fmod/prebuilt/${ARCH_DIR}
)
if(MSVC)
link_directories(
${CMAKE_CURRENT_SOURCE_DIR}/external/jpeg/prebuilt/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/external/tiff/prebuilt/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/external/png/prebuilt/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/external/freetype2/prebuilt/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/external/curl/prebuilt/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/external/${PLATFORM_FOLDER}-specific/icon/prebuilt
${CMAKE_CURRENT_SOURCE_DIR}/external/${PLATFORM_FOLDER}-specific/zlib/prebuilt
)
elseif(LINUX)
link_directories(
/usr/local/lib
${CMAKE_CURRENT_SOURCE_DIR}/external/jpeg/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/external/tiff/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/external/webp/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/external/png/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/external/freetype2/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/external/websockets/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/external/${PLATFORM_FOLDER}-specific/fmod/prebuilt/${ARCH_DIR}
)
endif()
if(BUILD_EXTERN_LIBS)
# chipmunk library
add_subdirectory(external/chipmunk/src)
# box2d library
add_subdirectory(external/Box2D)
endif()
# unzip library
add_subdirectory(external/unzip)
if(BUILD_EXTERN_LIBS)
# tinyxml2 library
add_subdirectory(external/tinyxml2)
endif()
# xxhash library
add_subdirectory(external/xxhash)
# audio
add_subdirectory(cocos/audio)
# cocos2d library
# libcocos2d.a
add_subdirectory(cocos)
# cocos3d library
add_subdirectory(cocos/3d)
# network library
add_subdirectory(cocos/network)
# ui library
add_subdirectory(cocos/ui)
# sqlite3 library
add_subdirectory(cocos/storage)
if(BUILD_EXTENSIONS)
# extensions
add_subdirectory(extensions)
endif(BUILD_EXTENSIONS)
## Editor Support
if(BUILD_EDITOR_SPINE)
# spine
add_subdirectory(cocos/editor-support/spine)
endif(BUILD_EDITOR_SPINE)
if(BUILD_EDITOR_COCOSBUILDER)
# cocosbuilder
add_subdirectory(cocos/editor-support/cocosbuilder)
endif(BUILD_EDITOR_COCOSBUILDER)
if(BUILD_EDITOR_COCOSTUDIO)
# cocostudio
add_subdirectory(cocos/editor-support/cocostudio)
endif(BUILD_EDITOR_COCOSTUDIO)
## Scripting
if(BUILD_LIBS_LUA)
# lua
add_subdirectory(external/lua/lua)
# tolua
add_subdirectory(external/lua/tolua)
# luabinding
add_subdirectory(cocos/scripting/lua-bindings)
# xxtea
add_subdirectory(external/xxtea)
endif(BUILD_LIBS_LUA)
# build tests
if(BUILD_CppTests)
add_subdirectory(tests/cpp-empty-test)
add_subdirectory(tests/cpp-tests)
endif(BUILD_CppTests)
if(BUILD_LuaTests)
add_subdirectory(tests/lua-tests/project)
add_subdirectory(tests/lua-empty-test/project)
endif(BUILD_LuaTests)

View File

@ -8,8 +8,9 @@ macro(pre_build TARGET_NAME)
COMMENT "${TARGET_NAME}_PRE_BUILD ..."
)
add_custom_target( ${TARGET_NAME}_CORE_PRE_BUILD )
add_dependencies( ${TARGET_NAME}_PRE_BUILD ${TARGET_NAME}_CORE_PRE_BUILD )
add_custom_target(${TARGET_NAME}_CORE_PRE_BUILD)
add_dependencies(${TARGET_NAME}_PRE_BUILD ${TARGET_NAME}_CORE_PRE_BUILD)
add_dependencies(${TARGET_NAME} ${TARGET_NAME}_PRE_BUILD)
endmacro()
#cmake has some strange defaults, this should help us a lot

View File

@ -5,8 +5,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\external\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-tests", "..\tests\cpp-tests\proj.win32\cpp-tests.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnetwork", "..\cocos\network\proj.win32\libNetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-tests", "..\tests\lua-tests\project\proj.win32\lua-tests.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-empty-test", "..\tests\cpp-empty-test\proj.win32\cpp-empty-test.vcxproj", "{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}"
@ -17,38 +15,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\external\Box
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosdenshion", "..\cocos\audio\proj.win32\libcocosdenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libui", "..\cocos\ui\proj.win32\libui.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libextension", "..\extensions\proj.win32\libextension.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspine", "..\cocos\editor-support\spine\proj.win32\libspine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosbuilder", "..\cocos\editor-support\cocosbuilder\proj.win32\libcocosbuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocostudio", "..\cocos\editor-support\cocostudio\proj.win32\libcocostudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos2d", "..\cocos\scripting\lua-bindings\proj.win32\libluacocos2d.vcxproj", "{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocosdenshion", "..\cocos\scripting\lua-bindings\proj.win32\libluacocosdenshion.vcxproj", "{46A7D57A-7F25-4F52-823B-FFAC4FF3A624}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluanetwork", "..\cocos\scripting\lua-bindings\proj.win32\libluanetwork.vcxproj", "{65E52F4B-703F-419E-AD67-926241A10042}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocosbuilder", "..\cocos\scripting\lua-bindings\proj.win32\libluacocosbuilder.vcxproj", "{F8198014-F4F3-49F0-88AB-C1969A5829AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocostudio", "..\cocos\scripting\lua-bindings\proj.win32\libluacocostudio.vcxproj", "{9640951E-C5D0-47B5-9C42-0BCADA261C50}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaui", "..\cocos\scripting\lua-bindings\proj.win32\libluaui.vcxproj", "{FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaextension", "..\cocos\scripting\lua-bindings\proj.win32\libluaextension.vcxproj", "{7068296E-38A4-4BCA-85DB-3A09BD014847}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaspine", "..\cocos\scripting\lua-bindings\proj.win32\libluaspine.vcxproj", "{31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos3d", "..\cocos\3d\proj.win32\libcocos3d.vcxproj", "{E24950FA-5BC1-4AEE-A900-4F0259354BF0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos3d", "..\cocos\scripting\lua-bindings\proj.win32\libluacocos3d.vcxproj", "{06840490-14A4-43D6-88BC-AAFA44D043EB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -63,10 +35,6 @@ Global
{76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.Build.0 = Debug|Win32
{76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.ActiveCfg = Release|Win32
{76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.Build.0 = Release|Win32
{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.ActiveCfg = Debug|Win32
{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.Build.0 = Debug|Win32
{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.ActiveCfg = Release|Win32
{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.Build.0 = Release|Win32
{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.ActiveCfg = Debug|Win32
{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.Build.0 = Debug|Win32
{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.ActiveCfg = Release|Win32
@ -87,18 +55,6 @@ Global
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.Build.0 = Release|Win32
{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.ActiveCfg = Debug|Win32
{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.Build.0 = Debug|Win32
{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.ActiveCfg = Release|Win32
{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.Build.0 = Release|Win32
{21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.ActiveCfg = Debug|Win32
{21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.Build.0 = Debug|Win32
{21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.ActiveCfg = Release|Win32
{21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.Build.0 = Release|Win32
{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32
{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32
{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32
@ -107,50 +63,10 @@ Global
{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.Build.0 = Debug|Win32
{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.ActiveCfg = Release|Win32
{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.Build.0 = Release|Win32
{B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.ActiveCfg = Debug|Win32
{B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.Build.0 = Debug|Win32
{B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.ActiveCfg = Release|Win32
{B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.Build.0 = Release|Win32
{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|Win32.ActiveCfg = Debug|Win32
{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|Win32.Build.0 = Debug|Win32
{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Release|Win32.ActiveCfg = Release|Win32
{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Release|Win32.Build.0 = Release|Win32
{46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Debug|Win32.ActiveCfg = Debug|Win32
{46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Debug|Win32.Build.0 = Debug|Win32
{46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Release|Win32.ActiveCfg = Release|Win32
{46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Release|Win32.Build.0 = Release|Win32
{65E52F4B-703F-419E-AD67-926241A10042}.Debug|Win32.ActiveCfg = Debug|Win32
{65E52F4B-703F-419E-AD67-926241A10042}.Debug|Win32.Build.0 = Debug|Win32
{65E52F4B-703F-419E-AD67-926241A10042}.Release|Win32.ActiveCfg = Release|Win32
{65E52F4B-703F-419E-AD67-926241A10042}.Release|Win32.Build.0 = Release|Win32
{F8198014-F4F3-49F0-88AB-C1969A5829AF}.Debug|Win32.ActiveCfg = Debug|Win32
{F8198014-F4F3-49F0-88AB-C1969A5829AF}.Debug|Win32.Build.0 = Debug|Win32
{F8198014-F4F3-49F0-88AB-C1969A5829AF}.Release|Win32.ActiveCfg = Release|Win32
{F8198014-F4F3-49F0-88AB-C1969A5829AF}.Release|Win32.Build.0 = Release|Win32
{9640951E-C5D0-47B5-9C42-0BCADA261C50}.Debug|Win32.ActiveCfg = Debug|Win32
{9640951E-C5D0-47B5-9C42-0BCADA261C50}.Debug|Win32.Build.0 = Debug|Win32
{9640951E-C5D0-47B5-9C42-0BCADA261C50}.Release|Win32.ActiveCfg = Release|Win32
{9640951E-C5D0-47B5-9C42-0BCADA261C50}.Release|Win32.Build.0 = Release|Win32
{FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Debug|Win32.ActiveCfg = Debug|Win32
{FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Debug|Win32.Build.0 = Debug|Win32
{FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Release|Win32.ActiveCfg = Release|Win32
{FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Release|Win32.Build.0 = Release|Win32
{7068296E-38A4-4BCA-85DB-3A09BD014847}.Debug|Win32.ActiveCfg = Debug|Win32
{7068296E-38A4-4BCA-85DB-3A09BD014847}.Debug|Win32.Build.0 = Debug|Win32
{7068296E-38A4-4BCA-85DB-3A09BD014847}.Release|Win32.ActiveCfg = Release|Win32
{7068296E-38A4-4BCA-85DB-3A09BD014847}.Release|Win32.Build.0 = Release|Win32
{31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Debug|Win32.ActiveCfg = Debug|Win32
{31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Debug|Win32.Build.0 = Debug|Win32
{31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Release|Win32.ActiveCfg = Release|Win32
{31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Release|Win32.Build.0 = Release|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.ActiveCfg = Debug|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.Build.0 = Debug|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.ActiveCfg = Release|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.Build.0 = Release|Win32
{06840490-14A4-43D6-88BC-AAFA44D043EB}.Debug|Win32.ActiveCfg = Debug|Win32
{06840490-14A4-43D6-88BC-AAFA44D043EB}.Debug|Win32.Build.0 = Debug|Win32
{06840490-14A4-43D6-88BC-AAFA44D043EB}.Release|Win32.ActiveCfg = Release|Win32
{06840490-14A4-43D6-88BC-AAFA44D043EB}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -312,7 +312,7 @@ Action* ActionManager::getActionByTag(int tag, const Node *target) const
}
}
}
CCLOG("cocos2d : getActionByTag(tag = %d): Action not found", tag);
//CCLOG("cocos2d : getActionByTag(tag = %d): Action not found", tag);
}
else
{

View File

@ -1,72 +0,0 @@
include_directories(
../external/ConvertUTF
)
set(COCOS_2D_SRC
2d/CCActionCamera.cpp
2d/CCActionCatmullRom.cpp
2d/CCAction.cpp
2d/CCActionEase.cpp
2d/CCActionGrid3D.cpp
2d/CCActionGrid.cpp
2d/CCActionInstant.cpp
2d/CCActionInterval.cpp
2d/CCActionManager.cpp
2d/CCActionPageTurn3D.cpp
2d/CCActionProgressTimer.cpp
2d/CCActionTiledGrid.cpp
2d/CCActionTween.cpp
2d/CCAnimationCache.cpp
2d/CCAnimation.cpp
2d/CCAtlasNode.cpp
2d/CCClippingNode.cpp
2d/CCComponentContainer.cpp
2d/CCComponent.cpp
2d/CCDrawingPrimitives.cpp
2d/CCDrawNode.cpp
2d/CCFastTMXLayer.cpp
2d/CCFastTMXTiledMap.cpp
2d/CCFontAtlasCache.cpp
2d/CCFontAtlas.cpp
2d/CCFontCharMap.cpp
2d/CCFont.cpp
2d/CCFontFNT.cpp
2d/CCFontFreeType.cpp
2d/CCGLBufferedNode.cpp
2d/CCGrabber.cpp
2d/CCGrid.cpp
2d/CCLabelAtlas.cpp
2d/CCLabelBMFont.cpp
2d/CCLabel.cpp
2d/CCLabelTextFormatter.cpp
2d/CCLabelTTF.cpp
2d/CCLayer.cpp
2d/CCMenu.cpp
2d/CCMenuItem.cpp
2d/CCMotionStreak.cpp
2d/CCNode.cpp
2d/CCNodeGrid.cpp
2d/CCParallaxNode.cpp
2d/CCParticleBatchNode.cpp
2d/CCParticleExamples.cpp
2d/CCParticleSystem.cpp
2d/CCParticleSystemQuad.cpp
2d/CCProgressTimer.cpp
2d/CCProtectedNode.cpp
2d/CCRenderTexture.cpp
2d/CCScene.cpp
2d/CCSpriteBatchNode.cpp
2d/CCSprite.cpp
2d/CCSpriteFrameCache.cpp
2d/CCSpriteFrame.cpp
2d/CCTextFieldTTF.cpp
2d/CCTileMapAtlas.cpp
2d/CCTMXLayer.cpp
2d/CCTMXObjectGroup.cpp
2d/CCTMXTiledMap.cpp
2d/CCTMXXMLParser.cpp
2d/CCTransition.cpp
2d/CCTransitionPageTurn.cpp
2d/CCTransitionProgress.cpp
2d/CCTweenFunction.cpp
)

View File

@ -77,8 +77,8 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_USRDLL;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\Box2d;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\include\win32;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_USRDLL;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -116,7 +116,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\sqlite3\libraries\win32\*.*" "$(OutDir)
<ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
<ModuleDefinitionFile>cocos2d.def</ModuleDefinitionFile>
<AdditionalDependencies>libchipmunk.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libchipmunk.lib;sqlite3.lib;libcurl_imp.lib;libBox2D.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>
@ -129,8 +129,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\sqlite3\libraries\win32\*.*" "$(OutDir)
</Command>
</PreBuildEvent>
<ClCompile>
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_USRDLL;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\Box2d;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\win32\include;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_USRDLL;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
@ -158,7 +158,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
</Command>
</PreLinkEvent>
<Link>
<AdditionalDependencies>libchipmunk.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libchipmunk.lib;sqlite3.lib;libcurl_imp.lib;libBox2D.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries> ;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@ -176,6 +176,27 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\extensions\assets-manager\AssetsManager.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControl.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlButton.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlColourPicker.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlHuePicker.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlPotentiometer.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlSaturationBrightnessPicker.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlSlider.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlStepper.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlSwitch.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlUtils.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCInvocation.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCScale9Sprite.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCEditBox\CCEditBox.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCEditBox\CCEditBoxImplWin.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCScrollView\CCScrollView.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCScrollView\CCTableView.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCScrollView\CCTableViewCell.cpp" />
<ClCompile Include="..\..\extensions\physics-nodes\CCPhysicsDebugNode.cpp" />
<ClCompile Include="..\..\extensions\physics-nodes\CCPhysicsSprite.cpp" />
<ClCompile Include="..\..\extensions\proj.win32\Win32InputBox.cpp" />
<ClCompile Include="..\..\external\ConvertUTF\ConvertUTF.c" />
<ClCompile Include="..\..\external\ConvertUTF\ConvertUTFWrapper.cpp" />
<ClCompile Include="..\..\external\edtaa3func\edtaa3func.cpp" />
@ -183,6 +204,23 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="..\..\external\unzip\ioapi.cpp" />
<ClCompile Include="..\..\external\unzip\unzip.cpp" />
<ClCompile Include="..\..\external\xxhash\xxhash.c" />
<ClCompile Include="..\3d\CCAABB.cpp" />
<ClCompile Include="..\3d\CCAnimate3D.cpp" />
<ClCompile Include="..\3d\CCAnimation3D.cpp" />
<ClCompile Include="..\3d\CCAttachNode.cpp" />
<ClCompile Include="..\3d\CCBundle3D.cpp" />
<ClCompile Include="..\3d\CCBundleReader.cpp" />
<ClCompile Include="..\3d\CCMesh.cpp" />
<ClCompile Include="..\3d\CCMeshSkin.cpp" />
<ClCompile Include="..\3d\CCMeshVertexIndexData.cpp" />
<ClCompile Include="..\3d\CCOBB.cpp" />
<ClCompile Include="..\3d\CCObjLoader.cpp" />
<ClCompile Include="..\3d\CCRay.cpp" />
<ClCompile Include="..\3d\CCSkeleton3D.cpp" />
<ClCompile Include="..\3d\CCSprite3D.cpp" />
<ClCompile Include="..\3d\CCSprite3DMaterial.cpp" />
<ClCompile Include="..\audio\win32\MciPlayer.cpp" />
<ClCompile Include="..\audio\win32\SimpleAudioEngine.cpp" />
<ClCompile Include="..\base\atitc.cpp" />
<ClCompile Include="..\base\base64.cpp" />
<ClCompile Include="..\base\CCAutoreleasePool.cpp" />
@ -210,7 +248,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="..\base\CCEventTouch.cpp" />
<ClCompile Include="..\base\ccFPSImages.c" />
<ClCompile Include="..\base\CCIMEDispatcher.cpp" />
<ClCompile Include="..\base\CCModuleManager.cpp" />
<ClCompile Include="..\base\CCNS.cpp" />
<ClCompile Include="..\base\CCProfiling.cpp" />
<ClCompile Include="..\base\ccRandom.cpp" />
@ -236,6 +273,60 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="..\deprecated\CCNotificationCenter.cpp" />
<ClCompile Include="..\deprecated\CCSet.cpp" />
<ClCompile Include="..\deprecated\CCString.cpp" />
<ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCActionTimeline.cpp" />
<ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCActionTimelineCache.cpp" />
<ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCFrame.cpp" />
<ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCNodeReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCTimeLine.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCActionFrame.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCActionFrameEasing.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCActionManagerEx.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCActionNode.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCActionObject.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCArmature.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCArmatureAnimation.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCArmatureDataManager.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCArmatureDefine.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCBatchNode.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCBone.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCColliderDetector.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCComAttribute.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCComAudio.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCComController.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCComRender.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCDataReaderHelper.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCDatas.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCDecorativeDisplay.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCDisplayFactory.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCDisplayManager.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCInputDelegate.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCProcessBase.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCSGUIReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCSkin.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCSpriteFrameCacheHelper.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCSSceneReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCTransformHelp.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCTween.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCUtilMath.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CocoLoader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\DictionaryHelper.cpp" />
<ClCompile Include="..\editor-support\cocostudio\TriggerBase.cpp" />
<ClCompile Include="..\editor-support\cocostudio\TriggerMng.cpp" />
<ClCompile Include="..\editor-support\cocostudio\TriggerObj.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\ButtonReader\ButtonReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\CheckBoxReader\CheckBoxReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\ImageViewReader\ImageViewReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\LayoutReader\LayoutReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\ListViewReader\ListViewReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\LoadingBarReader\LoadingBarReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\PageViewReader\PageViewReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\ScrollViewReader\ScrollViewReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\SliderReader\SliderReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\TextAtlasReader\TextAtlasReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\TextBMFontReader\TextBMFontReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\TextFieldReader\TextFieldReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\TextReader\TextReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\WidgetReader.cpp" />
<ClCompile Include="..\math\CCAffineTransform.cpp" />
<ClCompile Include="..\math\CCGeometry.cpp" />
<ClCompile Include="..\math\CCVertex.cpp" />
@ -246,6 +337,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="..\math\Vec2.cpp" />
<ClCompile Include="..\math\Vec3.cpp" />
<ClCompile Include="..\math\Vec4.cpp" />
<ClCompile Include="..\network\HttpClient.cpp" />
<ClCompile Include="..\network\SocketIO.cpp" />
<ClCompile Include="..\network\WebSocket.cpp" />
<ClCompile Include="..\physics\CCPhysicsBody.cpp" />
<ClCompile Include="..\physics\CCPhysicsContact.cpp" />
<ClCompile Include="..\physics\CCPhysicsJoint.cpp" />
@ -288,6 +382,30 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="..\renderer\CCVertexIndexBuffer.cpp" />
<ClCompile Include="..\renderer\CCVertexIndexData.cpp" />
<ClCompile Include="..\storage\local-storage\LocalStorage.cpp" />
<ClCompile Include="..\ui\CocosGUI.cpp" />
<ClCompile Include="..\ui\UIButton.cpp" />
<ClCompile Include="..\ui\UICheckBox.cpp" />
<ClCompile Include="..\ui\UIDeprecated.cpp" />
<ClCompile Include="..\ui\UIHBox.cpp" />
<ClCompile Include="..\ui\UIHelper.cpp" />
<ClCompile Include="..\ui\UIImageView.cpp" />
<ClCompile Include="..\ui\UILayout.cpp" />
<ClCompile Include="..\ui\UILayoutManager.cpp" />
<ClCompile Include="..\ui\UILayoutParameter.cpp" />
<ClCompile Include="..\ui\UIListView.cpp" />
<ClCompile Include="..\ui\UILoadingBar.cpp" />
<ClCompile Include="..\ui\UIPageView.cpp" />
<ClCompile Include="..\ui\UIRelativeBox.cpp" />
<ClCompile Include="..\ui\UIRichText.cpp" />
<ClCompile Include="..\ui\UIScale9Sprite.cpp" />
<ClCompile Include="..\ui\UIScrollView.cpp" />
<ClCompile Include="..\ui\UISlider.cpp" />
<ClCompile Include="..\ui\UIText.cpp" />
<ClCompile Include="..\ui\UITextAtlas.cpp" />
<ClCompile Include="..\ui\UITextBMFont.cpp" />
<ClCompile Include="..\ui\UITextField.cpp" />
<ClCompile Include="..\ui\UIVBox.cpp" />
<ClCompile Include="..\ui\UIWidget.cpp" />
<ClCompile Include="CCAction.cpp" />
<ClCompile Include="CCActionCamera.cpp" />
<ClCompile Include="CCActionCatmullRom.cpp" />
@ -356,12 +474,70 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="CCTweenFunction.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\extensions\assets-manager\AssetsManager.h" />
<ClInclude Include="..\..\extensions\cocos-ext.h" />
<ClInclude Include="..\..\extensions\ExtensionExport.h" />
<ClInclude Include="..\..\extensions\ExtensionMacros.h" />
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControl.h" />
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlButton.h" />
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlColourPicker.h" />
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlExtensions.h" />
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlHuePicker.h" />
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlPotentiometer.h" />
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlSaturationBrightnessPicker.h" />
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlSlider.h" />
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlStepper.h" />
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlSwitch.h" />
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlUtils.h" />
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCInvocation.h" />
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCScale9Sprite.h" />
<ClInclude Include="..\..\extensions\GUI\CCEditBox\CCEditBox.h" />
<ClInclude Include="..\..\extensions\GUI\CCEditBox\CCEditBoxImpl.h" />
<ClInclude Include="..\..\extensions\GUI\CCEditBox\CCEditBoxImplWin.h" />
<ClInclude Include="..\..\extensions\GUI\CCScrollView\CCScrollView.h" />
<ClInclude Include="..\..\extensions\GUI\CCScrollView\CCTableView.h" />
<ClInclude Include="..\..\extensions\GUI\CCScrollView\CCTableViewCell.h" />
<ClInclude Include="..\..\extensions\physics-nodes\CCPhysicsDebugNode.h" />
<ClInclude Include="..\..\extensions\physics-nodes\CCPhysicsSprite.h" />
<ClInclude Include="..\..\extensions\proj.win32\Win32InputBox.h" />
<ClInclude Include="..\..\external\ConvertUTF\ConvertUTF.h" />
<ClInclude Include="..\..\external\edtaa3func\edtaa3func.h" />
<ClInclude Include="..\..\external\json\document.h" />
<ClInclude Include="..\..\external\json\filestream.h" />
<ClInclude Include="..\..\external\json\internal\pow10.h" />
<ClInclude Include="..\..\external\json\internal\stack.h" />
<ClInclude Include="..\..\external\json\internal\strfunc.h" />
<ClInclude Include="..\..\external\json\prettywriter.h" />
<ClInclude Include="..\..\external\json\rapidjson.h" />
<ClInclude Include="..\..\external\json\reader.h" />
<ClInclude Include="..\..\external\json\stringbuffer.h" />
<ClInclude Include="..\..\external\json\writer.h" />
<ClInclude Include="..\..\external\tinyxml2\tinyxml2.h" />
<ClInclude Include="..\..\external\unzip\ioapi.h" />
<ClInclude Include="..\..\external\unzip\unzip.h" />
<ClInclude Include="..\..\external\xxhash\xxhash.h" />
<ClInclude Include="..\3d\3dExport.h" />
<ClInclude Include="..\3d\CCAABB.h" />
<ClInclude Include="..\3d\CCAnimate3D.h" />
<ClInclude Include="..\3d\CCAnimation3D.h" />
<ClInclude Include="..\3d\CCAnimationCurve.h" />
<ClInclude Include="..\3d\CCAttachNode.h" />
<ClInclude Include="..\3d\CCBundle3D.h" />
<ClInclude Include="..\3d\CCBundle3DData.h" />
<ClInclude Include="..\3d\CCBundleReader.h" />
<ClInclude Include="..\3d\CCMesh.h" />
<ClInclude Include="..\3d\CCMeshSkin.h" />
<ClInclude Include="..\3d\CCMeshVertexIndexData.h" />
<ClInclude Include="..\3d\CCOBB.h" />
<ClInclude Include="..\3d\CCObjLoader.h" />
<ClInclude Include="..\3d\CCRay.h" />
<ClInclude Include="..\3d\CCSkeleton3D.h" />
<ClInclude Include="..\3d\CCSprite3D.h" />
<ClInclude Include="..\3d\CCSprite3DMaterial.h" />
<ClInclude Include="..\3d\cocos3d.h" />
<ClInclude Include="..\audio\include\Export.h" />
<ClInclude Include="..\audio\include\SimpleAudioEngine.h" />
<ClInclude Include="..\audio\win32\MciPlayer.h" />
<ClInclude Include="..\base\atitc.h" />
<ClInclude Include="..\base\base64.h" />
<ClInclude Include="..\base\CCAutoreleasePool.h" />
@ -394,7 +570,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="..\base\CCIMEDispatcher.h" />
<ClInclude Include="..\base\ccMacros.h" />
<ClInclude Include="..\base\CCMap.h" />
<ClInclude Include="..\base\CCModuleManager.h" />
<ClInclude Include="..\base\CCNS.h" />
<ClInclude Include="..\base\CCPlatformConfig.h" />
<ClInclude Include="..\base\CCPlatformMacros.h" />
@ -432,6 +607,65 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="..\deprecated\CCNotificationCenter.h" />
<ClInclude Include="..\deprecated\CCSet.h" />
<ClInclude Include="..\deprecated\CCString.h" />
<ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCActionTimeline.h" />
<ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCActionTimelineCache.h" />
<ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCFrame.h" />
<ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCNodeReader.h" />
<ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCTimeLine.h" />
<ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCTimelineMacro.h" />
<ClInclude Include="..\editor-support\cocostudio\CCActionFrame.h" />
<ClInclude Include="..\editor-support\cocostudio\CCActionFrameEasing.h" />
<ClInclude Include="..\editor-support\cocostudio\CCActionManagerEx.h" />
<ClInclude Include="..\editor-support\cocostudio\CCActionNode.h" />
<ClInclude Include="..\editor-support\cocostudio\CCActionObject.h" />
<ClInclude Include="..\editor-support\cocostudio\CCArmature.h" />
<ClInclude Include="..\editor-support\cocostudio\CCArmatureAnimation.h" />
<ClInclude Include="..\editor-support\cocostudio\CCArmatureDataManager.h" />
<ClInclude Include="..\editor-support\cocostudio\CCArmatureDefine.h" />
<ClInclude Include="..\editor-support\cocostudio\CCBatchNode.h" />
<ClInclude Include="..\editor-support\cocostudio\CCBone.h" />
<ClInclude Include="..\editor-support\cocostudio\CCColliderDetector.h" />
<ClInclude Include="..\editor-support\cocostudio\CCComAttribute.h" />
<ClInclude Include="..\editor-support\cocostudio\CCComAudio.h" />
<ClInclude Include="..\editor-support\cocostudio\CCComBase.h" />
<ClInclude Include="..\editor-support\cocostudio\CCComController.h" />
<ClInclude Include="..\editor-support\cocostudio\CCComRender.h" />
<ClInclude Include="..\editor-support\cocostudio\CCDataReaderHelper.h" />
<ClInclude Include="..\editor-support\cocostudio\CCDatas.h" />
<ClInclude Include="..\editor-support\cocostudio\CCDecorativeDisplay.h" />
<ClInclude Include="..\editor-support\cocostudio\CCDisplayFactory.h" />
<ClInclude Include="..\editor-support\cocostudio\CCDisplayManager.h" />
<ClInclude Include="..\editor-support\cocostudio\CCInputDelegate.h" />
<ClInclude Include="..\editor-support\cocostudio\CCProcessBase.h" />
<ClInclude Include="..\editor-support\cocostudio\CCSGUIReader.h" />
<ClInclude Include="..\editor-support\cocostudio\CCSkin.h" />
<ClInclude Include="..\editor-support\cocostudio\CCSpriteFrameCacheHelper.h" />
<ClInclude Include="..\editor-support\cocostudio\CCSSceneReader.h" />
<ClInclude Include="..\editor-support\cocostudio\CCTransformHelp.h" />
<ClInclude Include="..\editor-support\cocostudio\CCTween.h" />
<ClInclude Include="..\editor-support\cocostudio\CCUtilMath.h" />
<ClInclude Include="..\editor-support\cocostudio\CocoLoader.h" />
<ClInclude Include="..\editor-support\cocostudio\CocosStudioExport.h" />
<ClInclude Include="..\editor-support\cocostudio\CocoStudio.h" />
<ClInclude Include="..\editor-support\cocostudio\DictionaryHelper.h" />
<ClInclude Include="..\editor-support\cocostudio\TriggerBase.h" />
<ClInclude Include="..\editor-support\cocostudio\TriggerMng.h" />
<ClInclude Include="..\editor-support\cocostudio\TriggerObj.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\ButtonReader\ButtonReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\CheckBoxReader\CheckBoxReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\ImageViewReader\ImageViewReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\LayoutReader\LayoutReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\ListViewReader\ListViewReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\LoadingBarReader\LoadingBarReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\PageViewReader\PageViewReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\ScrollViewReader\ScrollViewReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\SliderReader\SliderReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\TextAtlasReader\TextAtlasReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\TextBMFontReader\TextBMFontReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\TextFieldReader\TextFieldReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\TextReader\TextReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\WidgetReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\WidgetReaderProtocol.h" />
<ClInclude Include="..\math\CCAffineTransform.h" />
<ClInclude Include="..\math\CCGeometry.h" />
<ClInclude Include="..\math\CCMath.h" />
@ -444,6 +678,11 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="..\math\Vec2.h" />
<ClInclude Include="..\math\Vec3.h" />
<ClInclude Include="..\math\Vec4.h" />
<ClInclude Include="..\network\HttpClient.h" />
<ClInclude Include="..\network\HttpRequest.h" />
<ClInclude Include="..\network\HttpResponse.h" />
<ClInclude Include="..\network\SocketIO.h" />
<ClInclude Include="..\network\WebSocket.h" />
<ClInclude Include="..\physics\CCPhysicsBody.h" />
<ClInclude Include="..\physics\CCPhysicsContact.h" />
<ClInclude Include="..\physics\CCPhysicsJoint.h" />
@ -492,6 +731,31 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="..\renderer\CCVertexIndexBuffer.h" />
<ClInclude Include="..\renderer\CCVertexIndexData.h" />
<ClInclude Include="..\storage\local-storage\LocalStorage.h" />
<ClInclude Include="..\ui\CocosGUI.h" />
<ClInclude Include="..\ui\GUIExport.h" />
<ClInclude Include="..\ui\UIButton.h" />
<ClInclude Include="..\ui\UICheckBox.h" />
<ClInclude Include="..\ui\UIDeprecated.h" />
<ClInclude Include="..\ui\UIHBox.h" />
<ClInclude Include="..\ui\UIHelper.h" />
<ClInclude Include="..\ui\UIImageView.h" />
<ClInclude Include="..\ui\UILayout.h" />
<ClInclude Include="..\ui\UILayoutManager.h" />
<ClInclude Include="..\ui\UILayoutParameter.h" />
<ClInclude Include="..\ui\UIListView.h" />
<ClInclude Include="..\ui\UILoadingBar.h" />
<ClInclude Include="..\ui\UIPageView.h" />
<ClInclude Include="..\ui\UIRelativeBox.h" />
<ClInclude Include="..\ui\UIRichText.h" />
<ClInclude Include="..\ui\UIScale9Sprite.h" />
<ClInclude Include="..\ui\UIScrollView.h" />
<ClInclude Include="..\ui\UISlider.h" />
<ClInclude Include="..\ui\UIText.h" />
<ClInclude Include="..\ui\UITextAtlas.h" />
<ClInclude Include="..\ui\UITextBMFont.h" />
<ClInclude Include="..\ui\UITextField.h" />
<ClInclude Include="..\ui\UIVBox.h" />
<ClInclude Include="..\ui\UIWidget.h" />
<ClInclude Include="CCAction.h" />
<ClInclude Include="CCActionCamera.h" />
<ClInclude Include="CCActionCatmullRom.h" />
@ -560,6 +824,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="CCTweenFunction.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\3d\CCAnimationCurve.inl" />
<None Include="..\math\Mat4.inl" />
<None Include="..\math\MathUtil.inl" />
<None Include="..\math\MathUtilNeon.inl" />
@ -570,8 +835,21 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<None Include="cocos2d.def" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\external\Box2D\proj.win32\libbox2d.vcxproj">
<Project>{929480e7-23c0-4df6-8456-096d71547116}</Project>
<Private>false</Private>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
<ProjectReference Include="..\..\external\chipmunk\proj.win32\chipmunk.vcxproj">
<Project>{207bc7a9-ccf1-4f2f-a04d-45f72242ae25}</Project>
<Private>false</Private>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

View File

@ -55,6 +55,153 @@
<Filter Include="storage">
<UniqueIdentifier>{44bdf58f-4af2-433c-b4af-58dc05ef96b5}</UniqueIdentifier>
</Filter>
<Filter Include="3d">
<UniqueIdentifier>{63733c51-582a-4f0f-9a82-e066da459a72}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio">
<UniqueIdentifier>{dbdbbfad-71fc-4f1d-a809-b43651f87267}</UniqueIdentifier>
</Filter>
<Filter Include="cocosdenshion">
<UniqueIdentifier>{3bd71d42-dfa4-4649-bb01-ad607fdca1c2}</UniqueIdentifier>
</Filter>
<Filter Include="ui">
<UniqueIdentifier>{704c4ce6-b7ad-4406-9414-71169734bbc1}</UniqueIdentifier>
</Filter>
<Filter Include="extension">
<UniqueIdentifier>{976bf662-699e-482e-b5db-a20d4abab137}</UniqueIdentifier>
</Filter>
<Filter Include="extension\AssetsManager">
<UniqueIdentifier>{ad47c713-2196-4c8f-9205-2a2a7ecc0b80}</UniqueIdentifier>
</Filter>
<Filter Include="extension\GUI">
<UniqueIdentifier>{b27aba95-51a2-413c-8570-0aff9adf2b6b}</UniqueIdentifier>
</Filter>
<Filter Include="extension\GUI\CCControlExtension">
<UniqueIdentifier>{220cf2ee-61b0-40cf-a88a-8627e4e609f1}</UniqueIdentifier>
</Filter>
<Filter Include="extension\GUI\CCScrollView">
<UniqueIdentifier>{a1f539bc-d5be-4224-a4d2-01c0b6f17d6e}</UniqueIdentifier>
</Filter>
<Filter Include="extension\GUI\CCEditBox">
<UniqueIdentifier>{dc45cd54-4576-4401-87b7-a276f91a45bd}</UniqueIdentifier>
</Filter>
<Filter Include="extension\physics_nodes">
<UniqueIdentifier>{1de7fce7-0dee-4571-8fcd-43eb617aaf8b}</UniqueIdentifier>
</Filter>
<Filter Include="cocosdenshion\Header Files">
<UniqueIdentifier>{f42979de-0079-4eba-b469-81ebff9ec588}</UniqueIdentifier>
</Filter>
<Filter Include="cocosdenshion\Source Files">
<UniqueIdentifier>{f42ec238-cddc-475a-b343-6d0984cb9681}</UniqueIdentifier>
</Filter>
<Filter Include="network">
<UniqueIdentifier>{31338a7d-ebe1-4867-9c17-d3645122a864}</UniqueIdentifier>
</Filter>
<Filter Include="network\Header Files">
<UniqueIdentifier>{5a094fe5-f941-4dd4-a892-28d721162ea7}</UniqueIdentifier>
</Filter>
<Filter Include="network\Source Files">
<UniqueIdentifier>{9702eb68-42c9-405a-bc89-a1bd85a40ec7}</UniqueIdentifier>
</Filter>
<Filter Include="ui\BaseClasses">
<UniqueIdentifier>{ad654e6b-96ee-4693-9789-dc4aa1c52e70}</UniqueIdentifier>
</Filter>
<Filter Include="ui\Layouts">
<UniqueIdentifier>{177a9a30-a4a6-41e6-93f0-4a4cbe9e4039}</UniqueIdentifier>
</Filter>
<Filter Include="ui\System">
<UniqueIdentifier>{c2ebbbc1-85b3-4d6f-a3c5-116eae2124e1}</UniqueIdentifier>
</Filter>
<Filter Include="ui\UIWidgets">
<UniqueIdentifier>{0d201449-ce7a-4f87-86ab-9c30e803c901}</UniqueIdentifier>
</Filter>
<Filter Include="ui\UIWidgets\ScrollWidget">
<UniqueIdentifier>{6ac0e3c8-d5b1-44d9-8c41-21662a767cc6}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\trigger">
<UniqueIdentifier>{0554a5b1-03a1-4d38-87a5-976dbe9a39d9}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\TimelineAction">
<UniqueIdentifier>{c75d4c37-d555-4a5b-a0ba-4bc9a3d846e1}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\reader">
<UniqueIdentifier>{67bdb22e-8cfc-41ed-bb07-861e88a31752}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\reader\WidgetReader">
<UniqueIdentifier>{284a709e-9efa-484a-a595-83db6c7836c8}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\reader\WidgetReader\ButtonReader">
<UniqueIdentifier>{3c7267f2-06ea-4c7c-a13c-552076a3dc8c}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\reader\WidgetReader\CheckBoxReader">
<UniqueIdentifier>{b47c2297-bf5e-43e6-ae70-741efee00689}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\reader\WidgetReader\ImageViewReader">
<UniqueIdentifier>{1b5e8a9e-87cf-4800-bb7b-4f63504fb132}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\reader\WidgetReader\LayoutReader">
<UniqueIdentifier>{d47fb3dd-9ab8-4559-b8b5-776d87aba319}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\reader\WidgetReader\ListViewReader">
<UniqueIdentifier>{65c0429b-5a85-46ac-ab4a-edb0aeb5d388}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\reader\WidgetReader\LoadingBarReader">
<UniqueIdentifier>{8bdf34ea-1e66-41b0-9dbf-7530ba14dce5}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\reader\WidgetReader\PageViewReader">
<UniqueIdentifier>{690fb572-be0b-4bb6-9b8b-a007afb99b39}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\reader\WidgetReader\ScrollViewReader">
<UniqueIdentifier>{5e397fa9-4e36-43f3-8c4f-1dd3382c1458}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\reader\WidgetReader\SliderReader">
<UniqueIdentifier>{fa2abcd0-6362-4741-a144-a3b0226fe4f1}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\reader\WidgetReader\TextAtlasReader">
<UniqueIdentifier>{03596848-0d59-4d69-8193-30f404683c7a}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\reader\WidgetReader\TextBMFontReader">
<UniqueIdentifier>{4d27423a-d9e8-496b-bcc4-8684230c6c18}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\reader\WidgetReader\TextFieldReader">
<UniqueIdentifier>{075b4cf0-63ae-4cb1-a6d8-e7cb24146531}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\reader\WidgetReader\TextReader">
<UniqueIdentifier>{9421ece2-69f8-4cee-8e59-575c3ba06f15}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\json">
<UniqueIdentifier>{a9901b6a-0c7b-4adb-8e17-105c872d744d}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\json\rapidjson">
<UniqueIdentifier>{a9a3bf20-9daf-465d-9525-cce2ab0d85a3}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\json\rapidjson\internal">
<UniqueIdentifier>{0cf2210c-3544-41ed-9d4e-88987a1c7bcf}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\components">
<UniqueIdentifier>{dc6e53e4-e518-403f-b2a9-97f6f7cd0961}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\armature">
<UniqueIdentifier>{22a4587f-d4ca-44fa-a734-ded122cd79e5}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\armature\animation">
<UniqueIdentifier>{137efcbb-0d14-4f1c-a856-7b1669a6d2af}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\armature\datas">
<UniqueIdentifier>{4825cd2d-ca8b-434c-8c79-2d3d3258086f}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\armature\display">
<UniqueIdentifier>{57ba2fcb-04bd-4b2f-9ae6-375992ad363a}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\armature\physics">
<UniqueIdentifier>{acdfaa6f-1374-4611-a5e7-9038dc6900c4}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\armature\utils">
<UniqueIdentifier>{f195e2f1-1030-4848-9498-f8142bf89009}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\action">
<UniqueIdentifier>{d48c8016-e933-48dd-a5c0-202b0a84b82a}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\physics\CCPhysicsBody.cpp">
@ -583,12 +730,366 @@
<ClCompile Include="..\renderer\CCVertexIndexData.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\base\CCModuleManager.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\ccRandom.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCAABB.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCAnimate3D.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCAnimation3D.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCAttachNode.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCBundle3D.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCBundleReader.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCMesh.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCMeshSkin.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCOBB.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCObjLoader.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCRay.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCSkeleton3D.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCSprite3D.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCSprite3DMaterial.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\assets-manager\AssetsManager.cpp">
<Filter>extension\AssetsManager</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControl.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlButton.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlColourPicker.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlHuePicker.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlPotentiometer.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlSaturationBrightnessPicker.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlSlider.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlStepper.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlSwitch.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlUtils.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCInvocation.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCScale9Sprite.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCScrollView\CCScrollView.cpp">
<Filter>extension\GUI\CCScrollView</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCScrollView\CCTableView.cpp">
<Filter>extension\GUI\CCScrollView</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCScrollView\CCTableViewCell.cpp">
<Filter>extension\GUI\CCScrollView</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCEditBox\CCEditBox.cpp">
<Filter>extension\GUI\CCEditBox</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCEditBox\CCEditBoxImplWin.cpp">
<Filter>extension\GUI\CCEditBox</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\proj.win32\Win32InputBox.cpp">
<Filter>extension\GUI\CCEditBox</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\physics-nodes\CCPhysicsDebugNode.cpp">
<Filter>extension\physics_nodes</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\physics-nodes\CCPhysicsSprite.cpp">
<Filter>extension\physics_nodes</Filter>
</ClCompile>
<ClCompile Include="..\audio\win32\MciPlayer.cpp">
<Filter>cocosdenshion\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\audio\win32\SimpleAudioEngine.cpp">
<Filter>cocosdenshion\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\network\HttpClient.cpp">
<Filter>network\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\network\SocketIO.cpp">
<Filter>network\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\network\WebSocket.cpp">
<Filter>network\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\ui\UIScale9Sprite.cpp">
<Filter>ui\BaseClasses</Filter>
</ClCompile>
<ClCompile Include="..\ui\UIWidget.cpp">
<Filter>ui\BaseClasses</Filter>
</ClCompile>
<ClCompile Include="..\ui\UIHBox.cpp">
<Filter>ui\Layouts</Filter>
</ClCompile>
<ClCompile Include="..\ui\UILayout.cpp">
<Filter>ui\Layouts</Filter>
</ClCompile>
<ClCompile Include="..\ui\UILayoutManager.cpp">
<Filter>ui\Layouts</Filter>
</ClCompile>
<ClCompile Include="..\ui\UILayoutParameter.cpp">
<Filter>ui\Layouts</Filter>
</ClCompile>
<ClCompile Include="..\ui\UIRelativeBox.cpp">
<Filter>ui\Layouts</Filter>
</ClCompile>
<ClCompile Include="..\ui\UIVBox.cpp">
<Filter>ui\Layouts</Filter>
</ClCompile>
<ClCompile Include="..\ui\CocosGUI.cpp">
<Filter>ui\System</Filter>
</ClCompile>
<ClCompile Include="..\ui\UIDeprecated.cpp">
<Filter>ui\System</Filter>
</ClCompile>
<ClCompile Include="..\ui\UIHelper.cpp">
<Filter>ui\System</Filter>
</ClCompile>
<ClCompile Include="..\ui\UIButton.cpp">
<Filter>ui\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\ui\UICheckBox.cpp">
<Filter>ui\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\ui\UIImageView.cpp">
<Filter>ui\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\ui\UILoadingBar.cpp">
<Filter>ui\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\ui\UIRichText.cpp">
<Filter>ui\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\ui\UISlider.cpp">
<Filter>ui\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\ui\UIText.cpp">
<Filter>ui\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\ui\UITextAtlas.cpp">
<Filter>ui\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\ui\UITextBMFont.cpp">
<Filter>ui\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\ui\UITextField.cpp">
<Filter>ui\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\ui\UIListView.cpp">
<Filter>ui\UIWidgets\ScrollWidget</Filter>
</ClCompile>
<ClCompile Include="..\ui\UIPageView.cpp">
<Filter>ui\UIWidgets\ScrollWidget</Filter>
</ClCompile>
<ClCompile Include="..\ui\UIScrollView.cpp">
<Filter>ui\UIWidgets\ScrollWidget</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\TriggerBase.cpp">
<Filter>cocostudio\trigger</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\TriggerMng.cpp">
<Filter>cocostudio\trigger</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\TriggerObj.cpp">
<Filter>cocostudio\trigger</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCActionTimeline.cpp">
<Filter>cocostudio\TimelineAction</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCFrame.cpp">
<Filter>cocostudio\TimelineAction</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCNodeReader.cpp">
<Filter>cocostudio\TimelineAction</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCActionTimelineCache.cpp">
<Filter>cocostudio\TimelineAction</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCTimeLine.cpp">
<Filter>cocostudio\TimelineAction</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCSGUIReader.cpp">
<Filter>cocostudio\reader</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCSSceneReader.cpp">
<Filter>cocostudio\reader</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\WidgetReader.cpp">
<Filter>cocostudio\reader\WidgetReader</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\ButtonReader\ButtonReader.cpp">
<Filter>cocostudio\reader\WidgetReader\ButtonReader</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\CheckBoxReader\CheckBoxReader.cpp">
<Filter>cocostudio\reader\WidgetReader\CheckBoxReader</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\ImageViewReader\ImageViewReader.cpp">
<Filter>cocostudio\reader\WidgetReader\ImageViewReader</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\LayoutReader\LayoutReader.cpp">
<Filter>cocostudio\reader\WidgetReader\LayoutReader</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\ListViewReader\ListViewReader.cpp">
<Filter>cocostudio\reader\WidgetReader\ListViewReader</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\LoadingBarReader\LoadingBarReader.cpp">
<Filter>cocostudio\reader\WidgetReader\LoadingBarReader</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\PageViewReader\PageViewReader.cpp">
<Filter>cocostudio\reader\WidgetReader\PageViewReader</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\ScrollViewReader\ScrollViewReader.cpp">
<Filter>cocostudio\reader\WidgetReader\ScrollViewReader</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\SliderReader\SliderReader.cpp">
<Filter>cocostudio\reader\WidgetReader\SliderReader</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\TextAtlasReader\TextAtlasReader.cpp">
<Filter>cocostudio\reader\WidgetReader\TextAtlasReader</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\TextBMFontReader\TextBMFontReader.cpp">
<Filter>cocostudio\reader\WidgetReader\TextBMFontReader</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\TextFieldReader\TextFieldReader.cpp">
<Filter>cocostudio\reader\WidgetReader\TextFieldReader</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\TextReader\TextReader.cpp">
<Filter>cocostudio\reader\WidgetReader\TextReader</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CocoLoader.cpp">
<Filter>cocostudio\json</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\DictionaryHelper.cpp">
<Filter>cocostudio\json</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCComAttribute.cpp">
<Filter>cocostudio\components</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCComAudio.cpp">
<Filter>cocostudio\components</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCComController.cpp">
<Filter>cocostudio\components</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCComRender.cpp">
<Filter>cocostudio\components</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCInputDelegate.cpp">
<Filter>cocostudio\components</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCArmature.cpp">
<Filter>cocostudio\armature</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCBone.cpp">
<Filter>cocostudio\armature</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCArmatureAnimation.cpp">
<Filter>cocostudio\armature\animation</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCProcessBase.cpp">
<Filter>cocostudio\armature\animation</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCTween.cpp">
<Filter>cocostudio\armature\animation</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCDatas.cpp">
<Filter>cocostudio\armature\datas</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCBatchNode.cpp">
<Filter>cocostudio\armature\display</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCDecorativeDisplay.cpp">
<Filter>cocostudio\armature\display</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCDisplayFactory.cpp">
<Filter>cocostudio\armature\display</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCDisplayManager.cpp">
<Filter>cocostudio\armature\display</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCSkin.cpp">
<Filter>cocostudio\armature\display</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCColliderDetector.cpp">
<Filter>cocostudio\armature\physics</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCArmatureDataManager.cpp">
<Filter>cocostudio\armature\utils</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCArmatureDefine.cpp">
<Filter>cocostudio\armature\utils</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCDataReaderHelper.cpp">
<Filter>cocostudio\armature\utils</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCSpriteFrameCacheHelper.cpp">
<Filter>cocostudio\armature\utils</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCTransformHelp.cpp">
<Filter>cocostudio\armature\utils</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCUtilMath.cpp">
<Filter>cocostudio\armature\utils</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCActionFrame.cpp">
<Filter>cocostudio\action</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCActionFrameEasing.cpp">
<Filter>cocostudio\action</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCActionManagerEx.cpp">
<Filter>cocostudio\action</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCActionNode.cpp">
<Filter>cocostudio\action</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CCActionObject.cpp">
<Filter>cocostudio\action</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCMeshVertexIndexData.cpp">
<Filter>3d</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\physics\CCPhysicsBody.h">
@ -1189,12 +1690,450 @@
<ClInclude Include="..\renderer\CCVertexIndexData.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\base\CCModuleManager.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\ccRandom.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\3d\3dExport.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCAABB.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCAnimate3D.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCAnimation3D.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCAnimationCurve.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCAttachNode.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCBundle3D.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCBundle3DData.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCBundleReader.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCMesh.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCMeshSkin.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCOBB.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCObjLoader.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCRay.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCSkeleton3D.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCSprite3D.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCSprite3DMaterial.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\cocos3d.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\assets-manager\AssetsManager.h">
<Filter>extension\AssetsManager</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControl.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlButton.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlColourPicker.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlExtensions.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlHuePicker.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlPotentiometer.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlSaturationBrightnessPicker.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlSlider.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlStepper.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlSwitch.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlUtils.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCInvocation.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCScale9Sprite.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCScrollView\CCScrollView.h">
<Filter>extension\GUI\CCScrollView</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCScrollView\CCTableView.h">
<Filter>extension\GUI\CCScrollView</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCScrollView\CCTableViewCell.h">
<Filter>extension\GUI\CCScrollView</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCEditBox\CCEditBox.h">
<Filter>extension\GUI\CCEditBox</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCEditBox\CCEditBoxImpl.h">
<Filter>extension\GUI\CCEditBox</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCEditBox\CCEditBoxImplWin.h">
<Filter>extension\GUI\CCEditBox</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\proj.win32\Win32InputBox.h">
<Filter>extension\GUI\CCEditBox</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\physics-nodes\CCPhysicsDebugNode.h">
<Filter>extension\physics_nodes</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\physics-nodes\CCPhysicsSprite.h">
<Filter>extension\physics_nodes</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\cocos-ext.h">
<Filter>extension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\ExtensionExport.h">
<Filter>extension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\ExtensionMacros.h">
<Filter>extension</Filter>
</ClInclude>
<ClInclude Include="..\audio\include\Export.h">
<Filter>cocosdenshion\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\audio\win32\MciPlayer.h">
<Filter>cocosdenshion\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\audio\include\SimpleAudioEngine.h">
<Filter>cocosdenshion\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\network\HttpClient.h">
<Filter>network\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\network\HttpRequest.h">
<Filter>network\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\network\HttpResponse.h">
<Filter>network\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\network\SocketIO.h">
<Filter>network\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\network\WebSocket.h">
<Filter>network\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\ui\UIScale9Sprite.h">
<Filter>ui\BaseClasses</Filter>
</ClInclude>
<ClInclude Include="..\ui\UIWidget.h">
<Filter>ui\BaseClasses</Filter>
</ClInclude>
<ClInclude Include="..\ui\UIHBox.h">
<Filter>ui\Layouts</Filter>
</ClInclude>
<ClInclude Include="..\ui\UILayout.h">
<Filter>ui\Layouts</Filter>
</ClInclude>
<ClInclude Include="..\ui\UILayoutManager.h">
<Filter>ui\Layouts</Filter>
</ClInclude>
<ClInclude Include="..\ui\UILayoutParameter.h">
<Filter>ui\Layouts</Filter>
</ClInclude>
<ClInclude Include="..\ui\UIRelativeBox.h">
<Filter>ui\Layouts</Filter>
</ClInclude>
<ClInclude Include="..\ui\UIVBox.h">
<Filter>ui\Layouts</Filter>
</ClInclude>
<ClInclude Include="..\ui\CocosGUI.h">
<Filter>ui\System</Filter>
</ClInclude>
<ClInclude Include="..\ui\GUIExport.h">
<Filter>ui\System</Filter>
</ClInclude>
<ClInclude Include="..\ui\UIDeprecated.h">
<Filter>ui\System</Filter>
</ClInclude>
<ClInclude Include="..\ui\UIHelper.h">
<Filter>ui\System</Filter>
</ClInclude>
<ClInclude Include="..\ui\UIButton.h">
<Filter>ui\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\ui\UICheckBox.h">
<Filter>ui\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\ui\UIImageView.h">
<Filter>ui\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\ui\UILoadingBar.h">
<Filter>ui\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\ui\UIRichText.h">
<Filter>ui\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\ui\UISlider.h">
<Filter>ui\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\ui\UIText.h">
<Filter>ui\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\ui\UITextAtlas.h">
<Filter>ui\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\ui\UITextBMFont.h">
<Filter>ui\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\ui\UITextField.h">
<Filter>ui\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\ui\UIListView.h">
<Filter>ui\UIWidgets\ScrollWidget</Filter>
</ClInclude>
<ClInclude Include="..\ui\UIPageView.h">
<Filter>ui\UIWidgets\ScrollWidget</Filter>
</ClInclude>
<ClInclude Include="..\ui\UIScrollView.h">
<Filter>ui\UIWidgets\ScrollWidget</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CocosStudioExport.h">
<Filter>cocostudio</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\TriggerBase.h">
<Filter>cocostudio\trigger</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\TriggerMng.h">
<Filter>cocostudio\trigger</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\TriggerObj.h">
<Filter>cocostudio\trigger</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCActionTimeline.h">
<Filter>cocostudio\TimelineAction</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCFrame.h">
<Filter>cocostudio\TimelineAction</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCNodeReader.h">
<Filter>cocostudio\TimelineAction</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCActionTimelineCache.h">
<Filter>cocostudio\TimelineAction</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCTimeLine.h">
<Filter>cocostudio\TimelineAction</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCTimelineMacro.h">
<Filter>cocostudio\TimelineAction</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCSGUIReader.h">
<Filter>cocostudio\reader</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCSSceneReader.h">
<Filter>cocostudio\reader</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\WidgetReader.h">
<Filter>cocostudio\reader\WidgetReader</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\WidgetReaderProtocol.h">
<Filter>cocostudio\reader\WidgetReader</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\ButtonReader\ButtonReader.h">
<Filter>cocostudio\reader\WidgetReader\ButtonReader</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\CheckBoxReader\CheckBoxReader.h">
<Filter>cocostudio\reader\WidgetReader\CheckBoxReader</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\ImageViewReader\ImageViewReader.h">
<Filter>cocostudio\reader\WidgetReader\ImageViewReader</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\LayoutReader\LayoutReader.h">
<Filter>cocostudio\reader\WidgetReader\LayoutReader</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\ListViewReader\ListViewReader.h">
<Filter>cocostudio\reader\WidgetReader\ListViewReader</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\LoadingBarReader\LoadingBarReader.h">
<Filter>cocostudio\reader\WidgetReader\LoadingBarReader</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\PageViewReader\PageViewReader.h">
<Filter>cocostudio\reader\WidgetReader\PageViewReader</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\ScrollViewReader\ScrollViewReader.h">
<Filter>cocostudio\reader\WidgetReader\ScrollViewReader</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\SliderReader\SliderReader.h">
<Filter>cocostudio\reader\WidgetReader\SliderReader</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\TextAtlasReader\TextAtlasReader.h">
<Filter>cocostudio\reader\WidgetReader\TextAtlasReader</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\TextBMFontReader\TextBMFontReader.h">
<Filter>cocostudio\reader\WidgetReader\TextBMFontReader</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\TextFieldReader\TextFieldReader.h">
<Filter>cocostudio\reader\WidgetReader\TextFieldReader</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\TextReader\TextReader.h">
<Filter>cocostudio\reader\WidgetReader\TextReader</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CocoLoader.h">
<Filter>cocostudio\json</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CocoStudio.h">
<Filter>cocostudio\json</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\DictionaryHelper.h">
<Filter>cocostudio\json</Filter>
</ClInclude>
<ClInclude Include="..\..\external\json\document.h">
<Filter>cocostudio\json\rapidjson</Filter>
</ClInclude>
<ClInclude Include="..\..\external\json\filestream.h">
<Filter>cocostudio\json\rapidjson</Filter>
</ClInclude>
<ClInclude Include="..\..\external\json\prettywriter.h">
<Filter>cocostudio\json\rapidjson</Filter>
</ClInclude>
<ClInclude Include="..\..\external\json\rapidjson.h">
<Filter>cocostudio\json\rapidjson</Filter>
</ClInclude>
<ClInclude Include="..\..\external\json\reader.h">
<Filter>cocostudio\json\rapidjson</Filter>
</ClInclude>
<ClInclude Include="..\..\external\json\stringbuffer.h">
<Filter>cocostudio\json\rapidjson</Filter>
</ClInclude>
<ClInclude Include="..\..\external\json\writer.h">
<Filter>cocostudio\json\rapidjson</Filter>
</ClInclude>
<ClInclude Include="..\..\external\json\internal\pow10.h">
<Filter>cocostudio\json\rapidjson\internal</Filter>
</ClInclude>
<ClInclude Include="..\..\external\json\internal\stack.h">
<Filter>cocostudio\json\rapidjson\internal</Filter>
</ClInclude>
<ClInclude Include="..\..\external\json\internal\strfunc.h">
<Filter>cocostudio\json\rapidjson\internal</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCComAttribute.h">
<Filter>cocostudio\components</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCComAudio.h">
<Filter>cocostudio\components</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCComBase.h">
<Filter>cocostudio\components</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCComController.h">
<Filter>cocostudio\components</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCComRender.h">
<Filter>cocostudio\components</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCInputDelegate.h">
<Filter>cocostudio\components</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCArmature.h">
<Filter>cocostudio\armature</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCBone.h">
<Filter>cocostudio\armature</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCArmatureAnimation.h">
<Filter>cocostudio\armature\animation</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCProcessBase.h">
<Filter>cocostudio\armature\animation</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCTween.h">
<Filter>cocostudio\armature\animation</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCDatas.h">
<Filter>cocostudio\armature\datas</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCBatchNode.h">
<Filter>cocostudio\armature\display</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCDecorativeDisplay.h">
<Filter>cocostudio\armature\display</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCDisplayFactory.h">
<Filter>cocostudio\armature\display</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCDisplayManager.h">
<Filter>cocostudio\armature\display</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCSkin.h">
<Filter>cocostudio\armature\display</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCColliderDetector.h">
<Filter>cocostudio\armature\physics</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCArmatureDataManager.h">
<Filter>cocostudio\armature\utils</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCArmatureDefine.h">
<Filter>cocostudio\armature\utils</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCDataReaderHelper.h">
<Filter>cocostudio\armature\utils</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCSpriteFrameCacheHelper.h">
<Filter>cocostudio\armature\utils</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCTransformHelp.h">
<Filter>cocostudio\armature\utils</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCUtilMath.h">
<Filter>cocostudio\armature\utils</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCActionFrame.h">
<Filter>cocostudio\action</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCActionFrameEasing.h">
<Filter>cocostudio\action</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCActionManagerEx.h">
<Filter>cocostudio\action</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCActionNode.h">
<Filter>cocostudio\action</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CCActionObject.h">
<Filter>cocostudio\action</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCMeshVertexIndexData.h">
<Filter>3d</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\math\Mat4.inl">
@ -1219,5 +2158,8 @@
<Filter>math</Filter>
</None>
<None Include="cocos2d.def" />
<None Include="..\3d\CCAnimationCurve.inl">
<Filter>3d</Filter>
</None>
</ItemGroup>
</Project>

View File

@ -114,7 +114,6 @@ base/CCEventListenerTouch.cpp \
base/CCEventMouse.cpp \
base/CCEventTouch.cpp \
base/CCIMEDispatcher.cpp \
base/CCModuleManager.cpp \
base/CCNS.cpp \
base/CCProfiling.cpp \
base/ccRandom.cpp \
@ -185,18 +184,295 @@ physics/chipmunk/CCPhysicsWorldInfo_chipmunk.cpp \
../external/xxhash/xxhash.c
#3d
LOCAL_SRC_FILES += 3d/CCRay.cpp \
3d/CCAABB.cpp \
3d/CCOBB.cpp \
3d/CCAnimate3D.cpp \
3d/CCAnimation3D.cpp \
3d/CCAttachNode.cpp \
3d/CCBundle3D.cpp \
3d/CCBundleReader.cpp \
3d/CCMesh.cpp \
3d/CCMeshSkin.cpp \
3d/CCMeshVertexIndexData.cpp \
3d/CCSprite3DMaterial.cpp \
3d/CCObjLoader.cpp \
3d/CCSkeleton3D.cpp \
3d/CCSprite3D.cpp \
3d/CCSprite3DMaterial.cpp
#audio
LOCAL_SRC_FILES += audio/android/cddSimpleAudioEngine.cpp \
audio/android/ccdandroidUtils.cpp \
audio/android/jni/cddandroidAndroidJavaEngine.cpp
#network
LOCAL_SRC_FILES += network/HttpClient.cpp \
network/SocketIO.cpp \
network/WebSocket.cpp
#cocosbuilder
LOCAL_SRC_FILES += editor-support/cocosbuilder/CCBAnimationManager.cpp \
editor-support/cocosbuilder/CCBFileLoader.cpp \
editor-support/cocosbuilder/CCBKeyframe.cpp \
editor-support/cocosbuilder/CCBReader.cpp \
editor-support/cocosbuilder/CCBSequence.cpp \
editor-support/cocosbuilder/CCBSequenceProperty.cpp \
editor-support/cocosbuilder/CCControlButtonLoader.cpp \
editor-support/cocosbuilder/CCControlLoader.cpp \
editor-support/cocosbuilder/CCLabelBMFontLoader.cpp \
editor-support/cocosbuilder/CCLabelTTFLoader.cpp \
editor-support/cocosbuilder/CCLayerColorLoader.cpp \
editor-support/cocosbuilder/CCLayerGradientLoader.cpp \
editor-support/cocosbuilder/CCLayerLoader.cpp \
editor-support/cocosbuilder/CCMenuItemImageLoader.cpp \
editor-support/cocosbuilder/CCMenuItemLoader.cpp \
editor-support/cocosbuilder/CCNode+CCBRelativePositioning.cpp \
editor-support/cocosbuilder/CCNodeLoader.cpp \
editor-support/cocosbuilder/CCNodeLoaderLibrary.cpp \
editor-support/cocosbuilder/CCParticleSystemQuadLoader.cpp \
editor-support/cocosbuilder/CCScale9SpriteLoader.cpp \
editor-support/cocosbuilder/CCScrollViewLoader.cpp \
editor-support/cocosbuilder/CCSpriteLoader.cpp
#cocostudio
LOCAL_SRC_FILES += editor-support/cocostudio/CCActionFrame.cpp \
editor-support/cocostudio/CCActionFrameEasing.cpp \
editor-support/cocostudio/CCActionManagerEx.cpp \
editor-support/cocostudio/CCActionNode.cpp \
editor-support/cocostudio/CCActionObject.cpp \
editor-support/cocostudio/CCArmature.cpp \
editor-support/cocostudio/CCBone.cpp \
editor-support/cocostudio/CCArmatureAnimation.cpp \
editor-support/cocostudio/CCProcessBase.cpp \
editor-support/cocostudio/CCTween.cpp \
editor-support/cocostudio/CCDatas.cpp \
editor-support/cocostudio/CCBatchNode.cpp \
editor-support/cocostudio/CCDecorativeDisplay.cpp \
editor-support/cocostudio/CCDisplayFactory.cpp \
editor-support/cocostudio/CCDisplayManager.cpp \
editor-support/cocostudio/CCSkin.cpp \
editor-support/cocostudio/CCColliderDetector.cpp \
editor-support/cocostudio/CCArmatureDataManager.cpp \
editor-support/cocostudio/CCArmatureDefine.cpp \
editor-support/cocostudio/CCDataReaderHelper.cpp \
editor-support/cocostudio/CCSpriteFrameCacheHelper.cpp \
editor-support/cocostudio/CCTransformHelp.cpp \
editor-support/cocostudio/CCUtilMath.cpp \
editor-support/cocostudio/CCComAttribute.cpp \
editor-support/cocostudio/CCComAudio.cpp \
editor-support/cocostudio/CCComController.cpp \
editor-support/cocostudio/CCComRender.cpp \
editor-support/cocostudio/CCInputDelegate.cpp \
editor-support/cocostudio/DictionaryHelper.cpp \
editor-support/cocostudio/CCSGUIReader.cpp \
editor-support/cocostudio/CCSSceneReader.cpp \
editor-support/cocostudio/TriggerBase.cpp \
editor-support/cocostudio/TriggerMng.cpp \
editor-support/cocostudio/TriggerObj.cpp \
editor-support/cocostudio/CocoLoader.cpp \
editor-support/cocostudio/WidgetReader/WidgetReader.cpp \
editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp \
editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.cpp \
editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp \
editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp \
editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp \
editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp \
editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.cpp \
editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.cpp \
editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.cpp \
editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp \
editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp \
editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp \
editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp \
editor-support/cocostudio/ActionTimeline/CCNodeReader.cpp \
editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp \
editor-support/cocostudio/ActionTimeline/CCFrame.cpp \
editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp \
editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp
#spine
LOCAL_SRC_FILES += editor-support/spine/Animation.cpp \
editor-support/spine/AnimationState.cpp \
editor-support/spine/AnimationStateData.cpp \
editor-support/spine/Atlas.cpp \
editor-support/spine/AtlasAttachmentLoader.cpp \
editor-support/spine/Attachment.cpp \
editor-support/spine/AttachmentLoader.cpp \
editor-support/spine/Bone.cpp \
editor-support/spine/BoneData.cpp \
editor-support/spine/CCSkeleton.cpp \
editor-support/spine/CCSkeletonAnimation.cpp \
editor-support/spine/Json.cpp \
editor-support/spine/RegionAttachment.cpp \
editor-support/spine/Skeleton.cpp \
editor-support/spine/SkeletonData.cpp \
editor-support/spine/SkeletonJson.cpp \
editor-support/spine/Skin.cpp \
editor-support/spine/Slot.cpp \
editor-support/spine/SlotData.cpp \
editor-support/spine/BoundingBoxAttachment.cpp \
editor-support/spine/Event.cpp \
editor-support/spine/EventData.cpp \
editor-support/spine/SkeletonBounds.cpp \
editor-support/spine/extension.cpp \
editor-support/spine/spine-cocos2dx.cpp
#local-storage
LOCAL_SRC_FILES += storage/local-storage/LocalStorage.cpp \
storage/local-storage/LocalStorageAndroid.cpp
#ui
LOCAL_SRC_FILES += ui/UIWidget.cpp \
ui/UILayout.cpp \
ui/UILayoutParameter.cpp \
ui/UILayoutManager.cpp \
ui/CocosGUI.cpp \
ui/UIHelper.cpp \
ui/UIListView.cpp \
ui/UIPageView.cpp \
ui/UIScrollView.cpp \
ui/UIButton.cpp \
ui/UICheckBox.cpp \
ui/UIImageView.cpp \
ui/UIText.cpp \
ui/UITextAtlas.cpp \
ui/UITextBMFont.cpp \
ui/UILoadingBar.cpp \
ui/UISlider.cpp \
ui/UITextField.cpp \
ui/UIRichText.cpp \
ui/UIHBox.cpp \
ui/UIVBox.cpp \
ui/UIRelativeBox.cpp \
ui/UIVideoPlayerAndroid.cpp \
ui/UIDeprecated.cpp \
ui/UIScale9Sprite.cpp
#extension
LOCAL_SRC_FILES += ../extensions/assets-manager/AssetsManager.cpp \
../extensions/GUI/CCControlExtension/CCControl.cpp \
../extensions/GUI/CCControlExtension/CCControlButton.cpp \
../extensions/GUI/CCControlExtension/CCControlColourPicker.cpp \
../extensions/GUI/CCControlExtension/CCControlHuePicker.cpp \
../extensions/GUI/CCControlExtension/CCControlPotentiometer.cpp \
../extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp \
../extensions/GUI/CCControlExtension/CCControlSlider.cpp \
../extensions/GUI/CCControlExtension/CCControlStepper.cpp \
../extensions/GUI/CCControlExtension/CCControlSwitch.cpp \
../extensions/GUI/CCControlExtension/CCControlUtils.cpp \
../extensions/GUI/CCControlExtension/CCInvocation.cpp \
../extensions/GUI/CCControlExtension/CCScale9Sprite.cpp \
../extensions/GUI/CCEditBox/CCEditBox.cpp \
../extensions/GUI/CCEditBox/CCEditBoxImplAndroid.cpp \
../extensions/GUI/CCEditBox/CCEditBoxImplNone.cpp \
../extensions/GUI/CCEditBox/CCEditBoxImplWin.cpp \
../extensions/GUI/CCScrollView/CCScrollView.cpp \
../extensions/GUI/CCScrollView/CCTableView.cpp \
../extensions/GUI/CCScrollView/CCTableViewCell.cpp \
../extensions/physics-nodes/CCPhysicsDebugNode.cpp \
../extensions/physics-nodes/CCPhysicsSprite.cpp
#box2d
LOCAL_SRC_FILES += ../external/Box2d/Collision/b2BroadPhase.cpp \
../external/Box2d/Collision/b2CollideCircle.cpp \
../external/Box2d/Collision/b2CollideEdge.cpp \
../external/Box2d/Collision/b2CollidePolygon.cpp \
../external/Box2d/Collision/b2Collision.cpp \
../external/Box2d/Collision/b2Distance.cpp \
../external/Box2d/Collision/b2DynamicTree.cpp \
../external/Box2d/Collision/b2TimeOfImpact.cpp \
../external/Box2d/Collision/Shapes/b2ChainShape.cpp \
../external/Box2d/Collision/Shapes/b2CircleShape.cpp \
../external/Box2d/Collision/Shapes/b2EdgeShape.cpp \
../external/Box2d/Collision/Shapes/b2PolygonShape.cpp \
../external/Box2d/Common/b2BlockAllocator.cpp \
../external/Box2d/Common/b2Draw.cpp \
../external/Box2d/Common/b2Math.cpp \
../external/Box2d/Common/b2Settings.cpp \
../external/Box2d/Common/b2StackAllocator.cpp \
../external/Box2d/Common/b2Timer.cpp \
../external/Box2d/Dynamics/b2Body.cpp \
../external/Box2d/Dynamics/b2ContactManager.cpp \
../external/Box2d/Dynamics/b2Fixture.cpp \
../external/Box2d/Dynamics/b2Island.cpp \
../external/Box2d/Dynamics/b2World.cpp \
../external/Box2d/Dynamics/b2WorldCallbacks.cpp \
../external/Box2d/Dynamics/Contacts/b2ChainAndCircleContact.cpp \
../external/Box2d/Dynamics/Contacts/b2ChainAndPolygonContact.cpp \
../external/Box2d/Dynamics/Contacts/b2CircleContact.cpp \
../external/Box2d/Dynamics/Contacts/b2Contact.cpp \
../external/Box2d/Dynamics/Contacts/b2ContactSolver.cpp \
../external/Box2d/Dynamics/Contacts/b2EdgeAndCircleContact.cpp \
../external/Box2d/Dynamics/Contacts/b2EdgeAndPolygonContact.cpp \
../external/Box2d/Dynamics/Contacts/b2PolygonAndCircleContact.cpp \
../external/Box2d/Dynamics/Contacts/b2PolygonContact.cpp \
../external/Box2d/Dynamics/Joints/b2DistanceJoint.cpp \
../external/Box2d/Dynamics/Joints/b2FrictionJoint.cpp \
../external/Box2d/Dynamics/Joints/b2GearJoint.cpp \
../external/Box2d/Dynamics/Joints/b2Joint.cpp \
../external/Box2d/Dynamics/Joints/b2MotorJoint.cpp \
../external/Box2d/Dynamics/Joints/b2MouseJoint.cpp \
../external/Box2d/Dynamics/Joints/b2PrismaticJoint.cpp \
../external/Box2d/Dynamics/Joints/b2PulleyJoint.cpp \
../external/Box2d/Dynamics/Joints/b2RevoluteJoint.cpp \
../external/Box2d/Dynamics/Joints/b2RopeJoint.cpp \
../external/Box2d/Dynamics/Joints/b2WeldJoint.cpp \
../external/Box2d/Dynamics/Joints/b2WheelJoint.cpp \
../external/Box2d/Rope/b2Rope.cpp
#chipmunk
LOCAL_SRC_FILES += ../external/chipmunk/src/chipmunk.c \
../external/chipmunk/src/cpArbiter.c \
../external/chipmunk/src/cpArray.c \
../external/chipmunk/src/cpBB.c \
../external/chipmunk/src/cpBBTree.c \
../external/chipmunk/src/cpBody.c \
../external/chipmunk/src/cpCollision.c \
../external/chipmunk/src/cpHashSet.c \
../external/chipmunk/src/cpPolyShape.c \
../external/chipmunk/src/cpShape.c \
../external/chipmunk/src/cpSpace.c \
../external/chipmunk/src/cpSpaceComponent.c \
../external/chipmunk/src/cpSpaceHash.c \
../external/chipmunk/src/cpSpaceQuery.c \
../external/chipmunk/src/cpSpaceStep.c \
../external/chipmunk/src/cpSpatialIndex.c \
../external/chipmunk/src/cpSweep1D.c \
../external/chipmunk/src/cpVect.c \
../external/chipmunk/src/constraints/cpConstraint.c \
../external/chipmunk/src/constraints/cpDampedRotarySpring.c \
../external/chipmunk/src/constraints/cpDampedSpring.c \
../external/chipmunk/src/constraints/cpGearJoint.c \
../external/chipmunk/src/constraints/cpGrooveJoint.c \
../external/chipmunk/src/constraints/cpPinJoint.c \
../external/chipmunk/src/constraints/cpPivotJoint.c \
../external/chipmunk/src/constraints/cpRatchetJoint.c \
../external/chipmunk/src/constraints/cpRotaryLimitJoint.c \
../external/chipmunk/src/constraints/cpSimpleMotor.c \
../external/chipmunk/src/constraints/cpSlideJoint.c
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/. \
$(LOCAL_PATH)/platform/android \
$(LOCAL_PATH)/base \
$(LOCAL_PATH)/../external \
$(LOCAL_PATH)/../external/tinyxml2 \
$(LOCAL_PATH)/../external/unzip \
$(LOCAL_PATH)/../external/chipmunk/include/chipmunk \
$(LOCAL_PATH)/../external/xxhash \
$(LOCAL_PATH)/../external/nslog
$(LOCAL_PATH)/../external/nslog \
$(LOCAL_PATH)/audio/include \
$(LOCAL_PATH)/editor-support \
$(LOCAL_PATH)/storage \
$(LOCAL_PATH)/../extensions/GUI/CCControlExtension \
$(LOCAL_PATH)/../extensions/GUI/CCScrollView \
$(LOCAL_PATH)/../external/chipmunk/include/chipmunk
LOCAL_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/. \
$(LOCAL_PATH)/.. \
$(LOCAL_PATH)/platform/android \
$(LOCAL_PATH)/../external \
$(LOCAL_PATH)/../external/tinyxml2 \
@ -205,7 +481,11 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/../external/edtaa3func \
$(LOCAL_PATH)/../external/xxhash \
$(LOCAL_PATH)/../external/ConvertUTF \
$(LOCAL_PATH)/../external/nslog
$(LOCAL_PATH)/../external/nslog \
$(LOCAL_PATH)/audio/include \
$(LOCAL_PATH)/audio/android \
$(LOCAL_PATH)/editor-support \
$(LOCAL_PATH)/editor-support/cocosbuilder
LOCAL_EXPORT_LDLIBS := -lGLESv2 \
-llog \
@ -213,15 +493,18 @@ LOCAL_EXPORT_LDLIBS := -lGLESv2 \
-landroid
LOCAL_STATIC_LIBRARIES := cocos_freetype2_static
LOCAL_STATIC_LIBRARIES += chipmunk_static
LOCAL_STATIC_LIBRARIES += cocos_curl_static
LOCAL_STATIC_LIBRARIES += libwebsockets_static
LOCAL_STATIC_LIBRARIES += cocos_png_static
LOCAL_STATIC_LIBRARIES += cocos_jpeg_static
LOCAL_STATIC_LIBRARIES += cocos_tiff_static
LOCAL_STATIC_LIBRARIES += cocos_webp_static
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dxandroid_static
# define the macro to compile through support/zip_support/ioapi.c
LOCAL_CFLAGS := -DUSE_FILE32API
LOCAL_CFLAGS += -std=c99
LOCAL_CPPFLAGS := -Wno-deprecated-declarations -Wno-extern-c-compat
LOCAL_EXPORT_CFLAGS := -DUSE_FILE32API
LOCAL_EXPORT_CPPFLAGS := -Wno-deprecated-declarations -Wno-extern-c-compat
@ -229,9 +512,10 @@ LOCAL_EXPORT_CPPFLAGS := -Wno-deprecated-declarations -Wno-extern-c-compat
include $(BUILD_STATIC_LIBRARY)
$(call import-module,freetype2/prebuilt/android)
$(call import-module,chipmunk)
$(call import-module,platform/android)
$(call import-module,png/prebuilt/android)
$(call import-module,jpeg/prebuilt/android)
$(call import-module,tiff/prebuilt/android)
$(call import-module,webp/prebuilt/android)
$(call import-module,curl/prebuilt/android)
$(call import-module,websockets/prebuilt/android)

View File

@ -1,46 +1,111 @@
if(WINDOWS)
ADD_DEFINITIONS(-DUNICODE -D_UNICODE)
endif()
#/****************************************************************************
# Copyright (c) 2013 cocos2d-x.org
# Copyright (c) 2014 martell malone
#
# http://www.cocos2d-x.org
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
set(COCOS_SRC cocos2d.cpp)
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
include(2d/CMakeLists.txt)
include(platform/CMakeLists.txt)
include(physics/CMakeLists.txt)
include(math/CMakeLists.txt)
include(renderer/CMakeLists.txt)
include(base/CMakeLists.txt)
include(deprecated/CMakeLists.txt)
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# 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
# THE SOFTWARE.
# ****************************************************************************/
add_library(cocos2d STATIC
${COCOS_SRC}
${COCOS_2D_SRC}
${COCOS_PLATFORM_SRC}
${COCOS_BASE_SRC}
${COCOS_RENDERER_SRC}
${COCOS_MATH_SRC}
${COCOS_PHYSICS_SRC}
${COCOS_DEPRECATED_SRC}
# this CMakeLists is to generate libcocos2d.a
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/platform/desktop
${CMAKE_CURRENT_SOURCE_DIR}/audio/include
${CMAKE_CURRENT_SOURCE_DIR}/editor-support
${CMAKE_CURRENT_SOURCE_DIR}/../external/tinyxml2
${CMAKE_CURRENT_SOURCE_DIR}/../external/unzip
${CMAKE_CURRENT_SOURCE_DIR}/../external/edtaa3func
${CMAKE_CURRENT_SOURCE_DIR}/../external/chipmunk/include/chipmunk
${CMAKE_CURRENT_SOURCE_DIR}/../external/jpeg/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/webp/include/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/../external/glfw3/include/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/../external/freetype2/include/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/../external/websockets/include/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/../external/xxhash
${CMAKE_CURRENT_SOURCE_DIR}/../external/ConvertUTF
${CMAKE_CURRENT_SOURCE_DIR}/../external/linux-specific/fmod/include/${ARCH_DIR}
)
if(MINGW)
set(COCOS_LINK z jpeg png webp tiff glfw3 glew32 opengl32 iconv freetype bz2)
elseif(WINDOWS)
set(COCOS_LINK libjpeg libpng libwebp libtiff freetype250 glfw3 glew32 opengl32 libiconv libzlib)
elseif(LINUX)
set(COCOS_LINK jpeg webp tiff freetype fontconfig png pthread glfw GLEW GL X11 rt z)
endif()
target_link_libraries(cocos2d
chipmunk_static
tinyxml2
unzip
xxhash
${COCOS_LINK}
)
# cocos2d source files and header files
file(GLOB core_source_files
"${CMAKE_CURRENT_SOURCE_DIR}/cocos2d.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/base/ccFPSImages.c"
"${CMAKE_CURRENT_SOURCE_DIR}/2d/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/3d/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/audio/linux/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/base/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/deprecated/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/editor-support/cocosbuilder/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/editor-support/spine/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/math/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/network/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/physics/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/physics/chipmunk/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/platform/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/platform/linux/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/platform/desktop/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/renderer/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/storage/local-storage/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/ui/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../external/tinyxml2/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../external/xxhash/*.c"
"${CMAKE_CURRENT_SOURCE_DIR}/../external/unzip/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../external/chipmunk/src/*.c"
"${CMAKE_CURRENT_SOURCE_DIR}/../external/chipmunk/src/constraints/*.c"
"${CMAKE_CURRENT_SOURCE_DIR}/../external/edtaa3func/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../external/ConvertUTF/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../external/ConvertUTF/*.c"
)
file(GLOB_RECURSE cocostudio_source_files "${CMAKE_CURRENT_SOURCE_DIR}/editor-support/cocostudio/*.cpp")
file(GLOB_RECURSE extensions_source_files "${CMAKE_CURRENT_SOURCE_DIR}/../extensions/*.cpp")
file(GLOB_RECURSE box2d_source_files "${CMAKE_CURRENT_SOURCE_DIR}/../external/Box2D/*.cpp")
set(cocos2d_source_files ${chipmunk_source_files} ${box2d_source_files} ${core_source_files} ${cocostudio_source_files} ${extensions_source_files})
# exclude files specific for other platforms
list(REMOVE_ITEM cocos2d_source_files
"${CMAKE_CURRENT_SOURCE_DIR}/base/CCController-android.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/base/CCUserDefaultAndroid.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/ui/UIVideoPlayerAndroid.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/storage/local-storage/LocalStorageAndroid.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/base/CCEventController.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/base/CCEventListenerController.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../extensions/GUI/CCEditBox/CCEditBoxImplAndroid.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../extensions/GUI/CCEditBox/CCEditBoxImplWin.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/editor-support/cocostudio/proj.wp8/pch.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../extensions/proj.wp8/pch.cpp")
add_library(cocos2d STATIC ${cocos2d_source_files})
if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
set(FMOD_LIB "fmodex64")
else()
set(FMOD_LIB "fmodex")
endif()
target_link_libraries(cocos2d jpeg webp tiff freetype fontconfig png pthread glfw GLEW GL X11 rt z ${FMOD_LIB} curl)
set_target_properties(cocos2d
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)

View File

@ -1,52 +0,0 @@
# architecture
#if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
#set(ARCH_DIR "64-bit")
#else()
#set(ARCH_DIR "32-bit")
#endif()
if(WINDOWS)
set(AUDIO_SRC
win32/SimpleAudioEngine.cpp
win32/MciPlayer.cpp
win32/MciPlayer.h
)
elseif(LINUX)
set(AUDIO_SRC
linux/SimpleAudioEngineFMOD.cpp
linux/FmodAudioPlayer.cpp
linux/FmodAudioPlayer.h
linux/AudioPlayer.h
)
include_directories( ../../external/linux-specific/fmod/include/${ARCH_DIR} )
endif()
add_library(audio STATIC
${AUDIO_SRC}
include/Export.h
include/SimpleAudioEngine.h
)
if(LINUX)
if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
set(FMOD_LIB "fmodex64")
else()
set(FMOD_LIB "fmodex")
endif()
target_link_libraries(audio ${FMOD_LIB})
elseif(WINDOWS)
target_link_libraries(audio Winmm)
endif()
set_target_properties(audio
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)

View File

@ -121,15 +121,6 @@
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\include\Export.h" />
<ClInclude Include="..\win32\MciPlayer.h" />
<ClInclude Include="..\include\SimpleAudioEngine.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\win32\MciPlayer.cpp" />
<ClCompile Include="..\win32\SimpleAudioEngine.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>

View File

@ -1,36 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
</Filter>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\include\Export.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\win32\MciPlayer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\SimpleAudioEngine.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\win32\MciPlayer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\win32\SimpleAudioEngine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>

View File

@ -1,4 +1,5 @@
#include "MciPlayer.h"
#include <tchar.h>
#define WIN_CLASS_NAME "CocosDenshionCallbackWnd"
#define BREAK_IF(cond) if (cond) break;
@ -34,7 +35,7 @@ MciPlayer::MciPlayer()
wc.hCursor = LoadCursor( NULL, IDC_ARROW ); // Load The Arrow Pointer
wc.hbrBackground = NULL; // No Background Required For GL
wc.lpszMenuName = NULL; // We Don't Want A Menu
wc.lpszClassName = WIN_CLASS_NAME; // Set The Class Name
wc.lpszClassName = _T(WIN_CLASS_NAME); // Set The Class Name
if (! RegisterClass(&wc)
&& 1410 != GetLastError())
@ -45,7 +46,7 @@ MciPlayer::MciPlayer()
_wnd = CreateWindowEx(
WS_EX_APPWINDOW, // Extended Style For The Window
WIN_CLASS_NAME, // Class Name
_T(WIN_CLASS_NAME), // Class Name
NULL, // Window Title
WS_POPUPWINDOW,/*WS_OVERLAPPEDWINDOW*/ // Defined Window Style
0, 0, // Window Position
@ -88,9 +89,13 @@ void MciPlayer::Open(const char* pFileName, UINT uId)
MCI_OPEN_PARMS mciOpen = {0};
MCIERROR mciError;
mciOpen.lpstrDeviceType = (LPCTSTR)MCI_ALL_DEVICE_ID;
mciOpen.lpstrElementName = pFileName;
WCHAR* fileNameWideChar = new WCHAR[nLen + 1];
BREAK_IF(! fileNameWideChar);
MultiByteToWideChar(CP_ACP, 0, pFileName, nLen + 1, fileNameWideChar, nLen + 1);
mciOpen.lpstrElementName = fileNameWideChar;
mciError = mciSendCommand(0,MCI_OPEN, MCI_OPEN_ELEMENT, reinterpret_cast<DWORD_PTR>(&mciOpen));
CC_SAFE_DELETE_ARRAY(mciOpen.lpstrElementName);
BREAK_IF(mciError);
_dev = mciOpen.wDeviceID;

View File

@ -1,71 +0,0 @@
/****************************************************************************
Copyright (c) 2014 cocos2d-x.org
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
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
THE SOFTWARE.
****************************************************************************/
#include "base/CCModuleManager.h"
#include <unordered_map>
#include "base/CCConsole.h"
using namespace std;
//RegisterJPEG *temp = new RegisterJPEG();
NS_CC_BEGIN
void ModuleManager::registerModule(const string &moduleName, void* module)
{
auto &moduleMap = createMap();
if (moduleMap.find(moduleName) != moduleMap.end())
{
CCLOG("module: %s exists", moduleName.c_str());
return;
}
moduleMap[moduleName] = module;
}
void ModuleManager::unRegisterModule(const string &moduleName)
{
auto &moduleMap = createMap();
moduleMap.erase(moduleName);
}
void* ModuleManager::getModule(const string &moduleName)
{
auto &moduleMap = createMap();
auto result = moduleMap.find(moduleName);
if (result != moduleMap.end())
{
return result->second;
}
else
return nullptr;
}
unordered_map<std::string, void*>& ModuleManager::createMap()
{
static unordered_map<string, void*> map;
return map;
}
NS_CC_END

View File

@ -1,50 +0,0 @@
/****************************************************************************
Copyright (c) 2014 cocos2d-x.org
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
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
THE SOFTWARE.
****************************************************************************/
#ifndef __BASE_CC_MODULE_MANAGER__
#define __BASE_CC_MODULE_MANAGER__
#include <string>
#include <unordered_map>
#include "base/CCPlatformMacros.h"
NS_CC_BEGIN
class CC_DLL ModuleManager
{
public:
static void registerModule(const std::string &moduleName, void* module);
static void unRegisterModule(const std::string &moduleName);
static void* getModule(const std::string &moduleName);
private:
static std::unordered_map<std::string, void*>& createMap();
};
NS_CC_END
#endif

View File

@ -1,49 +0,0 @@
set(COCOS_BASE_SRC
base/CCAutoreleasePool.cpp
base/CCCamera.cpp
base/CCConfiguration.cpp
base/CCConsole.cpp
base/CCData.cpp
base/CCDataVisitor.cpp
base/CCDirector.cpp
base/CCEvent.cpp
base/CCEventAcceleration.cpp
base/CCEventCustom.cpp
base/CCEventDispatcher.cpp
base/CCEventFocus.cpp
base/CCEventKeyboard.cpp
base/CCEventListener.cpp
base/CCEventListenerAcceleration.cpp
base/CCEventListenerCustom.cpp
base/CCEventListenerFocus.cpp
base/CCEventListenerKeyboard.cpp
base/CCEventListenerMouse.cpp
base/CCEventListenerTouch.cpp
base/CCEventMouse.cpp
base/CCEventTouch.cpp
base/CCIMEDispatcher.cpp
base/CCModuleManager.cpp
base/CCNS.cpp
base/CCProfiling.cpp
base/ccRandom.cpp
base/CCRef.cpp
base/CCScheduler.cpp
base/CCScriptSupport.cpp
base/CCTouch.cpp
base/CCUserDefault.cpp
base/CCUserDefaultAndroid.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/pvr.cpp
base/s3tc.cpp
base/ObjectFactory.cpp
)

View File

@ -1,9 +0,0 @@
set(COCOS_DEPRECATED_SRC
deprecated/CCArray.cpp
deprecated/CCDeprecated.cpp
deprecated/CCDictionary.cpp
deprecated/CCNotificationCenter.cpp
deprecated/CCSet.cpp
deprecated/CCString.cpp
)

View File

@ -1,34 +0,0 @@
set(CCB_SRC
CCBFileLoader.cpp
CCMenuItemImageLoader.cpp
CCBReader.cpp
CCMenuItemLoader.cpp
CCControlButtonLoader.cpp
CCNodeLoader.cpp
CCControlLoader.cpp
CCNodeLoaderLibrary.cpp
CCLabelBMFontLoader.cpp
CCParticleSystemQuadLoader.cpp
CCLabelTTFLoader.cpp
CCScale9SpriteLoader.cpp
CCLayerColorLoader.cpp
CCScrollViewLoader.cpp
CCLayerGradientLoader.cpp
CCSpriteLoader.cpp
CCLayerLoader.cpp
CCBAnimationManager.cpp
CCBKeyframe.cpp
CCBSequence.cpp
CCBSequenceProperty.cpp
CCNode+CCBRelativePositioning.cpp
)
include_directories( .. )
add_library(cocosbuilder STATIC ${CCB_SRC})
set_target_properties(cocosbuilder
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)

View File

@ -2,98 +2,13 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Header Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
<UniqueIdentifier>{e4e3b3ff-6d85-4408-bbdf-38f296363698}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
<UniqueIdentifier>{e79db1b4-c859-48c0-ab1e-a31200c09923}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\CCBSequenceProperty.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCControlButtonLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCControlLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCLabelBMFontLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCLabelTTFLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCLayerColorLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCLayerGradientLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCLayerLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCMenuItemImageLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCMenuItemLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCNode+CCBRelativePositioning.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCNodeLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCNodeLoaderLibrary.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCParticleSystemQuadLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCScale9SpriteLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCScrollViewLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCSpriteLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCBAnimationManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCBFileLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCBKeyframe.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCBReader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCBSequence.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\CCParticleSystemQuadLoader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\CCScale9SpriteLoader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\CCScrollViewLoader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\CCSpriteLoader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\CocosBuilder.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\CCBAnimationManager.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -160,5 +75,88 @@
<ClInclude Include="..\CCNodeLoaderListener.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\CCParticleSystemQuadLoader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\CCScale9SpriteLoader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\CCScrollViewLoader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\CCSpriteLoader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\CocosBuilder.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\CCBAnimationManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCBFileLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCBKeyframe.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCBReader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCBSequence.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCBSequenceProperty.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCControlButtonLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCControlLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCLabelBMFontLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCLabelTTFLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCLayerColorLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCLayerGradientLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCLayerLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCMenuItemImageLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCMenuItemLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCNode+CCBRelativePositioning.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCNodeLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCNodeLoaderLibrary.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCParticleSystemQuadLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCScale9SpriteLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCScrollViewLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCSpriteLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>

View File

@ -93,28 +93,9 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\CCBAnimationManager.cpp" />
<ClCompile Include="..\CCBFileLoader.cpp" />
<ClCompile Include="..\CCBKeyframe.cpp" />
<ClCompile Include="..\CCBReader.cpp" />
<ClCompile Include="..\CCBSequence.cpp" />
<ClCompile Include="..\CCBSequenceProperty.cpp" />
<ClCompile Include="..\CCControlButtonLoader.cpp" />
<ClCompile Include="..\CCControlLoader.cpp" />
<ClCompile Include="..\CCLabelBMFontLoader.cpp" />
<ClCompile Include="..\CCLabelTTFLoader.cpp" />
<ClCompile Include="..\CCLayerColorLoader.cpp" />
<ClCompile Include="..\CCLayerGradientLoader.cpp" />
<ClCompile Include="..\CCLayerLoader.cpp" />
<ClCompile Include="..\CCMenuItemImageLoader.cpp" />
<ClCompile Include="..\CCMenuItemLoader.cpp" />
<ClCompile Include="..\CCNode+CCBRelativePositioning.cpp" />
<ClCompile Include="..\CCNodeLoader.cpp" />
<ClCompile Include="..\CCNodeLoaderLibrary.cpp" />
<ClCompile Include="..\CCParticleSystemQuadLoader.cpp" />
<ClCompile Include="..\CCScale9SpriteLoader.cpp" />
<ClCompile Include="..\CCScrollViewLoader.cpp" />
<ClCompile Include="..\CCSpriteLoader.cpp" />
<ProjectReference Include="..\..\..\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\CCBAnimationManager.h" />
@ -146,12 +127,28 @@
<ClInclude Include="..\CocosBuilder.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\extensions\proj.win32\libextension.vcxproj">
<Project>{21b2c324-891f-48ea-ad1a-5ae13de12e28}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
</ProjectReference>
<ClCompile Include="..\CCBAnimationManager.cpp" />
<ClCompile Include="..\CCBFileLoader.cpp" />
<ClCompile Include="..\CCBKeyframe.cpp" />
<ClCompile Include="..\CCBReader.cpp" />
<ClCompile Include="..\CCBSequence.cpp" />
<ClCompile Include="..\CCBSequenceProperty.cpp" />
<ClCompile Include="..\CCControlButtonLoader.cpp" />
<ClCompile Include="..\CCControlLoader.cpp" />
<ClCompile Include="..\CCLabelBMFontLoader.cpp" />
<ClCompile Include="..\CCLabelTTFLoader.cpp" />
<ClCompile Include="..\CCLayerColorLoader.cpp" />
<ClCompile Include="..\CCLayerGradientLoader.cpp" />
<ClCompile Include="..\CCLayerLoader.cpp" />
<ClCompile Include="..\CCMenuItemImageLoader.cpp" />
<ClCompile Include="..\CCMenuItemLoader.cpp" />
<ClCompile Include="..\CCNode+CCBRelativePositioning.cpp" />
<ClCompile Include="..\CCNodeLoader.cpp" />
<ClCompile Include="..\CCNodeLoaderLibrary.cpp" />
<ClCompile Include="..\CCParticleSystemQuadLoader.cpp" />
<ClCompile Include="..\CCScale9SpriteLoader.cpp" />
<ClCompile Include="..\CCScrollViewLoader.cpp" />
<ClCompile Include="..\CCSpriteLoader.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

View File

@ -1,69 +0,0 @@
set(CS_SRC
CCActionFrame.cpp
CCActionFrameEasing.cpp
CCActionManagerEx.cpp
CCActionNode.cpp
CCActionObject.cpp
CCArmature.cpp
CCBone.cpp
CCArmatureAnimation.cpp
CCProcessBase.cpp
CCTween.cpp
CCDatas.cpp
CCBatchNode.cpp
CCDecorativeDisplay.cpp
CCDisplayFactory.cpp
CCDisplayManager.cpp
CCSkin.cpp
CCColliderDetector.cpp
CCArmatureDataManager.cpp
CCArmatureDefine.cpp
CCDataReaderHelper.cpp
CCSpriteFrameCacheHelper.cpp
CCTransformHelp.cpp
CCUtilMath.cpp
CCComAttribute.cpp
CCComAudio.cpp
CCComController.cpp
CCComRender.cpp
CCInputDelegate.cpp
DictionaryHelper.cpp
CCSGUIReader.cpp
CCSSceneReader.cpp
TriggerBase.cpp
TriggerMng.cpp
TriggerObj.cpp
CocoLoader.cpp
WidgetReader/WidgetReader.cpp
WidgetReader/ButtonReader/ButtonReader.cpp
WidgetReader/CheckBoxReader/CheckBoxReader.cpp
WidgetReader/ImageViewReader/ImageViewReader.cpp
WidgetReader/LayoutReader/LayoutReader.cpp
WidgetReader/ListViewReader/ListViewReader.cpp
WidgetReader/LoadingBarReader/LoadingBarReader.cpp
WidgetReader/PageViewReader/PageViewReader.cpp
WidgetReader/ScrollViewReader/ScrollViewReader.cpp
WidgetReader/SliderReader/SliderReader.cpp
WidgetReader/TextAtlasReader/TextAtlasReader.cpp
WidgetReader/TextBMFontReader/TextBMFontReader.cpp
WidgetReader/TextFieldReader/TextFieldReader.cpp
WidgetReader/TextReader/TextReader.cpp
ActionTimeline/CCActionTimeline.cpp
ActionTimeline/CCActionTimelineCache.cpp
ActionTimeline/CCFrame.cpp
ActionTimeline/CCNodeReader.cpp
ActionTimeline/CCTimeLine.cpp
)
include_directories( .. )
add_library(cocostudio STATIC ${CS_SRC} )
target_link_libraries(cocostudio)
set_target_properties(cocostudio
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)

View File

@ -10,140 +10,10 @@
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\ActionTimeline\CCActionTimeline.cpp" />
<ClCompile Include="..\ActionTimeline\CCFrame.cpp" />
<ClCompile Include="..\ActionTimeline\CCNodeReader.cpp" />
<ClCompile Include="..\ActionTimeline\CCActionTimelineCache.cpp" />
<ClCompile Include="..\ActionTimeline\CCTimeLine.cpp" />
<ClCompile Include="..\CCActionFrame.cpp" />
<ClCompile Include="..\CCActionFrameEasing.cpp" />
<ClCompile Include="..\CCActionManagerEx.cpp" />
<ClCompile Include="..\CCActionNode.cpp" />
<ClCompile Include="..\CCActionObject.cpp" />
<ClCompile Include="..\CCArmature.cpp" />
<ClCompile Include="..\CCArmatureAnimation.cpp" />
<ClCompile Include="..\CCArmatureDataManager.cpp" />
<ClCompile Include="..\CCArmatureDefine.cpp" />
<ClCompile Include="..\CCBatchNode.cpp" />
<ClCompile Include="..\CCBone.cpp" />
<ClCompile Include="..\CCColliderDetector.cpp" />
<ClCompile Include="..\CCComAttribute.cpp" />
<ClCompile Include="..\CCComAudio.cpp" />
<ClCompile Include="..\CCComController.cpp" />
<ClCompile Include="..\CCComRender.cpp" />
<ClCompile Include="..\CCDataReaderHelper.cpp" />
<ClCompile Include="..\CCDatas.cpp" />
<ClCompile Include="..\CCDecorativeDisplay.cpp" />
<ClCompile Include="..\CCDisplayFactory.cpp" />
<ClCompile Include="..\CCDisplayManager.cpp" />
<ClCompile Include="..\CCInputDelegate.cpp" />
<ClCompile Include="..\CCProcessBase.cpp" />
<ClCompile Include="..\CCSGUIReader.cpp" />
<ClCompile Include="..\CCSkin.cpp" />
<ClCompile Include="..\CCSpriteFrameCacheHelper.cpp" />
<ClCompile Include="..\CCSSceneReader.cpp" />
<ClCompile Include="..\CCTransformHelp.cpp" />
<ClCompile Include="..\CCTween.cpp" />
<ClCompile Include="..\CCUtilMath.cpp" />
<ClCompile Include="..\CocoLoader.cpp" />
<ClCompile Include="..\DictionaryHelper.cpp" />
<ClCompile Include="..\TriggerBase.cpp" />
<ClCompile Include="..\TriggerMng.cpp" />
<ClCompile Include="..\TriggerObj.cpp" />
<ClCompile Include="..\WidgetReader\ButtonReader\ButtonReader.cpp" />
<ClCompile Include="..\WidgetReader\CheckBoxReader\CheckBoxReader.cpp" />
<ClCompile Include="..\WidgetReader\ImageViewReader\ImageViewReader.cpp" />
<ClCompile Include="..\WidgetReader\LayoutReader\LayoutReader.cpp" />
<ClCompile Include="..\WidgetReader\ListViewReader\ListViewReader.cpp" />
<ClCompile Include="..\WidgetReader\LoadingBarReader\LoadingBarReader.cpp" />
<ClCompile Include="..\WidgetReader\PageViewReader\PageViewReader.cpp" />
<ClCompile Include="..\WidgetReader\ScrollViewReader\ScrollViewReader.cpp" />
<ClCompile Include="..\WidgetReader\SliderReader\SliderReader.cpp" />
<ClCompile Include="..\WidgetReader\TextAtlasReader\TextAtlasReader.cpp" />
<ClCompile Include="..\WidgetReader\TextBMFontReader\TextBMFontReader.cpp" />
<ClCompile Include="..\WidgetReader\TextFieldReader\TextFieldReader.cpp" />
<ClCompile Include="..\WidgetReader\TextReader\TextReader.cpp" />
<ClCompile Include="..\WidgetReader\WidgetReader.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\external\json\document.h" />
<ClInclude Include="..\..\..\..\external\json\filestream.h" />
<ClInclude Include="..\..\..\..\external\json\internal\pow10.h" />
<ClInclude Include="..\..\..\..\external\json\internal\stack.h" />
<ClInclude Include="..\..\..\..\external\json\internal\strfunc.h" />
<ClInclude Include="..\..\..\..\external\json\prettywriter.h" />
<ClInclude Include="..\..\..\..\external\json\rapidjson.h" />
<ClInclude Include="..\..\..\..\external\json\reader.h" />
<ClInclude Include="..\..\..\..\external\json\stringbuffer.h" />
<ClInclude Include="..\..\..\..\external\json\writer.h" />
<ClInclude Include="..\ActionTimeline\CCActionTimeline.h" />
<ClInclude Include="..\ActionTimeline\CCFrame.h" />
<ClInclude Include="..\ActionTimeline\CCNodeReader.h" />
<ClInclude Include="..\ActionTimeline\CCActionTimelineCache.h" />
<ClInclude Include="..\ActionTimeline\CCTimeLine.h" />
<ClInclude Include="..\ActionTimeline\CCTimelineMacro.h" />
<ClInclude Include="..\CCActionFrame.h" />
<ClInclude Include="..\CCActionFrameEasing.h" />
<ClInclude Include="..\CCActionManagerEx.h" />
<ClInclude Include="..\CCActionNode.h" />
<ClInclude Include="..\CCActionObject.h" />
<ClInclude Include="..\CCArmature.h" />
<ClInclude Include="..\CCArmatureAnimation.h" />
<ClInclude Include="..\CCArmatureDataManager.h" />
<ClInclude Include="..\CCArmatureDefine.h" />
<ClInclude Include="..\CCBatchNode.h" />
<ClInclude Include="..\CCBone.h" />
<ClInclude Include="..\CCColliderDetector.h" />
<ClInclude Include="..\CCComAttribute.h" />
<ClInclude Include="..\CCComAudio.h" />
<ClInclude Include="..\CCComBase.h" />
<ClInclude Include="..\CCComController.h" />
<ClInclude Include="..\CCComRender.h" />
<ClInclude Include="..\CCDataReaderHelper.h" />
<ClInclude Include="..\CCDatas.h" />
<ClInclude Include="..\CCDecorativeDisplay.h" />
<ClInclude Include="..\CCDisplayFactory.h" />
<ClInclude Include="..\CCDisplayManager.h" />
<ClInclude Include="..\CCInputDelegate.h" />
<ClInclude Include="..\CCProcessBase.h" />
<ClInclude Include="..\CCSGUIReader.h" />
<ClInclude Include="..\CCSkin.h" />
<ClInclude Include="..\CCSpriteFrameCacheHelper.h" />
<ClInclude Include="..\CCSSceneReader.h" />
<ClInclude Include="..\CCTransformHelp.h" />
<ClInclude Include="..\CCTween.h" />
<ClInclude Include="..\CCUtilMath.h" />
<ClInclude Include="..\CocoLoader.h" />
<ClInclude Include="..\CocoStudio.h" />
<ClInclude Include="..\DictionaryHelper.h" />
<ClInclude Include="..\CocosStudioExport.h" />
<ClInclude Include="..\TriggerBase.h" />
<ClInclude Include="..\TriggerMng.h" />
<ClInclude Include="..\TriggerObj.h" />
<ClInclude Include="..\WidgetReader\ButtonReader\ButtonReader.h" />
<ClInclude Include="..\WidgetReader\CheckBoxReader\CheckBoxReader.h" />
<ClInclude Include="..\WidgetReader\ImageViewReader\ImageViewReader.h" />
<ClInclude Include="..\WidgetReader\LayoutReader\LayoutReader.h" />
<ClInclude Include="..\WidgetReader\ListViewReader\ListViewReader.h" />
<ClInclude Include="..\WidgetReader\LoadingBarReader\LoadingBarReader.h" />
<ClInclude Include="..\WidgetReader\PageViewReader\PageViewReader.h" />
<ClInclude Include="..\WidgetReader\ScrollViewReader\ScrollViewReader.h" />
<ClInclude Include="..\WidgetReader\SliderReader\SliderReader.h" />
<ClInclude Include="..\WidgetReader\TextAtlasReader\TextAtlasReader.h" />
<ClInclude Include="..\WidgetReader\TextBMFontReader\TextBMFontReader.h" />
<ClInclude Include="..\WidgetReader\TextFieldReader\TextFieldReader.h" />
<ClInclude Include="..\WidgetReader\TextReader\TextReader.h" />
<ClInclude Include="..\WidgetReader\WidgetReader.h" />
<ClInclude Include="..\WidgetReader\WidgetReaderProtocol.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\audio\proj.win32\libcocosdenshion.vcxproj">
<Project>{f8edd7fa-9a51-4e80-baeb-860825d2eac6}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\ui\proj.win32\libui.vcxproj">
<Project>{7e06e92c-537a-442b-9e4a-4761c84f8a1a}</Project>
</ProjectReference>

View File

@ -1,460 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="action">
<UniqueIdentifier>{d793b86c-0905-4c9b-b6bc-161e351c9eb2}</UniqueIdentifier>
</Filter>
<Filter Include="armature">
<UniqueIdentifier>{855f2366-3429-4f77-a080-a41a39c99270}</UniqueIdentifier>
</Filter>
<Filter Include="components">
<UniqueIdentifier>{1a8c6b14-fb28-4485-8417-9b6838fbc4ef}</UniqueIdentifier>
</Filter>
<Filter Include="json">
<UniqueIdentifier>{42f1ce3f-46ab-4a16-a96e-9eb076c873f7}</UniqueIdentifier>
</Filter>
<Filter Include="reader">
<UniqueIdentifier>{f8271f80-1663-4425-91c8-7365ec3af017}</UniqueIdentifier>
</Filter>
<Filter Include="armature\animation">
<UniqueIdentifier>{48f28446-ffe4-4aa1-a34c-8968c3367ae6}</UniqueIdentifier>
</Filter>
<Filter Include="armature\datas">
<UniqueIdentifier>{ad9b4fd1-dc17-4704-9c60-7709eb916f13}</UniqueIdentifier>
</Filter>
<Filter Include="armature\display">
<UniqueIdentifier>{55c682b3-7a48-4fab-ad5a-eb979f3c305e}</UniqueIdentifier>
</Filter>
<Filter Include="armature\physics">
<UniqueIdentifier>{c6464479-e0ab-4afc-96fc-1ffc73e40232}</UniqueIdentifier>
</Filter>
<Filter Include="armature\utils">
<UniqueIdentifier>{023e3440-1259-4981-ba54-24390d1df447}</UniqueIdentifier>
</Filter>
<Filter Include="json\rapidjson">
<UniqueIdentifier>{f1f20817-9232-4967-a4dd-77550e84e39b}</UniqueIdentifier>
</Filter>
<Filter Include="json\rapidjson\internal">
<UniqueIdentifier>{5149f922-cf29-4a4b-b604-f15c6e8856b0}</UniqueIdentifier>
</Filter>
<Filter Include="trigger">
<UniqueIdentifier>{59eee6d9-bbfd-4193-be1d-6c18fc38f896}</UniqueIdentifier>
</Filter>
<Filter Include="reader\WidgetReader">
<UniqueIdentifier>{d4e605dc-d49d-44ea-a020-fc06445e7997}</UniqueIdentifier>
</Filter>
<Filter Include="reader\WidgetReader\ButtonReader">
<UniqueIdentifier>{3a4d7a49-fb6f-4873-b474-5a8e90b7fc4b}</UniqueIdentifier>
</Filter>
<Filter Include="reader\WidgetReader\CheckBoxReader">
<UniqueIdentifier>{e8fc7f81-1ca7-4501-ba4d-23b7b07d68d4}</UniqueIdentifier>
</Filter>
<Filter Include="reader\WidgetReader\ImageViewReader">
<UniqueIdentifier>{ab407657-d557-4f8f-a983-770b55874863}</UniqueIdentifier>
</Filter>
<Filter Include="reader\WidgetReader\LayoutReader">
<UniqueIdentifier>{ad6968ff-3327-4c34-b277-675bb417dcb5}</UniqueIdentifier>
</Filter>
<Filter Include="reader\WidgetReader\ListViewReader">
<UniqueIdentifier>{26cc66bd-6939-4983-851d-e75003f6d1cc}</UniqueIdentifier>
</Filter>
<Filter Include="reader\WidgetReader\LoadingBarReader">
<UniqueIdentifier>{017a43a1-3837-4bc9-99f8-67711721e733}</UniqueIdentifier>
</Filter>
<Filter Include="reader\WidgetReader\PageViewReader">
<UniqueIdentifier>{77596e85-4621-4601-89c2-91237f7acaff}</UniqueIdentifier>
</Filter>
<Filter Include="reader\WidgetReader\ScrollViewReader">
<UniqueIdentifier>{d5050413-04d0-492f-9f86-a5ef66e8b98e}</UniqueIdentifier>
</Filter>
<Filter Include="reader\WidgetReader\SliderReader">
<UniqueIdentifier>{f172d385-3589-4e88-b4bc-7b8dbc5829cb}</UniqueIdentifier>
</Filter>
<Filter Include="reader\WidgetReader\TextAtlasReader">
<UniqueIdentifier>{4e608ffb-0b02-44be-a032-aac71fb3d82e}</UniqueIdentifier>
</Filter>
<Filter Include="reader\WidgetReader\TextBMFontReader">
<UniqueIdentifier>{71a233f2-c8a6-4b79-b103-e9b5ff2bfa09}</UniqueIdentifier>
</Filter>
<Filter Include="reader\WidgetReader\TextFieldReader">
<UniqueIdentifier>{33f9d319-f921-48f4-9c09-0a765ec782ca}</UniqueIdentifier>
</Filter>
<Filter Include="reader\WidgetReader\TextReader">
<UniqueIdentifier>{bc251d28-036e-4272-852b-bd25fd110b33}</UniqueIdentifier>
</Filter>
<Filter Include="TimelineAction">
<UniqueIdentifier>{2d371825-3c46-4901-850c-3bccf6b49efc}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\CCComAttribute.cpp">
<Filter>components</Filter>
</ClCompile>
<ClCompile Include="..\CCComAudio.cpp">
<Filter>components</Filter>
</ClCompile>
<ClCompile Include="..\CCComController.cpp">
<Filter>components</Filter>
</ClCompile>
<ClCompile Include="..\CCComRender.cpp">
<Filter>components</Filter>
</ClCompile>
<ClCompile Include="..\CCInputDelegate.cpp">
<Filter>components</Filter>
</ClCompile>
<ClCompile Include="..\DictionaryHelper.cpp">
<Filter>json</Filter>
</ClCompile>
<ClCompile Include="..\CCSSceneReader.cpp">
<Filter>reader</Filter>
</ClCompile>
<ClCompile Include="..\CCSGUIReader.cpp">
<Filter>reader</Filter>
</ClCompile>
<ClCompile Include="..\CCTween.cpp">
<Filter>armature\animation</Filter>
</ClCompile>
<ClCompile Include="..\CCProcessBase.cpp">
<Filter>armature\animation</Filter>
</ClCompile>
<ClCompile Include="..\CCArmatureAnimation.cpp">
<Filter>armature\animation</Filter>
</ClCompile>
<ClCompile Include="..\CCDatas.cpp">
<Filter>armature\datas</Filter>
</ClCompile>
<ClCompile Include="..\CCBatchNode.cpp">
<Filter>armature\display</Filter>
</ClCompile>
<ClCompile Include="..\CCDecorativeDisplay.cpp">
<Filter>armature\display</Filter>
</ClCompile>
<ClCompile Include="..\CCDisplayFactory.cpp">
<Filter>armature\display</Filter>
</ClCompile>
<ClCompile Include="..\CCDisplayManager.cpp">
<Filter>armature\display</Filter>
</ClCompile>
<ClCompile Include="..\CCSkin.cpp">
<Filter>armature\display</Filter>
</ClCompile>
<ClCompile Include="..\CCArmatureDataManager.cpp">
<Filter>armature\utils</Filter>
</ClCompile>
<ClCompile Include="..\CCArmatureDefine.cpp">
<Filter>armature\utils</Filter>
</ClCompile>
<ClCompile Include="..\CCDataReaderHelper.cpp">
<Filter>armature\utils</Filter>
</ClCompile>
<ClCompile Include="..\CCSpriteFrameCacheHelper.cpp">
<Filter>armature\utils</Filter>
</ClCompile>
<ClCompile Include="..\CCTransformHelp.cpp">
<Filter>armature\utils</Filter>
</ClCompile>
<ClCompile Include="..\CCUtilMath.cpp">
<Filter>armature\utils</Filter>
</ClCompile>
<ClCompile Include="..\CCColliderDetector.cpp">
<Filter>armature\physics</Filter>
</ClCompile>
<ClCompile Include="..\CCArmature.cpp">
<Filter>armature</Filter>
</ClCompile>
<ClCompile Include="..\CCBone.cpp">
<Filter>armature</Filter>
</ClCompile>
<ClCompile Include="..\CCActionFrame.cpp">
<Filter>action</Filter>
</ClCompile>
<ClCompile Include="..\CCActionFrameEasing.cpp">
<Filter>action</Filter>
</ClCompile>
<ClCompile Include="..\CCActionManagerEx.cpp">
<Filter>action</Filter>
</ClCompile>
<ClCompile Include="..\CCActionNode.cpp">
<Filter>action</Filter>
</ClCompile>
<ClCompile Include="..\CCActionObject.cpp">
<Filter>action</Filter>
</ClCompile>
<ClCompile Include="..\TriggerBase.cpp">
<Filter>trigger</Filter>
</ClCompile>
<ClCompile Include="..\TriggerMng.cpp">
<Filter>trigger</Filter>
</ClCompile>
<ClCompile Include="..\TriggerObj.cpp">
<Filter>trigger</Filter>
</ClCompile>
<ClCompile Include="..\WidgetReader\WidgetReader.cpp">
<Filter>reader\WidgetReader</Filter>
</ClCompile>
<ClCompile Include="..\WidgetReader\ButtonReader\ButtonReader.cpp">
<Filter>reader\WidgetReader\ButtonReader</Filter>
</ClCompile>
<ClCompile Include="..\WidgetReader\CheckBoxReader\CheckBoxReader.cpp">
<Filter>reader\WidgetReader\CheckBoxReader</Filter>
</ClCompile>
<ClCompile Include="..\WidgetReader\ImageViewReader\ImageViewReader.cpp">
<Filter>reader\WidgetReader\ImageViewReader</Filter>
</ClCompile>
<ClCompile Include="..\WidgetReader\LayoutReader\LayoutReader.cpp">
<Filter>reader\WidgetReader\LayoutReader</Filter>
</ClCompile>
<ClCompile Include="..\WidgetReader\ListViewReader\ListViewReader.cpp">
<Filter>reader\WidgetReader\ListViewReader</Filter>
</ClCompile>
<ClCompile Include="..\WidgetReader\LoadingBarReader\LoadingBarReader.cpp">
<Filter>reader\WidgetReader\LoadingBarReader</Filter>
</ClCompile>
<ClCompile Include="..\WidgetReader\TextReader\TextReader.cpp">
<Filter>reader\WidgetReader\TextReader</Filter>
</ClCompile>
<ClCompile Include="..\WidgetReader\TextFieldReader\TextFieldReader.cpp">
<Filter>reader\WidgetReader\TextFieldReader</Filter>
</ClCompile>
<ClCompile Include="..\WidgetReader\TextBMFontReader\TextBMFontReader.cpp">
<Filter>reader\WidgetReader\TextBMFontReader</Filter>
</ClCompile>
<ClCompile Include="..\WidgetReader\TextAtlasReader\TextAtlasReader.cpp">
<Filter>reader\WidgetReader\TextAtlasReader</Filter>
</ClCompile>
<ClCompile Include="..\WidgetReader\SliderReader\SliderReader.cpp">
<Filter>reader\WidgetReader\SliderReader</Filter>
</ClCompile>
<ClCompile Include="..\WidgetReader\ScrollViewReader\ScrollViewReader.cpp">
<Filter>reader\WidgetReader\ScrollViewReader</Filter>
</ClCompile>
<ClCompile Include="..\WidgetReader\PageViewReader\PageViewReader.cpp">
<Filter>reader\WidgetReader\PageViewReader</Filter>
</ClCompile>
<ClCompile Include="..\CocoLoader.cpp">
<Filter>json</Filter>
</ClCompile>
<ClCompile Include="..\ActionTimeline\CCNodeReader.cpp">
<Filter>TimelineAction</Filter>
</ClCompile>
<ClCompile Include="..\ActionTimeline\CCActionTimelineCache.cpp">
<Filter>TimelineAction</Filter>
</ClCompile>
<ClCompile Include="..\ActionTimeline\CCActionTimeline.cpp">
<Filter>TimelineAction</Filter>
</ClCompile>
<ClCompile Include="..\ActionTimeline\CCFrame.cpp">
<Filter>TimelineAction</Filter>
</ClCompile>
<ClCompile Include="..\ActionTimeline\CCTimeLine.cpp">
<Filter>TimelineAction</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\CCComAttribute.h">
<Filter>components</Filter>
</ClInclude>
<ClInclude Include="..\CCComAudio.h">
<Filter>components</Filter>
</ClInclude>
<ClInclude Include="..\CCComController.h">
<Filter>components</Filter>
</ClInclude>
<ClInclude Include="..\CCComRender.h">
<Filter>components</Filter>
</ClInclude>
<ClInclude Include="..\CCInputDelegate.h">
<Filter>components</Filter>
</ClInclude>
<ClInclude Include="..\DictionaryHelper.h">
<Filter>json</Filter>
</ClInclude>
<ClInclude Include="..\CCSSceneReader.h">
<Filter>reader</Filter>
</ClInclude>
<ClInclude Include="..\CCSGUIReader.h">
<Filter>reader</Filter>
</ClInclude>
<ClInclude Include="..\CCTween.h">
<Filter>armature\animation</Filter>
</ClInclude>
<ClInclude Include="..\CCProcessBase.h">
<Filter>armature\animation</Filter>
</ClInclude>
<ClInclude Include="..\CCArmatureAnimation.h">
<Filter>armature\animation</Filter>
</ClInclude>
<ClInclude Include="..\CCDatas.h">
<Filter>armature\datas</Filter>
</ClInclude>
<ClInclude Include="..\CCBatchNode.h">
<Filter>armature\display</Filter>
</ClInclude>
<ClInclude Include="..\CCDecorativeDisplay.h">
<Filter>armature\display</Filter>
</ClInclude>
<ClInclude Include="..\CCDisplayFactory.h">
<Filter>armature\display</Filter>
</ClInclude>
<ClInclude Include="..\CCDisplayManager.h">
<Filter>armature\display</Filter>
</ClInclude>
<ClInclude Include="..\CCSkin.h">
<Filter>armature\display</Filter>
</ClInclude>
<ClInclude Include="..\CCArmatureDataManager.h">
<Filter>armature\utils</Filter>
</ClInclude>
<ClInclude Include="..\CCArmatureDefine.h">
<Filter>armature\utils</Filter>
</ClInclude>
<ClInclude Include="..\CCDataReaderHelper.h">
<Filter>armature\utils</Filter>
</ClInclude>
<ClInclude Include="..\CCSpriteFrameCacheHelper.h">
<Filter>armature\utils</Filter>
</ClInclude>
<ClInclude Include="..\CCTransformHelp.h">
<Filter>armature\utils</Filter>
</ClInclude>
<ClInclude Include="..\CCUtilMath.h">
<Filter>armature\utils</Filter>
</ClInclude>
<ClInclude Include="..\CCColliderDetector.h">
<Filter>armature\physics</Filter>
</ClInclude>
<ClInclude Include="..\CCArmature.h">
<Filter>armature</Filter>
</ClInclude>
<ClInclude Include="..\CCBone.h">
<Filter>armature</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\json\document.h">
<Filter>json\rapidjson</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\json\filestream.h">
<Filter>json\rapidjson</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\json\prettywriter.h">
<Filter>json\rapidjson</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\json\rapidjson.h">
<Filter>json\rapidjson</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\json\reader.h">
<Filter>json\rapidjson</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\json\stringbuffer.h">
<Filter>json\rapidjson</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\json\writer.h">
<Filter>json\rapidjson</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\json\internal\pow10.h">
<Filter>json\rapidjson\internal</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\json\internal\stack.h">
<Filter>json\rapidjson\internal</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\json\internal\strfunc.h">
<Filter>json\rapidjson\internal</Filter>
</ClInclude>
<ClInclude Include="..\CCActionFrame.h">
<Filter>action</Filter>
</ClInclude>
<ClInclude Include="..\CCActionFrameEasing.h">
<Filter>action</Filter>
</ClInclude>
<ClInclude Include="..\CCActionManagerEx.h">
<Filter>action</Filter>
</ClInclude>
<ClInclude Include="..\CCActionNode.h">
<Filter>action</Filter>
</ClInclude>
<ClInclude Include="..\CCActionObject.h">
<Filter>action</Filter>
</ClInclude>
<ClInclude Include="..\TriggerBase.h">
<Filter>trigger</Filter>
</ClInclude>
<ClInclude Include="..\TriggerMng.h">
<Filter>trigger</Filter>
</ClInclude>
<ClInclude Include="..\TriggerObj.h">
<Filter>trigger</Filter>
</ClInclude>
<ClInclude Include="..\CCComBase.h">
<Filter>components</Filter>
</ClInclude>
<ClInclude Include="..\WidgetReader\WidgetReader.h">
<Filter>reader\WidgetReader</Filter>
</ClInclude>
<ClInclude Include="..\WidgetReader\WidgetReaderProtocol.h">
<Filter>reader\WidgetReader</Filter>
</ClInclude>
<ClInclude Include="..\WidgetReader\ButtonReader\ButtonReader.h">
<Filter>reader\WidgetReader\ButtonReader</Filter>
</ClInclude>
<ClInclude Include="..\WidgetReader\CheckBoxReader\CheckBoxReader.h">
<Filter>reader\WidgetReader\CheckBoxReader</Filter>
</ClInclude>
<ClInclude Include="..\WidgetReader\ImageViewReader\ImageViewReader.h">
<Filter>reader\WidgetReader\ImageViewReader</Filter>
</ClInclude>
<ClInclude Include="..\WidgetReader\LayoutReader\LayoutReader.h">
<Filter>reader\WidgetReader\LayoutReader</Filter>
</ClInclude>
<ClInclude Include="..\WidgetReader\ListViewReader\ListViewReader.h">
<Filter>reader\WidgetReader\ListViewReader</Filter>
</ClInclude>
<ClInclude Include="..\WidgetReader\LoadingBarReader\LoadingBarReader.h">
<Filter>reader\WidgetReader\LoadingBarReader</Filter>
</ClInclude>
<ClInclude Include="..\WidgetReader\TextReader\TextReader.h">
<Filter>reader\WidgetReader\TextReader</Filter>
</ClInclude>
<ClInclude Include="..\WidgetReader\TextFieldReader\TextFieldReader.h">
<Filter>reader\WidgetReader\TextFieldReader</Filter>
</ClInclude>
<ClInclude Include="..\WidgetReader\TextBMFontReader\TextBMFontReader.h">
<Filter>reader\WidgetReader\TextBMFontReader</Filter>
</ClInclude>
<ClInclude Include="..\WidgetReader\TextAtlasReader\TextAtlasReader.h">
<Filter>reader\WidgetReader\TextAtlasReader</Filter>
</ClInclude>
<ClInclude Include="..\WidgetReader\SliderReader\SliderReader.h">
<Filter>reader\WidgetReader\SliderReader</Filter>
</ClInclude>
<ClInclude Include="..\WidgetReader\ScrollViewReader\ScrollViewReader.h">
<Filter>reader\WidgetReader\ScrollViewReader</Filter>
</ClInclude>
<ClInclude Include="..\WidgetReader\PageViewReader\PageViewReader.h">
<Filter>reader\WidgetReader\PageViewReader</Filter>
</ClInclude>
<ClInclude Include="..\CocoLoader.h">
<Filter>json</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio.h">
<Filter>json</Filter>
</ClInclude>
<ClInclude Include="..\ActionTimeline\CCNodeReader.h">
<Filter>TimelineAction</Filter>
</ClInclude>
<ClInclude Include="..\ActionTimeline\CCActionTimelineCache.h">
<Filter>TimelineAction</Filter>
</ClInclude>
<ClInclude Include="..\ActionTimeline\CCActionTimeline.h">
<Filter>TimelineAction</Filter>
</ClInclude>
<ClInclude Include="..\ActionTimeline\CCFrame.h">
<Filter>TimelineAction</Filter>
</ClInclude>
<ClInclude Include="..\ActionTimeline\CCTimeLine.h">
<Filter>TimelineAction</Filter>
</ClInclude>
<ClInclude Include="..\ActionTimeline\CCTimelineMacro.h">
<Filter>TimelineAction</Filter>
</ClInclude>
<ClInclude Include="..\CocosStudioExport.h" />
</ItemGroup>
</Project>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />

View File

@ -11,32 +11,9 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Animation.h" />
<ClInclude Include="..\AnimationState.h" />
<ClInclude Include="..\AnimationStateData.h" />
<ClInclude Include="..\Atlas.h" />
<ClInclude Include="..\AtlasAttachmentLoader.h" />
<ClInclude Include="..\Attachment.h" />
<ClInclude Include="..\AttachmentLoader.h" />
<ClInclude Include="..\Bone.h" />
<ClInclude Include="..\BoneData.h" />
<ClInclude Include="..\BoundingBoxAttachment.h" />
<ClInclude Include="..\CCSkeleton.h" />
<ClInclude Include="..\CCSkeletonAnimation.h" />
<ClInclude Include="..\extension.h" />
<ClInclude Include="..\Event.h" />
<ClInclude Include="..\EventData.h" />
<ClInclude Include="..\Json.h" />
<ClInclude Include="..\RegionAttachment.h" />
<ClInclude Include="..\Skeleton.h" />
<ClInclude Include="..\SkeletonBounds.h" />
<ClInclude Include="..\SkeletonData.h" />
<ClInclude Include="..\SkeletonJson.h" />
<ClInclude Include="..\Skin.h" />
<ClInclude Include="..\Slot.h" />
<ClInclude Include="..\SlotData.h" />
<ClInclude Include="..\spine-cocos2dx.h" />
<ClInclude Include="..\spine.h" />
<ProjectReference Include="..\..\..\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Animation.cpp" />
@ -51,9 +28,9 @@
<ClCompile Include="..\BoundingBoxAttachment.cpp" />
<ClCompile Include="..\CCSkeleton.cpp" />
<ClCompile Include="..\CCSkeletonAnimation.cpp" />
<ClCompile Include="..\extension.cpp" />
<ClCompile Include="..\Event.cpp" />
<ClCompile Include="..\EventData.cpp" />
<ClCompile Include="..\extension.cpp" />
<ClCompile Include="..\Json.cpp" />
<ClCompile Include="..\RegionAttachment.cpp" />
<ClCompile Include="..\Skeleton.cpp" />
@ -66,9 +43,32 @@
<ClCompile Include="..\spine-cocos2dx.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
</ProjectReference>
<ClInclude Include="..\Animation.h" />
<ClInclude Include="..\AnimationState.h" />
<ClInclude Include="..\AnimationStateData.h" />
<ClInclude Include="..\Atlas.h" />
<ClInclude Include="..\AtlasAttachmentLoader.h" />
<ClInclude Include="..\Attachment.h" />
<ClInclude Include="..\AttachmentLoader.h" />
<ClInclude Include="..\Bone.h" />
<ClInclude Include="..\BoneData.h" />
<ClInclude Include="..\BoundingBoxAttachment.h" />
<ClInclude Include="..\CCSkeleton.h" />
<ClInclude Include="..\CCSkeletonAnimation.h" />
<ClInclude Include="..\Event.h" />
<ClInclude Include="..\EventData.h" />
<ClInclude Include="..\extension.h" />
<ClInclude Include="..\Json.h" />
<ClInclude Include="..\RegionAttachment.h" />
<ClInclude Include="..\Skeleton.h" />
<ClInclude Include="..\SkeletonBounds.h" />
<ClInclude Include="..\SkeletonData.h" />
<ClInclude Include="..\SkeletonJson.h" />
<ClInclude Include="..\Skin.h" />
<ClInclude Include="..\Slot.h" />
<ClInclude Include="..\SlotData.h" />
<ClInclude Include="..\spine-cocos2dx.h" />
<ClInclude Include="..\spine.h" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}</ProjectGuid>

View File

@ -1,25 +1,91 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Header Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
<UniqueIdentifier>{3e21d10b-4a29-49c0-b21a-fa573a4e65c1}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{ca7b23a8-6f11-4059-b242-ba5102033974}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\SlotData.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\spine.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\spine-cocos2dx.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClCompile Include="..\Animation.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\AnimationState.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\AnimationStateData.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Atlas.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\AtlasAttachmentLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Attachment.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\AttachmentLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Bone.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\BoneData.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\BoundingBoxAttachment.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCSkeleton.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCSkeletonAnimation.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Event.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\EventData.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\extension.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Json.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\RegionAttachment.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Skeleton.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\SkeletonBounds.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\SkeletonData.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\SkeletonJson.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Skin.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Slot.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\SlotData.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\spine-cocos2dx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Animation.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -50,18 +116,18 @@
<ClInclude Include="..\BoundingBoxAttachment.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Event.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\EventData.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\CCSkeleton.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\CCSkeletonAnimation.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Event.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\EventData.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\extension.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -74,10 +140,10 @@
<ClInclude Include="..\Skeleton.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\SkeletonData.h">
<ClInclude Include="..\SkeletonBounds.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\SkeletonBounds.h">
<ClInclude Include="..\SkeletonData.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\SkeletonJson.h">
@ -89,82 +155,14 @@
<ClInclude Include="..\Slot.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Skeleton.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\SkeletonBounds.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\SkeletonData.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\SkeletonJson.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Skin.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Slot.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\SlotData.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\spine-cocos2dx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Animation.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\AnimationState.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\AnimationStateData.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Atlas.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\AtlasAttachmentLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Attachment.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\AttachmentLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Bone.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\BoundingBoxAttachment.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Event.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\EventData.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCSkeleton.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CCSkeletonAnimation.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\extension.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Json.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\RegionAttachment.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\BoneData.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClInclude Include="..\SlotData.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\spine-cocos2dx.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\spine.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

View File

@ -1,37 +0,0 @@
if(WINDOWS)
set(PLATFORM_LINK websockets)
elseif(LINUX)
set(PLATFORM_LINK websockets ssl crypto)
endif()
set(COCOS_NETWORK_SRC
HttpClient.cpp
SocketIO.cpp
WebSocket.cpp
)
add_library(network STATIC
${COCOS_NETWORK_SRC}
)
if(MSVC)
set(COCOS_NETWORK_LINK
libcurl_imp
${PLATFORM_LINK}
)
else()
set(COCOS_NETWORK_LINK
curl
${PLATFORM_LINK}
)
endif()
target_link_libraries(network
${COCOS_NETWORK_LINK}
)
set_target_properties(network
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)

View File

@ -44,7 +44,7 @@ namespace network {
/** @brief Singleton that handles asynchrounous http requests
* Once the request completed, a callback will issued in main thread when it provided during make request
*/
class HttpClient
class CC_DLL HttpClient
{
public:
/** Return the shared instance **/

View File

@ -54,7 +54,7 @@ typedef void (cocos2d::Ref::*SEL_HttpResponse)(HttpClient* client, HttpResponse*
#endif
#endif
class HttpRequest : public Ref
class CC_DLL HttpRequest : public Ref
{
public:
/** Use this enum type as param in setReqeustType(param) */

View File

@ -37,7 +37,7 @@ namespace network {
Please refer to samples/TestCpp/Classes/ExtensionTest/NetworkTest/HttpClientTest.cpp as a sample
@since v2.0.2
*/
class HttpResponse : public cocos2d::Ref
class CC_DLL HttpResponse : public cocos2d::Ref
{
public:
/** Constructor, it's used by HttpClient internal, users don't need to create HttpResponse manually

View File

@ -75,7 +75,7 @@ class SIOClient;
/**
* @brief Singleton and wrapper class to provide static creation method as well as registry of all sockets
*/
class SocketIO
class CC_DLL SocketIO
{
public:
static SocketIO* getInstance();
@ -131,7 +131,7 @@ typedef std::unordered_map<std::string, SIOEvent> EventRegistry;
/**
* @brief A single connection to a socket.io endpoint
*/
class SIOClient
class CC_DLL SIOClient
: public cocos2d::Ref
{
private:

View File

@ -47,7 +47,7 @@ namespace network {
class WsThreadHelper;
class WsMessage;
class WebSocket
class CC_DLL WebSocket
{
public:
/**

View File

@ -10,18 +10,6 @@
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\HttpClient.h" />
<ClInclude Include="..\HttpRequest.h" />
<ClInclude Include="..\HttpResponse.h" />
<ClInclude Include="..\SocketIO.h" />
<ClInclude Include="..\WebSocket.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\HttpClient.cpp" />
<ClCompile Include="..\SocketIO.cpp" />
<ClCompile Include="..\WebSocket.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>

View File

@ -1,45 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
</Filter>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\HttpClient.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\HttpRequest.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\HttpResponse.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\SocketIO.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\WebSocket.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\HttpClient.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\SocketIO.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\WebSocket.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>

View File

@ -1,13 +0,0 @@
set(COCOS_PHYSICS_SRC
physics/chipmunk/CCPhysicsContactInfo_chipmunk.cpp
physics/chipmunk/CCPhysicsJointInfo_chipmunk.cpp
physics/chipmunk/CCPhysicsShapeInfo_chipmunk.cpp
physics/chipmunk/CCPhysicsBodyInfo_chipmunk.cpp
physics/chipmunk/CCPhysicsWorldInfo_chipmunk.cpp
physics/CCPhysicsBody.cpp
physics/CCPhysicsContact.cpp
physics/CCPhysicsShape.cpp
physics/CCPhysicsJoint.cpp
physics/CCPhysicsWorld.cpp
)

View File

@ -102,6 +102,15 @@ public:
*/
virtual void setAnimationInterval(double interval) = 0;
//subclass override the function to set OpenGL context attribution instead of use default value
//and now can only set six attributions:redBits,greenBits,blueBits,alphaBits,depthBits,stencilBits
//default value are(5,6,5,0,16,0), usually use as follows:
/*void AppDelegate::initGLContextAttrs(){
GLContextAttrs glContextAttrs = {8, 8, 8, 8, 24, 8};
GLView::setGLContextAttrs(glContextAttrs);
}*/
virtual void initGLContextAttrs() {}
/**
@brief Get current language config
@return Current language config

View File

@ -70,6 +70,19 @@ namespace {
}
//default context attributions are setted as follows
GLContextAttrs GLView::_glContextAttrs = {5, 6, 5, 0, 16, 0};
void GLView::setGLContextAttrs(GLContextAttrs& glContextAttrs)
{
_glContextAttrs = glContextAttrs;
}
GLContextAttrs GLView::getGLContextAttrs()
{
return _glContextAttrs;
}
GLView::GLView()
: _scaleX(1.0f)
, _scaleY(1.0f)

View File

@ -64,6 +64,16 @@ enum class ResolutionPolicy
UNKNOWN,
};
struct GLContextAttrs
{
int redBits;
int greenBits;
int blueBits;
int alphaBits;
int depthBits;
int stencilBits;
};
NS_CC_BEGIN
/**
@ -98,6 +108,11 @@ public:
virtual bool windowShouldClose() { return false; };
//static method and member so that we can modify it on all platforms before create OpenGL context
static void setGLContextAttrs(GLContextAttrs& glContextAttrs);
static GLContextAttrs getGLContextAttrs();
static GLContextAttrs _glContextAttrs;
/**
* Polls input events. Subclass must implement methods if platform
* does not provide event callbacks.

View File

@ -1,43 +0,0 @@
if(WIN32)
ADD_DEFINITIONS(-DUNICODE -D_UNICODE)
set(COCOS_PLATFORM_SPECIFIC_SRC
platform/win32/CCStdC.cpp
platform/win32/CCFileUtilsWin32.cpp
platform/win32/CCCommon.cpp
platform/win32/CCApplication.cpp
platform/win32/CCDevice.cpp
)
elseif(APPLE)
else()
set(COCOS_PLATFORM_SPECIFIC_SRC
platform/linux/CCStdC.cpp
platform/linux/CCFileUtilsLinux.cpp
platform/linux/CCCommon.cpp
platform/linux/CCApplication.cpp
platform/linux/CCDevice.cpp
)
endif()
include_directories(
../external/ConvertUTF
)
set(COCOS_PLATFORM_SRC
platform/CCSAXParser.cpp
platform/CCThread.cpp
platform/CCGLView.cpp
platform/CCFileUtils.cpp
platform/CCImage.cpp
platform/desktop/CCGLViewImpl.cpp
../external/edtaa3func/edtaa3func.cpp
../external/ConvertUTF/ConvertUTFWrapper.cpp
../external/ConvertUTF/ConvertUTF.c
${COCOS_PLATFORM_SPECIFIC_SRC}
)

View File

@ -30,13 +30,13 @@ THE SOFTWARE.
#include "base/CCDirector.h"
#include "base/ccMacros.h"
#include "jni/IMEJni.h"
#include "jni/JniHelper.h"
#include "jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h"
#include "CCGL.h"
#include <stdlib.h>
#include <android/log.h>
// <EGL/egl.h> exists since android 2.3
#include <EGL/egl.h>
PFNGLGENVERTEXARRAYSOESPROC glGenVertexArraysOESEXT = 0;

View File

@ -51,6 +51,7 @@ public abstract class Cocos2dxActivity extends Activity implements Cocos2dxHelpe
// ===========================================================
private Cocos2dxGLSurfaceView mGLSurfaceView;
private int[] glContextAttrs;
private Cocos2dxHandler mHandler;
private static Cocos2dxActivity sContext = null;
private Cocos2dxVideoHelper mVideoHelper = null;
@ -95,11 +96,16 @@ public abstract class Cocos2dxActivity extends Activity implements Cocos2dxHelpe
Cocos2dxHelper.init(this);
this.glContextAttrs = getGLContextAttrs();
this.init();
if (mVideoHelper == null) {
mVideoHelper = new Cocos2dxVideoHelper(this, mFrameLayout);
}
}
//native method,call GLViewImpl::getGLContextAttrs() to get the OpenGL ES context attributions
private static native int[] getGLContextAttrs();
// ===========================================================
// Getter & Setter
@ -193,7 +199,7 @@ public abstract class Cocos2dxActivity extends Activity implements Cocos2dxHelpe
// Switch to supported OpenGL (ARGB888) mode on emulator
if (isAndroidEmulator())
this.mGLSurfaceView.setEGLConfigChooser(8 , 8, 8, 8, 16, 0);
this.mGLSurfaceView.setEGLConfigChooser(8, 8, 8, 8, 16, 0);
this.mGLSurfaceView.setCocos2dxRenderer(new Cocos2dxRenderer());
this.mGLSurfaceView.setCocos2dxEditText(edittext);
@ -203,7 +209,12 @@ public abstract class Cocos2dxActivity extends Activity implements Cocos2dxHelpe
}
public Cocos2dxGLSurfaceView onCreateView() {
return new Cocos2dxGLSurfaceView(this);
Cocos2dxGLSurfaceView glSurfaceView = new Cocos2dxGLSurfaceView(this);
glSurfaceView.setEGLConfigChooser(this.glContextAttrs[0], this.glContextAttrs[1],this.glContextAttrs[2],
this.glContextAttrs[3],this.glContextAttrs[4],this.glContextAttrs[5]);
return glSurfaceView;
}
private final static boolean isAndroidEmulator() {

View File

@ -64,7 +64,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
glview->setFrameSize(w, h);
director->setOpenGLView(glview);
cocos_android_app_init(env, thiz);
//cocos_android_app_init(env, thiz);
cocos2d::Application::getInstance()->run();
}
@ -79,7 +79,22 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
director->getEventDispatcher()->dispatchEvent(&recreatedEvent);
director->setGLDefaultValues();
}
}
jintArray Java_org_cocos2dx_lib_Cocos2dxActivity_getGLContextAttrs(JNIEnv* env, jobject thiz)
{
cocos_android_app_init(env, thiz);
cocos2d::Application::getInstance()->initGLContextAttrs();
GLContextAttrs _glContextAttrs = GLView::getGLContextAttrs();
int tmp[6] = {_glContextAttrs.redBits, _glContextAttrs.greenBits, _glContextAttrs.blueBits,
_glContextAttrs.alphaBits, _glContextAttrs.depthBits, _glContextAttrs.stencilBits};
jintArray glContextAttrsJava = env->NewIntArray(6);
env->SetIntArrayRegion(glContextAttrsJava, 0, 6, tmp);
return glContextAttrsJava;
}
void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeOnSurfaceChanged(JNIEnv* env, jobject thiz, jint w, jint h)

View File

@ -337,7 +337,6 @@ GLViewImpl* GLViewImpl::createWithFullScreen(const std::string& viewName, const
return nullptr;
}
bool GLViewImpl::initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor)
{
setViewName(viewName);
@ -345,6 +344,12 @@ bool GLViewImpl::initWithRect(const std::string& viewName, Rect rect, float fram
_frameZoomFactor = frameZoomFactor;
glfwWindowHint(GLFW_RESIZABLE,GL_FALSE);
glfwWindowHint(GLFW_RED_BITS,_glContextAttrs.redBits);
glfwWindowHint(GLFW_GREEN_BITS,_glContextAttrs.greenBits);
glfwWindowHint(GLFW_BLUE_BITS,_glContextAttrs.blueBits);
glfwWindowHint(GLFW_ALPHA_BITS,_glContextAttrs.alphaBits);
glfwWindowHint(GLFW_DEPTH_BITS,_glContextAttrs.depthBits);
glfwWindowHint(GLFW_STENCIL_BITS,_glContextAttrs.stencilBits);
_mainWindow = glfwCreateWindow(rect.size.width * _frameZoomFactor,
rect.size.height * _frameZoomFactor,

View File

@ -52,6 +52,10 @@ public:
/** creates a GLViewImpl with a name in fullscreen mode */
static GLViewImpl* createWithFullScreen(const std::string& viewName);
static void convertAttrs();
static void* _pixelFormat;
static int _depthFormat;
/** sets the content scale factor */
bool setContentScaleFactor(float contentScaleFactor);

View File

@ -36,6 +36,9 @@
NS_CC_BEGIN
void* GLViewImpl::_pixelFormat = kEAGLColorFormatRGB565;
int GLViewImpl::_depthFormat = GL_DEPTH_COMPONENT16;
GLViewImpl* GLViewImpl::createWithEAGLView(void *eaglview)
{
auto ret = new GLViewImpl;
@ -80,6 +83,18 @@ GLViewImpl* GLViewImpl::createWithFullScreen(const std::string& viewName)
return nullptr;
}
void GLViewImpl::convertAttrs()
{
if(_glContextAttrs.redBits==8 && _glContextAttrs.greenBits==8 && _glContextAttrs.blueBits==8 && _glContextAttrs.alphaBits==8)
{
_pixelFormat = kEAGLColorFormatRGBA8;
}
if(_glContextAttrs.depthBits==24 && _glContextAttrs.stencilBits==8)
{
_depthFormat = GL_DEPTH24_STENCIL8_OES;
}
}
GLViewImpl::GLViewImpl()
{
}
@ -105,13 +120,15 @@ bool GLViewImpl::initWithEAGLView(void *eaglview)
bool GLViewImpl::initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor)
{
CGRect r = CGRectMake(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
convertAttrs();
CCEAGLView *eaglview = [CCEAGLView viewWithFrame: r
pixelFormat: kEAGLColorFormatRGB565
depthFormat: GL_DEPTH24_STENCIL8_OES
pixelFormat: (NSString*)_pixelFormat
depthFormat: _depthFormat
preserveBackbuffer: NO
sharegroup: nil
multiSampling: NO
numberOfSamples: 0];
[eaglview setMultipleTouchEnabled:YES];
_screenSize.width = _designResolutionSize.width = [eaglview getWidth];

View File

@ -63,6 +63,7 @@ Application::~Application()
int Application::run()
{
initGLContextAttrs();
// Initialize instance and cocos2d.
if (! applicationDidFinishLaunching())
{

View File

@ -64,6 +64,7 @@ Application::~Application()
int Application::run()
{
initGLContextAttrs();
if(!applicationDidFinishLaunching())
{
return 1;

View File

@ -69,6 +69,8 @@ int Application::run()
QueryPerformanceFrequency(&nFreq);
QueryPerformanceCounter(&nLast);
initGLContextAttrs();
// Initialize instance and cocos2d.
if (!applicationDidFinishLaunching())
{

View File

@ -1,22 +0,0 @@
set(COCOS_RENDERER_SRC
renderer/CCBatchCommand.cpp
renderer/CCCustomCommand.cpp
renderer/CCMeshCommand.cpp
renderer/CCGLProgramCache.cpp
renderer/CCGLProgram.cpp
renderer/CCGLProgramStateCache.cpp
renderer/CCGLProgramState.cpp
renderer/ccGLStateCache.cpp
renderer/CCGroupCommand.cpp
renderer/CCQuadCommand.cpp
renderer/CCRenderCommand.cpp
renderer/CCRenderer.cpp
renderer/ccShaders.cpp
renderer/CCTexture2D.cpp
renderer/CCTextureAtlas.cpp
renderer/CCTextureCache.cpp
renderer/CCVertexIndexBuffer.cpp
renderer/CCVertexIndexData.cpp
renderer/CCPrimitive.cpp
renderer/CCPrimitiveCommand.cpp
)

View File

@ -1,229 +1,51 @@
#luacocos2d
set(LIBLUACOCOS2D_SRC
auto/lua_cocos2dx_auto.cpp
auto/lua_cocos2dx_physics_auto.cpp
auto/lua_cocos2dx_experimental_auto.cpp
manual/tolua_fix.cpp
manual/CCLuaBridge.cpp
manual/CCLuaEngine.cpp
manual/CCLuaStack.cpp
manual/CCLuaValue.cpp
manual/Cocos2dxLuaLoader.cpp
manual/LuaBasicConversions.cpp
manual/cocos2d/lua_cocos2dx_deprecated.cpp
manual/cocos2d/lua_cocos2dx_experimental_manual.cpp
manual/cocos2d/lua_cocos2dx_manual.cpp
manual/cocos2d/lua_cocos2dx_physics_manual.cpp
manual/cocos2d/LuaOpengl.cpp
manual/cocos2d/LuaScriptHandlerMgr.cpp
)
set(cocos_root ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
include_directories(
auto
manual
manual/cocos2d
manual/extension
manual/cocostudio
manual/ui
../../2d
../../3d
../../../extensions
../../../external/lua/lua
../../../external/lua/tolua
../../../external/xxtea
${cocos_root}/external/lua/tolua/
${cocos_root}/external/lua/lua
${cocos_root}/external/xxtea
${cocos_root}/external
${cocos_root}/cocos
${cocos_root}/cocos/base
${cocos_root}/cocos/physics
${cocos_root}/cocos/audio/include
${cocos_root}/cocos/2d
${cocos_root}/cocos/3d
${cocos_root}/cocos/editor-support/spine
${cocos_root}/cocos/editor-support/cocostudio
${cocos_root}/cocos/editor-support/cocosbuilder
${cocos_root}/cocos/ui
${cocos_root}/cocos/network
${cocos_root}/cocos/storage
${cocos_root}/cocos/editor-support
${cocos_root}/cocos/platform
${CMAKE_CURRENT_SOURCE_DIR}/manual
${CMAKE_CURRENT_SOURCE_DIR}/manual/extension
${CMAKE_CURRENT_SOURCE_DIR}/manual/cocostudio
${CMAKE_CURRENT_SOURCE_DIR}/manual/ui
${CMAKE_CURRENT_SOURCE_DIR}/ui
${CMAKE_CURRENT_SOURCE_DIR}/manual/cocos2d
${CMAKE_CURRENT_SOURCE_DIR}/auto
)
add_library(luacocos2d STATIC
${LIBLUACOCOS2D_SRC}
)
target_link_libraries(luacocos2d
tolua
lua
xxtea
file(GLOB lua_cocos2d_source_files
"${cocos_root}/external/lua/lua/*.c"
"${cocos_root}/external/lua/tolua/*.c"
"${CMAKE_CURRENT_SOURCE_DIR}/auto/*.cpp"
"${cocos_root}/external/xxtea/xxtea.cpp"
)
file(GLOB_RECURSE lua_binding_manual_files "${CMAKE_CURRENT_SOURCE_DIR}/manual/*.cpp")
set(lua_cocos2d_source_files ${lua_cocos2d_source_files} ${lua_binding_manual_files})
# exclude files for other platforms
list(REMOVE_ITEM lua_cocos2d_source_files
"${CMAKE_CURRENT_SOURCE_DIR}/manual/platform/android/CCLuaJavaBridge.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp"
)
add_library(luacocos2d STATIC ${lua_cocos2d_source_files})
target_link_libraries(luacocos2d cocos2d)
set_target_properties(luacocos2d
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)
#luacocosdenshion
set(LIBLUACOCOSDENSHION_SRC
auto/lua_cocos2dx_cocosdenshion_auto.cpp
manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp
)
include_directories(
auto
manual/cocosdenshion
../../audio/include
)
add_library(luacocosdenshion STATIC
${LIBLUACOCOSDENSHION_SRC}
)
set_target_properties(luacocosdenshion
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)
#luanetwork
set(LIBLUANETWORK_SRC
manual/network/lua_cocos2dx_network_manual.cpp
manual/network/lua_xml_http_request.cpp
)
include_directories(
manual/network
../../network
)
add_library(luanetwork STATIC
${LIBLUANETWORK_SRC}
)
set_target_properties(luanetwork
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)
#luacocosbuilder
set(LIBLUACOCOSBUILDER_SRC
auto/lua_cocos2dx_cocosbuilder_auto.cpp
manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp
manual/cocosbuilder/CCBProxy.cpp
)
include_directories(
auto
manual/cocosbuilder
../../editor-support/cocosbuilder
)
add_library(luacocosbuilder STATIC
${LIBLUACOCOSBUILDER_SRC}
)
set_target_properties(luacocosbuilder
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)
#luacocostudio
set(LIBLUACOCOSTUDIO_SRC
auto/lua_cocos2dx_studio_auto.cpp
manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp
)
include_directories(
auto
manual/cocostudio
../../editor-support/cocostudio
)
add_library(luacocostudio STATIC
${LIBLUACOCOSTUDIO_SRC}
)
set_target_properties(luacocostudio
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)
#luaspine
set(LIBLUASPINE_SRC
auto/lua_cocos2dx_spine_auto.cpp
manual/spine/LuaSkeletonAnimation.cpp
manual/spine/lua_cocos2dx_spine_manual.cpp
)
include_directories(
auto
manual/spine
../../editor-support/spine
)
add_library(luaspine STATIC
${LIBLUASPINE_SRC}
)
set_target_properties(luaspine
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)
#luaextension
set(LIBLUAEXTENSION_SRC
auto/lua_cocos2dx_extension_auto.cpp
manual/extension/lua_cocos2dx_extension_manual.cpp
)
include_directories(
auto
manual/extension
../../../extensions
)
add_library(luaextension STATIC
${LIBLUAEXTENSION_SRC}
)
set_target_properties(luaextension
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)
#luaui
set(LIBLUAUI_SRC
auto/lua_cocos2dx_ui_auto.cpp
manual/ui/lua_cocos2dx_ui_manual.cpp
)
include_directories(
auto
manual/ui
../../ui
)
add_library(luaui STATIC
${LIBLUAUI_SRC}
)
set_target_properties(luaui
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)
#luacocos3d
set(LIBLUA3D_SRC
auto/lua_cocos2dx_3d_auto.cpp
manual/3d/lua_cocos2dx_3d_manual.cpp
)
include_directories(
auto
manual/3d
../../../3d
)
add_library(luacocos3d STATIC
${LIBLUA3D_SRC}
)
set_target_properties(luacocos3d
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)

View File

@ -156,4 +156,14 @@
-- @function [parent=#GLView] pollEvents
-- @param self
--------------------------------
-- @function [parent=#GLView] setGLContextAttrs
-- @param self
-- @param #GLContextAttrs glcontextattrs
--------------------------------
-- @function [parent=#GLView] getGLContextAttrs
-- @param self
-- @return GLContextAttrs#GLContextAttrs ret (return value: GLContextAttrs)
return nil

View File

@ -13154,6 +13154,69 @@ int lua_cocos2dx_GLView_pollEvents(lua_State* tolua_S)
return 0;
}
int lua_cocos2dx_GLView_setGLContextAttrs(lua_State* tolua_S)
{
int argc = 0;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertable(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror;
#endif
argc = lua_gettop(tolua_S) - 1;
if (argc == 1)
{
GLContextAttrs arg0;
#pragma warning NO CONVERSION TO NATIVE FOR GLContextAttrs;
if(!ok)
return 0;
cocos2d::GLView::setGLContextAttrs(arg0);
return 0;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLView:setGLContextAttrs",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_setGLContextAttrs'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_GLView_getGLContextAttrs(lua_State* tolua_S)
{
int argc = 0;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertable(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror;
#endif
argc = lua_gettop(tolua_S) - 1;
if (argc == 0)
{
if(!ok)
return 0;
GLContextAttrs ret = cocos2d::GLView::getGLContextAttrs();
#pragma warning NO CONVERSION FROM NATIVE FOR GLContextAttrs;
return 1;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLView:getGLContextAttrs",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getGLContextAttrs'.",&tolua_err);
#endif
return 0;
}
static int lua_cocos2dx_GLView_finalize(lua_State* tolua_S)
{
printf("luabindings: finalizing LUA object (GLView)");
@ -13195,6 +13258,8 @@ int lua_register_cocos2dx_GLView(lua_State* tolua_S)
tolua_function(tolua_S,"getVisibleSize",lua_cocos2dx_GLView_getVisibleSize);
tolua_function(tolua_S,"isScissorEnabled",lua_cocos2dx_GLView_isScissorEnabled);
tolua_function(tolua_S,"pollEvents",lua_cocos2dx_GLView_pollEvents);
tolua_function(tolua_S,"setGLContextAttrs", lua_cocos2dx_GLView_setGLContextAttrs);
tolua_function(tolua_S,"getGLContextAttrs", lua_cocos2dx_GLView_getGLContextAttrs);
tolua_endmodule(tolua_S);
std::string typeName = typeid(cocos2d::GLView).name();
g_luaType[typeName] = "cc.GLView";

View File

@ -1556,6 +1556,8 @@ int register_all_cocos2dx(lua_State* tolua_S);

View File

@ -30,85 +30,16 @@ LOCAL_SRC_FILES := ../manual/CCLuaBridge.cpp \
../../../../external/lua/tolua/tolua_to.c \
../../../../external/xxtea/xxtea.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../../../../external/lua/luajit/include \
$(LOCAL_PATH)/../../../2d \
$(LOCAL_PATH)/../../../3d \
$(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../manual \
$(LOCAL_PATH)/../manual/extension \
$(LOCAL_PATH)/../manual/cocostudio \
$(LOCAL_PATH)/../manual/ui \
$(LOCAL_PATH)/../manual/cocos2d \
$(LOCAL_PATH)/../manual/platform/android \
$(LOCAL_PATH)/../manual/platform/android/jni \
$(LOCAL_PATH)/../../../../external/xxtea \
$(LOCAL_PATH)/../../../.. \
$(LOCAL_PATH)/../../../../extensions
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../../../../external/lua/luajit/include \
$(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../manual \
$(LOCAL_PATH)/../manual/cocos2d
LOCAL_STATIC_LIBRARIES := luajit_static
LOCAL_STATIC_LIBRARIES += cocos2dx_static
include $(BUILD_STATIC_LIBRARY)
#libluacocos3d
include $(CLEAR_VARS)
LOCAL_MODULE := cocos3d_lua_static
LOCAL_MODULE_FILENAME := libluacocos3d
LOCAL_SRC_FILES := ../manual/3d/lua_cocos2dx_3d_manual.cpp \
#3d
LOCAL_SRC_FILES += ../manual/3d/lua_cocos2dx_3d_manual.cpp \
../auto/lua_cocos2dx_3d_auto.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../manual/3d \
$(LOCAL_PATH)/../../../3d \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/3d
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocos3d_static
include $(BUILD_STATIC_LIBRARY)
#libluacocosdenshion
include $(CLEAR_VARS)
LOCAL_MODULE := cocosdenshion_lua_static
LOCAL_MODULE_FILENAME := libluacocosdenshion
LOCAL_SRC_FILES := ../manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp \
#cocosdenshion
LOCAL_SRC_FILES += ../manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp \
../auto/lua_cocos2dx_cocosdenshion_auto.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../manual/cocosdenshion \
$(LOCAL_PATH)/../../../audio/include \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/cocosdenshion
LOCAL_STATIC_LIBRARIES := cocosdenshion_static
LOCAL_STATIC_LIBRARIES += cocos2d_lua_static
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := network_lua_static
LOCAL_MODULE_FILENAME := libluanetwork
LOCAL_SRC_FILES := ../manual/network/lua_cocos2dx_network_manual.cpp \
#network
LOCAL_SRC_FILES += ../manual/network/lua_cocos2dx_network_manual.cpp \
../manual/network/lua_extensions.c \
../manual/network/Lua_web_socket.cpp \
../manual/network/lua_xml_http_request.cpp \
@ -126,140 +57,83 @@ LOCAL_SRC_FILES := ../manual/network/lua_cocos2dx_network_manual.cpp \
../../../../external/lua/luasocket/timeout.c \
../../../../external/lua/luasocket/udp.c \
../../../../external/lua/luasocket/unix.c \
../../../../external/lua/luasocket/usocket.c \
../../../../external/lua/luasocket/usocket.c
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/network \
$(LOCAL_PATH)/../../../../external/lua \
$(LOCAL_PATH)/../../../network
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/network
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocos_network_static
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := cocosbuilder_lua_static
LOCAL_MODULE_FILENAME := libluacocosbuilder
LOCAL_SRC_FILES := ../manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp \
#cocosbuilder
LOCAL_SRC_FILES += ../manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp \
../manual/cocosbuilder/CCBProxy.cpp \
../auto/lua_cocos2dx_cocosbuilder_auto.cpp \
../auto/lua_cocos2dx_cocosbuilder_auto.cpp
#cocostudio
LOCAL_SRC_FILES += ../manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp \
../auto/lua_cocos2dx_studio_auto.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/cocosbuilder \
$(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../../../editor-support/cocosbuilder
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/cocosbuilder
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocosbuilder_static
include $(BUILD_STATIC_LIBRARY)
#
include $(CLEAR_VARS)
LOCAL_MODULE := cocostudio_lua_static
LOCAL_MODULE_FILENAME := libluacocostudio
LOCAL_SRC_FILES := ../manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp \
../auto/lua_cocos2dx_studio_auto.cpp \
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/cocostudio \
$(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../../../editor-support/cocostudio
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/cocostudio
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocostudio_static
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := spine_lua_static
LOCAL_MODULE_FILENAME := libluaspine
LOCAL_SRC_FILES := ../manual/spine/lua_cocos2dx_spine_manual.cpp \
#spine
LOCAL_SRC_FILES += ../manual/spine/lua_cocos2dx_spine_manual.cpp \
../manual/spine/LuaSkeletonAnimation.cpp \
../auto/lua_cocos2dx_spine_auto.cpp \
../auto/lua_cocos2dx_spine_auto.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/spine \
$(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../../../editor-support/spine
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/spine
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += spine_static
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := extension_lua_static
LOCAL_MODULE_FILENAME := libluaextension
LOCAL_SRC_FILES := ../manual/extension/lua_cocos2dx_extension_manual.cpp \
../auto/lua_cocos2dx_extension_auto.cpp \
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/extension \
$(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../../../../extensions
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/extension
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocos_extension_static
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := ui_lua_static
LOCAL_MODULE_FILENAME := libluaui
LOCAL_SRC_FILES := ../manual/ui/lua_cocos2dx_experimental_video_manual.cpp \
#ui
LOCAL_SRC_FILES += ../manual/ui/lua_cocos2dx_experimental_video_manual.cpp \
../manual/ui/lua_cocos2dx_ui_manual.cpp \
../auto/lua_cocos2dx_experimental_video_auto.cpp \
../auto/lua_cocos2dx_ui_auto.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/ui \
#extension
LOCAL_SRC_FILES += ../manual/extension/lua_cocos2dx_extension_manual.cpp \
../auto/lua_cocos2dx_extension_auto.cpp \
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../../../../external/lua/luajit/include \
$(LOCAL_PATH)/../../../2d \
$(LOCAL_PATH)/../../../3d \
$(LOCAL_PATH)/../../../network \
$(LOCAL_PATH)/../../../editor-support/cocosbuilder \
$(LOCAL_PATH)/../../../editor-support/cocostudio \
$(LOCAL_PATH)/../../../editor-support/spine \
$(LOCAL_PATH)/../../../ui \
$(LOCAL_PATH)/../../../../extensions \
$(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../../../ui
$(LOCAL_PATH)/../manual \
$(LOCAL_PATH)/../manual/cocos2d \
$(LOCAL_PATH)/../manual/3d \
$(LOCAL_PATH)/../manual/cocosdenshion \
$(LOCAL_PATH)/../manual/network \
$(LOCAL_PATH)/../manual/extension \
$(LOCAL_PATH)/../manual/cocostudio \
$(LOCAL_PATH)/../manual/cocosbuilder \
$(LOCAL_PATH)/../manual/spine \
$(LOCAL_PATH)/../manual/ui \
$(LOCAL_PATH)/../manual/platform/android \
$(LOCAL_PATH)/../manual/platform/android/jni \
$(LOCAL_PATH)/../../../../external/xxtea \
$(LOCAL_PATH)/../../../.. \
$(LOCAL_PATH)/../../../../external/lua
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/ui
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocos_ui_static
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../../../../external/lua/luajit/include \
$(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../manual \
$(LOCAL_PATH)/../manual/cocos2d \
$(LOCAL_PATH)/../manual/3d \
$(LOCAL_PATH)/../manual/cocosdenshion \
$(LOCAL_PATH)/../manual/network \
$(LOCAL_PATH)/../manual/cocosbuilder \
$(LOCAL_PATH)/../manual/cocostudio \
$(LOCAL_PATH)/../manual/spine \
$(LOCAL_PATH)/../manual/extension \
$(LOCAL_PATH)/../manual/ui \
$(LOCAL_PATH)/../../../..
LOCAL_STATIC_LIBRARIES := luajit_static
LOCAL_STATIC_LIBRARIES += cocos2dx_static
include $(BUILD_STATIC_LIBRARY)
$(call import-module,lua/luajit/prebuilt/android)
$(call import-module,.)
$(call import-module,audio/android)
$(call import-module,network)
$(call import-module,editor-support/cocosbuilder)
$(call import-module,editor-support/cocostudio)
$(call import-module,editor-support/spine)
$(call import-module,ui)
$(call import-module,extensions)
$(call import-module,3d)

View File

@ -11,15 +11,37 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\external\lua\luasocket\auxiliar.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\buffer.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\except.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\inet.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\io.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\luasocket.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\mime.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\options.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\select.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\tcp.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\timeout.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\udp.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\wsocket.c" />
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_event.c" />
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_is.c" />
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_map.c" />
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_push.c" />
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_to.c" />
<ClCompile Include="..\..\..\..\external\xxtea\xxtea.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_3d_auto.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_auto.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_cocosbuilder_auto.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_cocosdenshion_auto.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_experimental_auto.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_experimental_video_auto.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_extension_auto.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_physics_auto.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_spine_auto.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_studio_auto.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_ui_auto.cpp" />
<ClCompile Include="..\manual\3d\lua_cocos2dx_3d_manual.cpp" />
<ClCompile Include="..\manual\CCLuaBridge.cpp" />
<ClCompile Include="..\manual\CCLuaEngine.cpp" />
<ClCompile Include="..\manual\CCLuaStack.cpp" />
@ -31,20 +53,56 @@
<ClCompile Include="..\manual\cocos2d\lua_cocos2dx_experimental_manual.cpp" />
<ClCompile Include="..\manual\cocos2d\lua_cocos2dx_manual.cpp" />
<ClCompile Include="..\manual\cocos2d\lua_cocos2dx_physics_manual.cpp" />
<ClCompile Include="..\manual\cocosbuilder\CCBProxy.cpp" />
<ClCompile Include="..\manual\cocosbuilder\lua_cocos2dx_cocosbuilder_manual.cpp" />
<ClCompile Include="..\manual\cocosdenshion\lua_cocos2dx_cocosdenshion_manual.cpp" />
<ClCompile Include="..\manual\cocostudio\lua_cocos2dx_coco_studio_manual.cpp" />
<ClCompile Include="..\manual\extension\lua_cocos2dx_extension_manual.cpp" />
<ClCompile Include="..\manual\LuaBasicConversions.cpp" />
<ClCompile Include="..\manual\network\lua_cocos2dx_network_manual.cpp" />
<ClCompile Include="..\manual\network\lua_extensions.c" />
<ClCompile Include="..\manual\network\Lua_web_socket.cpp" />
<ClCompile Include="..\manual\network\lua_xml_http_request.cpp" />
<ClCompile Include="..\manual\spine\LuaSkeletonAnimation.cpp" />
<ClCompile Include="..\manual\spine\lua_cocos2dx_spine_manual.cpp" />
<ClCompile Include="..\manual\tolua_fix.cpp" />
<ClCompile Include="..\manual\ui\lua_cocos2dx_experimental_video_manual.cpp" />
<ClCompile Include="..\manual\ui\lua_cocos2dx_ui_manual.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\external\lua\luajit\include\lauxlib.h" />
<ClInclude Include="..\..\..\..\external\lua\luajit\include\lua.h" />
<ClInclude Include="..\..\..\..\external\lua\luajit\include\luaconf.h" />
<ClInclude Include="..\..\..\..\external\lua\luajit\include\lualib.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\auxiliar.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\buffer.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\except.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\inet.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\io.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\luasocket.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\mime.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\options.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\select.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\socket.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\tcp.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\timeout.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\udp.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\wsocket.h" />
<ClInclude Include="..\..\..\..\external\lua\tolua\tolua++.h" />
<ClInclude Include="..\..\..\..\external\lua\tolua\tolua_event.h" />
<ClInclude Include="..\..\..\..\external\xxtea\xxtea.h" />
<ClInclude Include="..\auto\lua_cocos2dx_3d_auto.hpp" />
<ClInclude Include="..\auto\lua_cocos2dx_auto.hpp" />
<ClInclude Include="..\auto\lua_cocos2dx_cocosbuilder_auto.hpp" />
<ClInclude Include="..\auto\lua_cocos2dx_cocosdenshion_auto.hpp" />
<ClInclude Include="..\auto\lua_cocos2dx_experimental_auto.hpp" />
<ClInclude Include="..\auto\lua_cocos2dx_experimental_video_auto.hpp" />
<ClInclude Include="..\auto\lua_cocos2dx_extension_auto.hpp" />
<ClInclude Include="..\auto\lua_cocos2dx_physics_auto.hpp" />
<ClInclude Include="..\auto\lua_cocos2dx_spine_auto.hpp" />
<ClInclude Include="..\auto\lua_cocos2dx_studio_auto.hpp" />
<ClInclude Include="..\auto\lua_cocos2dx_ui_auto.hpp" />
<ClInclude Include="..\manual\3d\lua_cocos2dx_3d_manual.h" />
<ClInclude Include="..\manual\CCLuaBridge.h" />
<ClInclude Include="..\manual\CCLuaEngine.h" />
<ClInclude Include="..\manual\CCLuaStack.h" />
@ -56,28 +114,92 @@
<ClInclude Include="..\manual\cocos2d\lua_cocos2dx_experimental_manual.hpp" />
<ClInclude Include="..\manual\cocos2d\lua_cocos2dx_manual.hpp" />
<ClInclude Include="..\manual\cocos2d\lua_cocos2dx_physics_manual.hpp" />
<ClInclude Include="..\manual\cocosbuilder\CCBProxy.h" />
<ClInclude Include="..\manual\cocosbuilder\lua_cocos2dx_cocosbuilder_manual.h" />
<ClInclude Include="..\manual\cocosdenshion\lua_cocos2dx_cocosdenshion_manual.h" />
<ClInclude Include="..\manual\cocostudio\lua_cocos2dx_coco_studio_manual.hpp" />
<ClInclude Include="..\manual\extension\lua_cocos2dx_extension_manual.h" />
<ClInclude Include="..\manual\LuaBasicConversions.h" />
<ClInclude Include="..\manual\network\lua_cocos2dx_network_manual.h" />
<ClInclude Include="..\manual\network\lua_extensions.h" />
<ClInclude Include="..\manual\network\Lua_web_socket.h" />
<ClInclude Include="..\manual\network\lua_xml_http_request.h" />
<ClInclude Include="..\manual\spine\LuaSkeletonAnimation.h" />
<ClInclude Include="..\manual\spine\lua_cocos2dx_spine_manual.hpp" />
<ClInclude Include="..\manual\tolua_fix.h" />
<ClInclude Include="..\manual\ui\lua_cocos2dx_experimental_video_manual.hpp" />
<ClInclude Include="..\manual\ui\lua_cocos2dx_ui_manual.hpp" />
</ItemGroup>
<ItemGroup>
<None Include="..\script\Cocos2d.lua" />
<None Include="..\script\Cocos2dConstants.lua" />
<None Include="..\script\DeprecatedCocos2dClass.lua" />
<None Include="..\script\DeprecatedCocos2dEnum.lua" />
<None Include="..\script\DeprecatedCocos2dFunc.lua" />
<None Include="..\script\DeprecatedOpenglEnum.lua" />
<None Include="..\script\DrawPrimitives.lua" />
<None Include="..\script\extern.lua" />
<None Include="..\script\json.lua" />
<None Include="..\script\luaj.lua" />
<None Include="..\script\luaoc.lua" />
<None Include="..\script\Opengl.lua" />
<None Include="..\script\OpenglConstants.lua" />
<None Include="..\script\AudioEngine.lua">
<FileType>Document</FileType>
</None>
<None Include="..\script\CCBReaderLoad.lua">
<FileType>Document</FileType>
</None>
<None Include="..\script\cocos2d\bitExtend.lua" />
<None Include="..\script\cocos2d\Cocos2d.lua" />
<None Include="..\script\cocos2d\Cocos2dConstants.lua" />
<None Include="..\script\cocos2d\DeprecatedCocos2dClass.lua" />
<None Include="..\script\cocos2d\DeprecatedCocos2dEnum.lua" />
<None Include="..\script\cocos2d\DeprecatedCocos2dFunc.lua" />
<None Include="..\script\cocos2d\DeprecatedOpenglEnum.lua" />
<None Include="..\script\cocos2d\DrawPrimitives.lua" />
<None Include="..\script\cocos2d\extern.lua" />
<None Include="..\script\cocos2d\json.lua" />
<None Include="..\script\cocos2d\luaj.lua" />
<None Include="..\script\cocos2d\luaoc.lua" />
<None Include="..\script\cocos2d\Opengl.lua" />
<None Include="..\script\cocos2d\OpenglConstants.lua" />
<None Include="..\script\DeprecatedCocosBuilderClass.lua">
<FileType>Document</FileType>
</None>
<None Include="..\script\DeprecatedCocosDenshionClass.lua">
<FileType>Document</FileType>
</None>
<None Include="..\script\DeprecatedCocosDenshionFunc.lua">
<FileType>Document</FileType>
</None>
<None Include="..\script\DeprecatedCocoStudioClass.lua">
<FileType>Document</FileType>
</None>
<None Include="..\script\DeprecatedCocoStudioFunc.lua">
<FileType>Document</FileType>
</None>
<None Include="..\script\DeprecatedExtensionClass.lua">
<FileType>Document</FileType>
</None>
<None Include="..\script\DeprecatedExtensionEnum.lua">
<FileType>Document</FileType>
</None>
<None Include="..\script\DeprecatedExtensionFunc.lua">
<FileType>Document</FileType>
</None>
<None Include="..\script\ExtensionConstants.lua">
<FileType>Document</FileType>
</None>
<None Include="..\script\network\DeprecatedNetworkClass.lua" />
<None Include="..\script\network\DeprecatedNetworkEnum.lua" />
<None Include="..\script\network\DeprecatedNetworkFunc.lua" />
<None Include="..\script\network\NetworkConstants.lua" />
<None Include="..\script\StudioConstants.lua">
<FileType>Document</FileType>
</None>
<None Include="..\script\ui\DeprecatedUIEnum.lua" />
<None Include="..\script\ui\DeprecatedUIFunc.lua" />
<None Include="..\script\ui\experimentalUIConstants.lua" />
<None Include="..\script\ui\GuiConstants.lua" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\editor-support\cocosbuilder\proj.win32\libcocosbuilder.vcxproj">
<Project>{811c0dab-7b96-4bd3-a154-b7572b58e4ab}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\editor-support\spine\proj.win32\libspine.vcxproj">
<Project>{b7c2a162-dec9-4418-972e-240ab3cbfcae}</Project>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}</ProjectGuid>
@ -137,7 +259,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;$(EngineRoot)cocos\scripting\lua-bindings\manual\ui;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;$(EngineRoot)cocos\scripting\lua-bindings\manual\ui;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)extensions;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -169,7 +291,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$
<ClCompile>
<Optimization>MinSpace</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;$(EngineRoot)cocos\scripting\lua-bindings\manual\ui;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;$(EngineRoot)cocos\scripting\lua-bindings\manual\ui;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)extensions;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)cocos\ui;$(EngineRoot)external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>

View File

@ -22,6 +22,54 @@
<Filter Include="manual\cocos2d">
<UniqueIdentifier>{d326dcc4-b1e3-4326-95c2-c14144076fd9}</UniqueIdentifier>
</Filter>
<Filter Include="manual\3d">
<UniqueIdentifier>{b886bc56-4c57-48e2-83ee-f0b5ccb9e7ce}</UniqueIdentifier>
</Filter>
<Filter Include="manual\cocosdenshion">
<UniqueIdentifier>{e88a3956-3c72-495d-bef5-75aa1b1e28a7}</UniqueIdentifier>
</Filter>
<Filter Include="manual\cocosbuilder">
<UniqueIdentifier>{21be021b-accb-4bf7-9ab5-327661740a5b}</UniqueIdentifier>
</Filter>
<Filter Include="manual\cocostudio">
<UniqueIdentifier>{7118046c-b71e-4510-b1ea-71916d909276}</UniqueIdentifier>
</Filter>
<Filter Include="manual\spine">
<UniqueIdentifier>{4422fdad-3112-45d1-8eb4-87d8c08fac74}</UniqueIdentifier>
</Filter>
<Filter Include="manual\extension">
<UniqueIdentifier>{c8af8add-e72c-43a7-b89c-c6b9417f3cff}</UniqueIdentifier>
</Filter>
<Filter Include="manual\network">
<UniqueIdentifier>{6a51257b-495f-480a-a491-951f58b82c49}</UniqueIdentifier>
</Filter>
<Filter Include="manual\ui">
<UniqueIdentifier>{4f89500e-8f3e-4235-a7fc-0613f9e7bd40}</UniqueIdentifier>
</Filter>
<Filter Include="script\cocos2d">
<UniqueIdentifier>{8778206d-1979-4f87-8354-0207bda9d8d8}</UniqueIdentifier>
</Filter>
<Filter Include="script\cocosbuilder">
<UniqueIdentifier>{e2b9c502-c4a1-4d73-8111-0301708ad6cb}</UniqueIdentifier>
</Filter>
<Filter Include="script\cocosdenshion">
<UniqueIdentifier>{8a10f092-0016-49ee-a656-91ef2e897598}</UniqueIdentifier>
</Filter>
<Filter Include="script\cocostudio">
<UniqueIdentifier>{c62c70e6-0736-4c0d-90bd-366498ec5bfa}</UniqueIdentifier>
</Filter>
<Filter Include="script\extension">
<UniqueIdentifier>{735e43a2-a3d3-41be-82c8-8ef9981e0c0f}</UniqueIdentifier>
</Filter>
<Filter Include="script\network">
<UniqueIdentifier>{ad7b0aff-cf0d-402f-ab5a-1fbd3502d5c6}</UniqueIdentifier>
</Filter>
<Filter Include="script\ui">
<UniqueIdentifier>{50b9a5eb-3f97-448b-bfc4-2a983844d2e5}</UniqueIdentifier>
</Filter>
<Filter Include="luasocket">
<UniqueIdentifier>{617e3909-01ff-4c11-bae5-790787963c34}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\auto\lua_cocos2dx_auto.cpp">
@ -90,6 +138,111 @@
<ClCompile Include="..\auto\lua_cocos2dx_physics_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\auto\lua_cocos2dx_3d_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\auto\lua_cocos2dx_cocosbuilder_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\auto\lua_cocos2dx_cocosdenshion_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\auto\lua_cocos2dx_experimental_video_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\auto\lua_cocos2dx_extension_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\auto\lua_cocos2dx_spine_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\auto\lua_cocos2dx_studio_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\auto\lua_cocos2dx_ui_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\manual\3d\lua_cocos2dx_3d_manual.cpp">
<Filter>manual\3d</Filter>
</ClCompile>
<ClCompile Include="..\manual\cocosdenshion\lua_cocos2dx_cocosdenshion_manual.cpp">
<Filter>manual\cocosdenshion</Filter>
</ClCompile>
<ClCompile Include="..\manual\cocosbuilder\CCBProxy.cpp">
<Filter>manual\cocosbuilder</Filter>
</ClCompile>
<ClCompile Include="..\manual\cocosbuilder\lua_cocos2dx_cocosbuilder_manual.cpp">
<Filter>manual\cocosbuilder</Filter>
</ClCompile>
<ClCompile Include="..\manual\cocostudio\lua_cocos2dx_coco_studio_manual.cpp">
<Filter>manual\cocostudio</Filter>
</ClCompile>
<ClCompile Include="..\manual\extension\lua_cocos2dx_extension_manual.cpp">
<Filter>manual\extension</Filter>
</ClCompile>
<ClCompile Include="..\manual\network\lua_cocos2dx_network_manual.cpp">
<Filter>manual\network</Filter>
</ClCompile>
<ClCompile Include="..\manual\network\lua_extensions.c">
<Filter>manual\network</Filter>
</ClCompile>
<ClCompile Include="..\manual\network\Lua_web_socket.cpp">
<Filter>manual\network</Filter>
</ClCompile>
<ClCompile Include="..\manual\network\lua_xml_http_request.cpp">
<Filter>manual\network</Filter>
</ClCompile>
<ClCompile Include="..\manual\spine\lua_cocos2dx_spine_manual.cpp">
<Filter>manual\spine</Filter>
</ClCompile>
<ClCompile Include="..\manual\spine\LuaSkeletonAnimation.cpp">
<Filter>manual\spine</Filter>
</ClCompile>
<ClCompile Include="..\manual\ui\lua_cocos2dx_experimental_video_manual.cpp">
<Filter>manual\ui</Filter>
</ClCompile>
<ClCompile Include="..\manual\ui\lua_cocos2dx_ui_manual.cpp">
<Filter>manual\ui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\auxiliar.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\buffer.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\except.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\inet.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\io.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\luasocket.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\mime.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\options.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\select.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\tcp.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\timeout.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\udp.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\wsocket.c">
<Filter>luasocket</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\auto\lua_cocos2dx_auto.hpp">
@ -161,46 +314,217 @@
<ClInclude Include="..\auto\lua_cocos2dx_physics_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\auto\lua_cocos2dx_3d_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\auto\lua_cocos2dx_cocosbuilder_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\auto\lua_cocos2dx_cocosdenshion_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\auto\lua_cocos2dx_experimental_video_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\auto\lua_cocos2dx_extension_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\auto\lua_cocos2dx_spine_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\auto\lua_cocos2dx_studio_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\auto\lua_cocos2dx_ui_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\manual\3d\lua_cocos2dx_3d_manual.h">
<Filter>manual\3d</Filter>
</ClInclude>
<ClInclude Include="..\manual\cocosdenshion\lua_cocos2dx_cocosdenshion_manual.h">
<Filter>manual\cocosdenshion</Filter>
</ClInclude>
<ClInclude Include="..\manual\cocosbuilder\CCBProxy.h">
<Filter>manual\cocosbuilder</Filter>
</ClInclude>
<ClInclude Include="..\manual\cocosbuilder\lua_cocos2dx_cocosbuilder_manual.h">
<Filter>manual\cocosbuilder</Filter>
</ClInclude>
<ClInclude Include="..\manual\cocostudio\lua_cocos2dx_coco_studio_manual.hpp">
<Filter>manual\cocostudio</Filter>
</ClInclude>
<ClInclude Include="..\manual\extension\lua_cocos2dx_extension_manual.h">
<Filter>manual\extension</Filter>
</ClInclude>
<ClInclude Include="..\manual\network\lua_cocos2dx_network_manual.h">
<Filter>manual\network</Filter>
</ClInclude>
<ClInclude Include="..\manual\network\lua_extensions.h">
<Filter>manual\network</Filter>
</ClInclude>
<ClInclude Include="..\manual\network\Lua_web_socket.h">
<Filter>manual\network</Filter>
</ClInclude>
<ClInclude Include="..\manual\network\lua_xml_http_request.h">
<Filter>manual\network</Filter>
</ClInclude>
<ClInclude Include="..\manual\spine\lua_cocos2dx_spine_manual.hpp">
<Filter>manual\spine</Filter>
</ClInclude>
<ClInclude Include="..\manual\spine\LuaSkeletonAnimation.h">
<Filter>manual\spine</Filter>
</ClInclude>
<ClInclude Include="..\manual\ui\lua_cocos2dx_experimental_video_manual.hpp">
<Filter>manual\ui</Filter>
</ClInclude>
<ClInclude Include="..\manual\ui\lua_cocos2dx_ui_manual.hpp">
<Filter>manual\ui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\auxiliar.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\buffer.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\except.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\inet.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\io.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\luasocket.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\mime.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\options.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\select.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\socket.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\tcp.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\timeout.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\udp.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\wsocket.h">
<Filter>luasocket</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\script\Cocos2dConstants.lua">
<Filter>script</Filter>
<None Include="..\script\CCBReaderLoad.lua">
<Filter>script\cocosbuilder</Filter>
</None>
<None Include="..\script\DeprecatedOpenglEnum.lua">
<Filter>script</Filter>
<None Include="..\script\DeprecatedCocosBuilderClass.lua">
<Filter>script\cocosbuilder</Filter>
</None>
<None Include="..\script\DrawPrimitives.lua">
<Filter>script</Filter>
<None Include="..\script\DeprecatedCocosDenshionClass.lua">
<Filter>script\cocosdenshion</Filter>
</None>
<None Include="..\script\extern.lua">
<Filter>script</Filter>
<None Include="..\script\AudioEngine.lua">
<Filter>script\cocosdenshion</Filter>
</None>
<None Include="..\script\json.lua">
<Filter>script</Filter>
<None Include="..\script\DeprecatedCocosDenshionFunc.lua">
<Filter>script\cocosdenshion</Filter>
</None>
<None Include="..\script\luaj.lua">
<Filter>script</Filter>
<None Include="..\script\DeprecatedCocoStudioClass.lua">
<Filter>script\cocostudio</Filter>
</None>
<None Include="..\script\luaoc.lua">
<Filter>script</Filter>
<None Include="..\script\DeprecatedCocoStudioFunc.lua">
<Filter>script\cocostudio</Filter>
</None>
<None Include="..\script\Opengl.lua">
<Filter>script</Filter>
<None Include="..\script\StudioConstants.lua">
<Filter>script\cocostudio</Filter>
</None>
<None Include="..\script\OpenglConstants.lua">
<Filter>script</Filter>
<None Include="..\script\DeprecatedExtensionClass.lua">
<Filter>script\extension</Filter>
</None>
<None Include="..\script\Cocos2d.lua">
<Filter>script</Filter>
<None Include="..\script\DeprecatedExtensionEnum.lua">
<Filter>script\extension</Filter>
</None>
<None Include="..\script\DeprecatedCocos2dClass.lua">
<Filter>script</Filter>
<None Include="..\script\DeprecatedExtensionFunc.lua">
<Filter>script\extension</Filter>
</None>
<None Include="..\script\DeprecatedCocos2dEnum.lua">
<Filter>script</Filter>
<None Include="..\script\ExtensionConstants.lua">
<Filter>script\extension</Filter>
</None>
<None Include="..\script\DeprecatedCocos2dFunc.lua">
<Filter>script</Filter>
<None Include="..\script\cocos2d\bitExtend.lua">
<Filter>script\cocos2d</Filter>
</None>
<None Include="..\script\cocos2d\Cocos2d.lua">
<Filter>script\cocos2d</Filter>
</None>
<None Include="..\script\cocos2d\Cocos2dConstants.lua">
<Filter>script\cocos2d</Filter>
</None>
<None Include="..\script\cocos2d\DeprecatedCocos2dClass.lua">
<Filter>script\cocos2d</Filter>
</None>
<None Include="..\script\cocos2d\DeprecatedCocos2dEnum.lua">
<Filter>script\cocos2d</Filter>
</None>
<None Include="..\script\cocos2d\DeprecatedCocos2dFunc.lua">
<Filter>script\cocos2d</Filter>
</None>
<None Include="..\script\cocos2d\DeprecatedOpenglEnum.lua">
<Filter>script\cocos2d</Filter>
</None>
<None Include="..\script\cocos2d\DrawPrimitives.lua">
<Filter>script\cocos2d</Filter>
</None>
<None Include="..\script\cocos2d\extern.lua">
<Filter>script\cocos2d</Filter>
</None>
<None Include="..\script\cocos2d\json.lua">
<Filter>script\cocos2d</Filter>
</None>
<None Include="..\script\cocos2d\luaj.lua">
<Filter>script\cocos2d</Filter>
</None>
<None Include="..\script\cocos2d\luaoc.lua">
<Filter>script\cocos2d</Filter>
</None>
<None Include="..\script\cocos2d\Opengl.lua">
<Filter>script\cocos2d</Filter>
</None>
<None Include="..\script\cocos2d\OpenglConstants.lua">
<Filter>script\cocos2d</Filter>
</None>
<None Include="..\script\network\DeprecatedNetworkClass.lua">
<Filter>script\network</Filter>
</None>
<None Include="..\script\network\DeprecatedNetworkEnum.lua">
<Filter>script\network</Filter>
</None>
<None Include="..\script\network\DeprecatedNetworkFunc.lua">
<Filter>script\network</Filter>
</None>
<None Include="..\script\network\NetworkConstants.lua">
<Filter>script\network</Filter>
</None>
<None Include="..\script\ui\DeprecatedUIEnum.lua">
<Filter>script\ui</Filter>
</None>
<None Include="..\script\ui\DeprecatedUIFunc.lua">
<Filter>script\ui</Filter>
</None>
<None Include="..\script\ui\experimentalUIConstants.lua">
<Filter>script\ui</Filter>
</None>
<None Include="..\script\ui\GuiConstants.lua">
<Filter>script\ui</Filter>
</None>
</ItemGroup>
</Project>

View File

@ -1,147 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\auto\lua_cocos2dx_3d_auto.cpp" />
<ClCompile Include="..\manual\3d\lua_cocos2dx_3d_manual.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\auto\lua_cocos2dx_3d_auto.hpp" />
<ClInclude Include="..\manual\3d\lua_cocos2dx_3d_manual.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\3d\proj.win32\libcocos3d.vcxproj">
<Project>{e24950fa-5bc1-4aee-a900-4f0259354bf0}</Project>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{06840490-14A4-43D6-88BC-AAFA44D043EB}</ProjectGuid>
<RootNamespace>libluacocos3d</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\2d\cocos2d_headers.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\2d\cocos2d_headers.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration).win32\$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\$(ProjectName)\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(EngineRoot)cocos\3d;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\manual\3d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<DisableSpecificWarnings>4800;4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MinSpace</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(EngineRoot)cocos\3d;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\manual\3d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>None</DebugInformationFormat>
<DisableSpecificWarnings>4800;4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Lib>
<AdditionalLibraryDirectories>libcocos2d.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="auto">
<UniqueIdentifier>{8d269c90-26ad-4ce8-b355-d8df01d59914}</UniqueIdentifier>
</Filter>
<Filter Include="manual">
<UniqueIdentifier>{25c7b94b-a9a1-4b93-b285-93c9b620e2ad}</UniqueIdentifier>
</Filter>
<Filter Include="script">
<UniqueIdentifier>{af4b7d5f-f563-4069-ade8-c1a954e6fe5e}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\auto\lua_cocos2dx_3d_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\manual\3d\lua_cocos2dx_3d_manual.cpp">
<Filter>manual</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\auto\lua_cocos2dx_3d_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\manual\3d\lua_cocos2dx_3d_manual.h">
<Filter>manual</Filter>
</ClInclude>
</ItemGroup>
</Project>

View File

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

View File

@ -1,153 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\auto\lua_cocos2dx_cocosbuilder_auto.cpp" />
<ClCompile Include="..\manual\cocosbuilder\CCBProxy.cpp" />
<ClCompile Include="..\manual\cocosbuilder\lua_cocos2dx_cocosbuilder_manual.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\auto\lua_cocos2dx_cocosbuilder_auto.hpp" />
<ClInclude Include="..\manual\cocosbuilder\CCBProxy.h" />
<ClInclude Include="..\manual\cocosbuilder\lua_cocos2dx_cocosbuilder_manual.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\script\CCBReaderLoad.lua" />
<None Include="..\script\DeprecatedCocosBuilderClass.lua" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\editor-support\cocosbuilder\proj.win32\libcocosbuilder.vcxproj">
<Project>{811c0dab-7b96-4bd3-a154-b7572b58e4ab}</Project>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{F8198014-F4F3-49F0-88AB-C1969A5829AF}</ProjectGuid>
<RootNamespace>libluacocosbuilder</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\2d\cocos2d_headers.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\2d\cocos2d_headers.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration).win32\$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\$(ProjectName)\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<DisableSpecificWarnings>4800;4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MinSpace</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>None</DebugInformationFormat>
<DisableSpecificWarnings>4800;4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Lib>
<AdditionalLibraryDirectories>libcocos2d.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@ -1,47 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="auto">
<UniqueIdentifier>{8d269c90-26ad-4ce8-b355-d8df01d59914}</UniqueIdentifier>
</Filter>
<Filter Include="manual">
<UniqueIdentifier>{25c7b94b-a9a1-4b93-b285-93c9b620e2ad}</UniqueIdentifier>
</Filter>
<Filter Include="script">
<UniqueIdentifier>{af4b7d5f-f563-4069-ade8-c1a954e6fe5e}</UniqueIdentifier>
</Filter>
<Filter Include="manual\cocosbuilder">
<UniqueIdentifier>{a70474d7-7a4d-41e4-93de-0a1e24b7ec5c}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\auto\lua_cocos2dx_cocosbuilder_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\manual\cocosbuilder\CCBProxy.cpp">
<Filter>manual\cocosbuilder</Filter>
</ClCompile>
<ClCompile Include="..\manual\cocosbuilder\lua_cocos2dx_cocosbuilder_manual.cpp">
<Filter>manual\cocosbuilder</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\auto\lua_cocos2dx_cocosbuilder_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\manual\cocosbuilder\CCBProxy.h">
<Filter>manual\cocosbuilder</Filter>
</ClInclude>
<ClInclude Include="..\manual\cocosbuilder\lua_cocos2dx_cocosbuilder_manual.h">
<Filter>manual\cocosbuilder</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\script\CCBReaderLoad.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\DeprecatedCocosBuilderClass.lua">
<Filter>script</Filter>
</None>
</ItemGroup>
</Project>

View File

@ -1,152 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<None Include="..\script\AudioEngine.lua" />
<None Include="..\script\DeprecatedCocosDenshionClass.lua" />
<None Include="..\script\DeprecatedCocosDenshionFunc.lua" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\audio\proj.win32\libcocosdenshion.vcxproj">
<Project>{f8edd7fa-9a51-4e80-baeb-860825d2eac6}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\auto\lua_cocos2dx_cocosdenshion_auto.cpp" />
<ClCompile Include="..\manual\cocosdenshion\lua_cocos2dx_cocosdenshion_manual.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\auto\lua_cocos2dx_cocosdenshion_auto.hpp" />
<ClInclude Include="..\manual\cocosdenshion\lua_cocos2dx_cocosdenshion_manual.h" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{46A7D57A-7F25-4F52-823B-FFAC4FF3A624}</ProjectGuid>
<RootNamespace>libluacocosdenshion</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\2d\cocos2d_headers.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\2d\cocos2d_headers.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration).win32\$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\$(ProjectName)\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocosdenshion;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\manual;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<DisableSpecificWarnings>4800;4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MinSpace</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocosdenshion;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\manual;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>None</DebugInformationFormat>
<DisableSpecificWarnings>4800;4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Lib>
<AdditionalLibraryDirectories>libcocos2d.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@ -1,44 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="auto">
<UniqueIdentifier>{8d269c90-26ad-4ce8-b355-d8df01d59914}</UniqueIdentifier>
</Filter>
<Filter Include="manual">
<UniqueIdentifier>{25c7b94b-a9a1-4b93-b285-93c9b620e2ad}</UniqueIdentifier>
</Filter>
<Filter Include="script">
<UniqueIdentifier>{af4b7d5f-f563-4069-ade8-c1a954e6fe5e}</UniqueIdentifier>
</Filter>
<Filter Include="manual\cocosdenshion">
<UniqueIdentifier>{e6ef7820-87ef-4975-a15d-969267d181ad}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="..\script\AudioEngine.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\DeprecatedCocosDenshionClass.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\DeprecatedCocosDenshionFunc.lua">
<Filter>script</Filter>
</None>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\manual\cocosdenshion\lua_cocos2dx_cocosdenshion_manual.cpp">
<Filter>manual\cocosdenshion</Filter>
</ClCompile>
<ClCompile Include="..\auto\lua_cocos2dx_cocosdenshion_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\manual\cocosdenshion\lua_cocos2dx_cocosdenshion_manual.h">
<Filter>manual\cocosdenshion</Filter>
</ClInclude>
<ClInclude Include="..\auto\lua_cocos2dx_cocosdenshion_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
</ItemGroup>
</Project>

View File

@ -1,152 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\auto\lua_cocos2dx_studio_auto.cpp" />
<ClCompile Include="..\manual\cocostudio\lua_cocos2dx_coco_studio_manual.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\auto\lua_cocos2dx_studio_auto.hpp" />
<ClInclude Include="..\manual\cocostudio\lua_cocos2dx_coco_studio_manual.hpp" />
</ItemGroup>
<ItemGroup>
<None Include="..\script\DeprecatedCocoStudioClass.lua" />
<None Include="..\script\DeprecatedCocoStudioFunc.lua" />
<None Include="..\script\StudioConstants.lua" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\editor-support\cocostudio\proj.win32\libcocostudio.vcxproj">
<Project>{b57cf53f-2e49-4031-9822-047cc0e6bde2}</Project>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{9640951E-C5D0-47B5-9C42-0BCADA261C50}</ProjectGuid>
<RootNamespace>libluacocostudio</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\2d\cocos2d_headers.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\2d\cocos2d_headers.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration).win32\$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\$(ProjectName)\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)external;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<DisableSpecificWarnings>4800;4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MinSpace</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)external;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>None</DebugInformationFormat>
<DisableSpecificWarnings>4800;4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Lib>
<AdditionalLibraryDirectories>libcocos2d.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@ -1,44 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="auto">
<UniqueIdentifier>{8d269c90-26ad-4ce8-b355-d8df01d59914}</UniqueIdentifier>
</Filter>
<Filter Include="manual">
<UniqueIdentifier>{25c7b94b-a9a1-4b93-b285-93c9b620e2ad}</UniqueIdentifier>
</Filter>
<Filter Include="script">
<UniqueIdentifier>{af4b7d5f-f563-4069-ade8-c1a954e6fe5e}</UniqueIdentifier>
</Filter>
<Filter Include="manual\cocostudio">
<UniqueIdentifier>{900827d1-f640-4a49-b4bd-34c6d4a4b8b5}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\auto\lua_cocos2dx_studio_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\manual\cocostudio\lua_cocos2dx_coco_studio_manual.cpp">
<Filter>manual\cocostudio</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\auto\lua_cocos2dx_studio_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\manual\cocostudio\lua_cocos2dx_coco_studio_manual.hpp">
<Filter>manual\cocostudio</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\script\DeprecatedCocoStudioClass.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\DeprecatedCocoStudioFunc.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\StudioConstants.lua">
<Filter>script</Filter>
</None>
</ItemGroup>
</Project>

View File

@ -1,153 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\auto\lua_cocos2dx_extension_auto.cpp" />
<ClCompile Include="..\manual\extension\lua_cocos2dx_extension_manual.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\auto\lua_cocos2dx_extension_auto.hpp" />
<ClInclude Include="..\manual\extension\lua_cocos2dx_extension_manual.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\script\DeprecatedExtensionClass.lua" />
<None Include="..\script\DeprecatedExtensionEnum.lua" />
<None Include="..\script\DeprecatedExtensionFunc.lua" />
<None Include="..\script\ExtensionConstants.lua" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\extensions\proj.win32\libextension.vcxproj">
<Project>{21b2c324-891f-48ea-ad1a-5ae13de12e28}</Project>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{7068296E-38A4-4BCA-85DB-3A09BD014847}</ProjectGuid>
<RootNamespace>libluaextension</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\2d\cocos2d_headers.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\2d\cocos2d_headers.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration).win32\$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\$(ProjectName)\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<DisableSpecificWarnings>4800;4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MinSpace</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>None</DebugInformationFormat>
<DisableSpecificWarnings>4800;4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Lib>
<AdditionalLibraryDirectories>libcocos2d.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@ -1,47 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="auto">
<UniqueIdentifier>{8d269c90-26ad-4ce8-b355-d8df01d59914}</UniqueIdentifier>
</Filter>
<Filter Include="manual">
<UniqueIdentifier>{25c7b94b-a9a1-4b93-b285-93c9b620e2ad}</UniqueIdentifier>
</Filter>
<Filter Include="script">
<UniqueIdentifier>{af4b7d5f-f563-4069-ade8-c1a954e6fe5e}</UniqueIdentifier>
</Filter>
<Filter Include="manual\extension">
<UniqueIdentifier>{af407ec6-3b69-4f0f-a053-6f68467c82e9}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\auto\lua_cocos2dx_extension_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\manual\extension\lua_cocos2dx_extension_manual.cpp">
<Filter>manual\extension</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\auto\lua_cocos2dx_extension_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\manual\extension\lua_cocos2dx_extension_manual.h">
<Filter>manual\extension</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\script\DeprecatedExtensionClass.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\DeprecatedExtensionEnum.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\DeprecatedExtensionFunc.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\ExtensionConstants.lua">
<Filter>script</Filter>
</None>
</ItemGroup>
</Project>

View File

@ -1,178 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\external\lua\luasocket\auxiliar.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\buffer.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\except.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\inet.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\io.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\luasocket.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\mime.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\options.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\select.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\tcp.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\timeout.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\udp.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\wsocket.c" />
<ClCompile Include="..\manual\network\lua_cocos2dx_network_manual.cpp" />
<ClCompile Include="..\manual\network\lua_extensions.c" />
<ClCompile Include="..\manual\network\Lua_web_socket.cpp" />
<ClCompile Include="..\manual\network\lua_xml_http_request.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\external\lua\luasocket\auxiliar.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\buffer.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\except.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\inet.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\io.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\luasocket.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\mime.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\options.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\select.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\socket.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\tcp.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\timeout.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\udp.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\wsocket.h" />
<ClInclude Include="..\manual\network\lua_cocos2dx_network_manual.h" />
<ClInclude Include="..\manual\network\lua_extensions.h" />
<ClInclude Include="..\manual\network\Lua_web_socket.h" />
<ClInclude Include="..\manual\network\lua_xml_http_request.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\network\proj.win32\libNetwork.vcxproj">
<Project>{df2638c0-8128-4847-867c-6eafe3dee7b5}</Project>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{65E52F4B-703F-419E-AD67-926241A10042}</ProjectGuid>
<RootNamespace>libluacocosdenshion</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\2d\cocos2d_headers.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\2d\cocos2d_headers.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration).win32\$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\$(ProjectName)\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)extensions\network;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)external\lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<DisableSpecificWarnings>4800;4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MinSpace</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)extensions\network;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)external\lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>None</DebugInformationFormat>
<DisableSpecificWarnings>4800;4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Lib>
<AdditionalLibraryDirectories>libcocos2d.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@ -1,126 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="manual">
<UniqueIdentifier>{25c7b94b-a9a1-4b93-b285-93c9b620e2ad}</UniqueIdentifier>
</Filter>
<Filter Include="script">
<UniqueIdentifier>{af4b7d5f-f563-4069-ade8-c1a954e6fe5e}</UniqueIdentifier>
</Filter>
<Filter Include="manual\network">
<UniqueIdentifier>{633582d6-6f80-4dd1-b719-951e1c1dc6ff}</UniqueIdentifier>
</Filter>
<Filter Include="luasocket">
<UniqueIdentifier>{0c791425-97c1-4eaa-869d-2454d9670a72}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\manual\network\lua_cocos2dx_network_manual.cpp">
<Filter>manual\network</Filter>
</ClCompile>
<ClCompile Include="..\manual\network\lua_extensions.c">
<Filter>manual\network</Filter>
</ClCompile>
<ClCompile Include="..\manual\network\Lua_web_socket.cpp">
<Filter>manual\network</Filter>
</ClCompile>
<ClCompile Include="..\manual\network\lua_xml_http_request.cpp">
<Filter>manual\network</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\auxiliar.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\buffer.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\except.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\inet.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\io.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\luasocket.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\mime.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\options.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\select.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\tcp.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\timeout.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\udp.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\wsocket.c">
<Filter>luasocket</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\manual\network\lua_cocos2dx_network_manual.h">
<Filter>manual\network</Filter>
</ClInclude>
<ClInclude Include="..\manual\network\lua_extensions.h">
<Filter>manual\network</Filter>
</ClInclude>
<ClInclude Include="..\manual\network\Lua_web_socket.h">
<Filter>manual\network</Filter>
</ClInclude>
<ClInclude Include="..\manual\network\lua_xml_http_request.h">
<Filter>manual\network</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\auxiliar.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\buffer.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\except.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\inet.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\io.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\luasocket.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\mime.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\options.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\select.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\socket.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\tcp.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\timeout.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\udp.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\wsocket.h">
<Filter>luasocket</Filter>
</ClInclude>
</ItemGroup>
</Project>

View File

@ -1,149 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\auto\lua_cocos2dx_spine_auto.cpp" />
<ClCompile Include="..\manual\spine\LuaSkeletonAnimation.cpp" />
<ClCompile Include="..\manual\spine\lua_cocos2dx_spine_manual.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\auto\lua_cocos2dx_spine_auto.hpp" />
<ClInclude Include="..\manual\spine\LuaSkeletonAnimation.h" />
<ClInclude Include="..\manual\spine\lua_cocos2dx_spine_manual.hpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\editor-support\spine\proj.win32\libspine.vcxproj">
<Project>{b7c2a162-dec9-4418-972e-240ab3cbfcae}</Project>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}</ProjectGuid>
<RootNamespace>libluaextension</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\2d\cocos2d_headers.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\2d\cocos2d_headers.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration).win32\luaspine</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\luaspine</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\spine;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<DisableSpecificWarnings>4800;4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MinSpace</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\spine;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>None</DebugInformationFormat>
<DisableSpecificWarnings>4800;4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Lib>
<AdditionalLibraryDirectories>libcocos2d.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@ -1,33 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="auto">
<UniqueIdentifier>{8d269c90-26ad-4ce8-b355-d8df01d59914}</UniqueIdentifier>
</Filter>
<Filter Include="manual">
<UniqueIdentifier>{25c7b94b-a9a1-4b93-b285-93c9b620e2ad}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\auto\lua_cocos2dx_spine_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\manual\spine\lua_cocos2dx_spine_manual.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\spine\LuaSkeletonAnimation.cpp">
<Filter>manual</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\auto\lua_cocos2dx_spine_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\manual\spine\lua_cocos2dx_spine_manual.hpp">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\spine\LuaSkeletonAnimation.h">
<Filter>manual</Filter>
</ClInclude>
</ItemGroup>
</Project>

View File

@ -1,156 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\auto\lua_cocos2dx_experimental_video_auto.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_ui_auto.cpp" />
<ClCompile Include="..\manual\ui\lua_cocos2dx_experimental_video_manual.cpp" />
<ClCompile Include="..\manual\ui\lua_cocos2dx_ui_manual.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\auto\lua_cocos2dx_experimental_video_auto.hpp" />
<ClInclude Include="..\auto\lua_cocos2dx_ui_auto.hpp" />
<ClInclude Include="..\manual\ui\lua_cocos2dx_experimental_video_manual.hpp" />
<ClInclude Include="..\manual\ui\lua_cocos2dx_ui_manual.hpp" />
</ItemGroup>
<ItemGroup>
<None Include="..\script\DeprecatedUIEnum.lua" />
<None Include="..\script\DeprecatedUIFunc.lua" />
<None Include="..\script\GuiConstants.lua" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\ui\proj.win32\libui.vcxproj">
<Project>{7e06e92c-537a-442b-9e4a-4761c84f8a1a}</Project>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}</ProjectGuid>
<RootNamespace>libluaui</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\2d\cocos2d_headers.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\2d\cocos2d_headers.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration).win32\luaui</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\luaui</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(EngineRoot)cocos\ui;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\ui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<DisableSpecificWarnings>4800;4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MinSpace</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(EngineRoot)cocos\ui;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\ui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>None</DebugInformationFormat>
<DisableSpecificWarnings>4800;4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Lib>
<AdditionalLibraryDirectories>libcocos2d.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@ -1,53 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="auto">
<UniqueIdentifier>{8d269c90-26ad-4ce8-b355-d8df01d59914}</UniqueIdentifier>
</Filter>
<Filter Include="manual">
<UniqueIdentifier>{25c7b94b-a9a1-4b93-b285-93c9b620e2ad}</UniqueIdentifier>
</Filter>
<Filter Include="script">
<UniqueIdentifier>{af4b7d5f-f563-4069-ade8-c1a954e6fe5e}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\auto\lua_cocos2dx_experimental_video_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\auto\lua_cocos2dx_ui_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\manual\ui\lua_cocos2dx_experimental_video_manual.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\ui\lua_cocos2dx_ui_manual.cpp">
<Filter>manual</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\auto\lua_cocos2dx_experimental_video_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\auto\lua_cocos2dx_ui_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\manual\ui\lua_cocos2dx_experimental_video_manual.hpp">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\ui\lua_cocos2dx_ui_manual.hpp">
<Filter>manual</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\script\DeprecatedUIEnum.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\DeprecatedUIFunc.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\GuiConstants.lua">
<Filter>script</Filter>
</None>
</ItemGroup>
</Project>

View File

@ -1,13 +0,0 @@
set(COCOS_STORAGE_SRC
local-storage/LocalStorage.cpp
)
add_library(sqlite3 STATIC
${COCOS_STORAGE_SRC}
)
set_target_properties(sqlite3
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)

View File

@ -1,46 +0,0 @@
set(COCOS_UI_SRC
CocosGUI.cpp
UIButton.cpp
UICheckBox.cpp
UIHBox.cpp
UIHelper.cpp
UIImageView.cpp
UILayout.cpp
UILayoutParameter.cpp
UILayoutManager.cpp
UIListView.cpp
UILoadingBar.cpp
UIPageView.cpp
UIRelativeBox.cpp
UIRichText.cpp
UIScrollView.cpp
UISlider.cpp
UITextAtlas.cpp
UITextBMFont.cpp
UIText.cpp
UITextField.cpp
UIVBox.cpp
UIWidget.cpp
UIDeprecated.cpp
UIScale9Sprite.cpp
)
include_directories(
ui
../../base
)
add_library(ui STATIC
${COCOS_UI_SRC}
)
target_link_libraries(ui
cocos2d
)
set_target_properties(ui
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)

View File

@ -11,62 +11,6 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\CocosGUI.h" />
<ClInclude Include="..\GUIExport.h" />
<ClInclude Include="..\UIButton.h" />
<ClInclude Include="..\UICheckBox.h" />
<ClInclude Include="..\UIDeprecated.h" />
<ClInclude Include="..\UIHBox.h" />
<ClInclude Include="..\UIHelper.h" />
<ClInclude Include="..\UIImageView.h" />
<ClInclude Include="..\UILayout.h" />
<ClInclude Include="..\UILayoutManager.h" />
<ClInclude Include="..\UILayoutParameter.h" />
<ClInclude Include="..\UIListView.h" />
<ClInclude Include="..\UILoadingBar.h" />
<ClInclude Include="..\UIPageView.h" />
<ClInclude Include="..\UIRelativeBox.h" />
<ClInclude Include="..\UIRichText.h" />
<ClInclude Include="..\UIScale9Sprite.h" />
<ClInclude Include="..\UIScrollView.h" />
<ClInclude Include="..\UISlider.h" />
<ClInclude Include="..\UIText.h" />
<ClInclude Include="..\UITextAtlas.h" />
<ClInclude Include="..\UITextBMFont.h" />
<ClInclude Include="..\UITextField.h" />
<ClInclude Include="..\UIVBox.h" />
<ClInclude Include="..\UIWidget.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\CocosGUI.cpp" />
<ClCompile Include="..\UIButton.cpp" />
<ClCompile Include="..\UICheckBox.cpp" />
<ClCompile Include="..\UIDeprecated.cpp" />
<ClCompile Include="..\UIHBox.cpp" />
<ClCompile Include="..\UIHelper.cpp" />
<ClCompile Include="..\UIImageView.cpp" />
<ClCompile Include="..\UILayout.cpp" />
<ClCompile Include="..\UILayoutManager.cpp" />
<ClCompile Include="..\UILayoutParameter.cpp" />
<ClCompile Include="..\UIListView.cpp" />
<ClCompile Include="..\UILoadingBar.cpp" />
<ClCompile Include="..\UIPageView.cpp" />
<ClCompile Include="..\UIRelativeBox.cpp" />
<ClCompile Include="..\UIRichText.cpp" />
<ClCompile Include="..\UIScale9Sprite.cpp" />
<ClCompile Include="..\UIScrollView.cpp" />
<ClCompile Include="..\UISlider.cpp" />
<ClCompile Include="..\UIText.cpp" />
<ClCompile Include="..\UITextAtlas.cpp" />
<ClCompile Include="..\UITextBMFont.cpp" />
<ClCompile Include="..\UITextField.cpp" />
<ClCompile Include="..\UIVBox.cpp" />
<ClCompile Include="..\UIWidget.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\extensions\proj.win32\libextension.vcxproj">
<Project>{21b2c324-891f-48ea-ad1a-5ae13de12e28}</Project>
</ProjectReference>
<ProjectReference Include="..\..\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
</ProjectReference>

View File

@ -1,171 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="BaseClasses">
<UniqueIdentifier>{e31ab7d3-b8b2-467f-9e08-fd5fe168b491}</UniqueIdentifier>
</Filter>
<Filter Include="Layouts">
<UniqueIdentifier>{f9d13563-9e5e-4b35-b0e7-d41f587efa42}</UniqueIdentifier>
</Filter>
<Filter Include="System">
<UniqueIdentifier>{ed8a2ae0-5690-4d0d-829b-7c07164c0597}</UniqueIdentifier>
</Filter>
<Filter Include="UIWidgets">
<UniqueIdentifier>{5f6e9e52-fbe7-4073-ac71-98632f9e6781}</UniqueIdentifier>
</Filter>
<Filter Include="UIWidgets\ScrollWidget">
<UniqueIdentifier>{b59b178a-b7e0-4826-ba07-44c46cd29a10}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\UIScrollView.h">
<Filter>UIWidgets\ScrollWidget</Filter>
</ClInclude>
<ClInclude Include="..\UIListView.h">
<Filter>UIWidgets\ScrollWidget</Filter>
</ClInclude>
<ClInclude Include="..\UIPageView.h">
<Filter>UIWidgets\ScrollWidget</Filter>
</ClInclude>
<ClInclude Include="..\UIButton.h">
<Filter>UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\UICheckBox.h">
<Filter>UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\UIImageView.h">
<Filter>UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\UISlider.h">
<Filter>UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\UITextField.h">
<Filter>UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\UILoadingBar.h">
<Filter>UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\UIHelper.h">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="..\CocosGUI.h">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="..\UIWidget.h">
<Filter>BaseClasses</Filter>
</ClInclude>
<ClInclude Include="..\UILayout.h">
<Filter>Layouts</Filter>
</ClInclude>
<ClInclude Include="..\UILayoutParameter.h">
<Filter>Layouts</Filter>
</ClInclude>
<ClInclude Include="..\UITextBMFont.h">
<Filter>UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\UIText.h">
<Filter>UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\UITextAtlas.h">
<Filter>UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\UIRichText.h">
<Filter>UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\UIHBox.h">
<Filter>Layouts</Filter>
</ClInclude>
<ClInclude Include="..\UIRelativeBox.h">
<Filter>Layouts</Filter>
</ClInclude>
<ClInclude Include="..\UIVBox.h">
<Filter>Layouts</Filter>
</ClInclude>
<ClInclude Include="..\UILayoutManager.h">
<Filter>Layouts</Filter>
</ClInclude>
<ClInclude Include="..\UIDeprecated.h">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="..\GUIExport.h">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="..\UIScale9Sprite.h">
<Filter>BaseClasses</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\UIScrollView.cpp">
<Filter>UIWidgets\ScrollWidget</Filter>
</ClCompile>
<ClCompile Include="..\UIListView.cpp">
<Filter>UIWidgets\ScrollWidget</Filter>
</ClCompile>
<ClCompile Include="..\UIPageView.cpp">
<Filter>UIWidgets\ScrollWidget</Filter>
</ClCompile>
<ClCompile Include="..\UIButton.cpp">
<Filter>UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\UICheckBox.cpp">
<Filter>UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\UIImageView.cpp">
<Filter>UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\UISlider.cpp">
<Filter>UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\UITextField.cpp">
<Filter>UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\UILoadingBar.cpp">
<Filter>UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\UIHelper.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="..\CocosGUI.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="..\UIWidget.cpp">
<Filter>BaseClasses</Filter>
</ClCompile>
<ClCompile Include="..\UILayout.cpp">
<Filter>Layouts</Filter>
</ClCompile>
<ClCompile Include="..\UILayoutParameter.cpp">
<Filter>Layouts</Filter>
</ClCompile>
<ClCompile Include="..\UITextBMFont.cpp">
<Filter>UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\UIText.cpp">
<Filter>UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\UITextAtlas.cpp">
<Filter>UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\UIRichText.cpp">
<Filter>UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\UIHBox.cpp">
<Filter>Layouts</Filter>
</ClCompile>
<ClCompile Include="..\UIRelativeBox.cpp">
<Filter>Layouts</Filter>
</ClCompile>
<ClCompile Include="..\UIVBox.cpp">
<Filter>Layouts</Filter>
</ClCompile>
<ClCompile Include="..\UILayoutManager.cpp">
<Filter>Layouts</Filter>
</ClCompile>
<ClCompile Include="..\UIDeprecated.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="..\UIScale9Sprite.cpp">
<Filter>BaseClasses</Filter>
</ClCompile>
</ItemGroup>
</Project>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />

View File

@ -2,7 +2,7 @@
**Table of Contents** *generated with [DocToc](http://doctoc.herokuapp.com/)*
- [cocos2d-x v3.2 Release Notes](#user-content-cocos2d-x-v32-release-notes)
- [cocos2d-x v3.3alpha0 Release Notes](#user-content-cocos2d-x-v33alpha0-release-notes)
- [Misc Information](#user-content-misc-information)
- [Requirements](#user-content-requirements)
- [Runtime Requirements](#user-content-runtime-requirements)
@ -13,18 +13,19 @@
- [Windows](#user-content-windows)
- [Linux](#user-content-linux)
- [How to start a new game](#user-content-how-to-start-a-new-game)
- [Highlights of v3.2](#user-content-highlights-of-v32)
- [Documents](#user-content-documents)
- [Toolchain requirement changed](#user-content-toolchain-requirement-changed)
- [atof issue on Android](#user-content-atof-issue-on-android)
- [Highlights of v3.3alpha0](#user-content-highlights-of-v33alpha0)
- [Features in detail](#user-content-features-in-detail)
- [Sprite3D & Animation3D](#user-content-sprite3d--animation3d)
- [fbx-conv usage](#user-content-fbx-conv-usage)
- [Game controller](#user-content-game-controller)
- [Fast tilemap](#user-content-fast-tilemap)
- [Node::enumerateChildren](#user-content-nodeenumeratechildren)
- [utils::findChildren](#user-content-utilsfindchildren)
- [Node::setNormalizedPosition](#user-content-nodesetnormalizedposition)
- [Camera](#user-content-camera)
- [Reskin](#user-content-reskin)
- [Attachment](#user-content-attachment)
- [Better support for FBX](#user-content-better-support-for-fbx)
- [New fbx-conv](#user-content-new-fbx-conv)
- [AABB, OBB and Ray](#user-content-aabb-obb-and-ray)
- [ui::Scale9Sprite](#user-content-uiscale9sprite)
- [c++11 random support](#user-content-c11-random-support)
- [RenderTexture save function](#user-content-rendertexture-save-function)
- [Primitive](#user-content-primitive)
- [Consistent way to set GL context attributes](#user-content-consistent-way-to-set-gl-context-attributes)
# Misc Information
@ -125,6 +126,7 @@ Please refer to this document: [ReadMe](../README.md)
* RenderTexture: added a call back function for `saveToFile()`
* Primitive: Support Points, Lines and Triagles for rendering
* SpriteFrameCache: support loading from plist file content data
* Added a consistent way to set GL context attributes for all platforms
* Many other small features added and many bugs fixed
# Features in detail
@ -327,3 +329,18 @@ Primitive supports three typs of primitives (POINTS, LINES, TRIANGLES), vertex a
1. The size of vertex and index Buffer is fixed, which means data must be pre allocated.
2. Batching is not supported.
## Consistent way to set GL context attributes
Now you can set GL context attributes by override `Application::initGLContextAttrs()`, then set GL context attributes there.
```c++
void AppDelegate::initGLContextAttrs()
{
// r:8 g:8 a:8 depth:24 stencil:8
GLContextAttrs glContextAttrs = {8, 8, 8, 8, 24, 8};
GLView::setGLContextAttrs(glContextAttrs);
}
```
Now can only support setting bits of `r`, `g`, `b`, `a`, `depth buffer` and `stencil buffer`. We will support other attributes if needed.

View File

@ -111,57 +111,6 @@
<AdditionalDependencies>libcocos2d.lib;opengl32.lib;glew32.lib;libcurl_imp.lib;libchipmunk.lib;libBox2D.lib;glfw3.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\assets-manager\AssetsManager.cpp" />
<ClCompile Include="..\GUI\CCControlExtension\CCControl.cpp" />
<ClCompile Include="..\GUI\CCControlExtension\CCControlButton.cpp" />
<ClCompile Include="..\GUI\CCControlExtension\CCControlColourPicker.cpp" />
<ClCompile Include="..\GUI\CCControlExtension\CCControlHuePicker.cpp" />
<ClCompile Include="..\GUI\CCControlExtension\CCControlPotentiometer.cpp" />
<ClCompile Include="..\GUI\CCControlExtension\CCControlSaturationBrightnessPicker.cpp" />
<ClCompile Include="..\GUI\CCControlExtension\CCControlSlider.cpp" />
<ClCompile Include="..\GUI\CCControlExtension\CCControlStepper.cpp" />
<ClCompile Include="..\GUI\CCControlExtension\CCControlSwitch.cpp" />
<ClCompile Include="..\GUI\CCControlExtension\CCControlUtils.cpp" />
<ClCompile Include="..\GUI\CCControlExtension\CCInvocation.cpp" />
<ClCompile Include="..\GUI\CCControlExtension\CCScale9Sprite.cpp" />
<ClCompile Include="..\GUI\CCEditBox\CCEditBox.cpp" />
<ClCompile Include="..\GUI\CCEditBox\CCEditBoxImplWin.cpp" />
<ClCompile Include="..\GUI\CCScrollView\CCScrollView.cpp" />
<ClCompile Include="..\GUI\CCScrollView\CCTableView.cpp" />
<ClCompile Include="..\GUI\CCScrollView\CCTableViewCell.cpp" />
<ClCompile Include="..\physics-nodes\CCPhysicsDebugNode.cpp" />
<ClCompile Include="..\physics-nodes\CCPhysicsSprite.cpp" />
<ClCompile Include="Win32InputBox.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\assets-manager\AssetsManager.h" />
<ClInclude Include="..\ExtensionExport.h" />
<ClInclude Include="..\GUI\CCControlExtension\CCControl.h" />
<ClInclude Include="..\GUI\CCControlExtension\CCControlButton.h" />
<ClInclude Include="..\GUI\CCControlExtension\CCControlColourPicker.h" />
<ClInclude Include="..\GUI\CCControlExtension\CCControlExtensions.h" />
<ClInclude Include="..\GUI\CCControlExtension\CCControlHuePicker.h" />
<ClInclude Include="..\GUI\CCControlExtension\CCControlPotentiometer.h" />
<ClInclude Include="..\GUI\CCControlExtension\CCControlSaturationBrightnessPicker.h" />
<ClInclude Include="..\GUI\CCControlExtension\CCControlSlider.h" />
<ClInclude Include="..\GUI\CCControlExtension\CCControlStepper.h" />
<ClInclude Include="..\GUI\CCControlExtension\CCControlSwitch.h" />
<ClInclude Include="..\GUI\CCControlExtension\CCControlUtils.h" />
<ClInclude Include="..\GUI\CCControlExtension\CCInvocation.h" />
<ClInclude Include="..\GUI\CCControlExtension\CCScale9Sprite.h" />
<ClInclude Include="..\GUI\CCEditBox\CCEditBox.h" />
<ClInclude Include="..\GUI\CCEditBox\CCEditBoxImpl.h" />
<ClInclude Include="..\GUI\CCEditBox\CCEditBoxImplWin.h" />
<ClInclude Include="..\GUI\CCScrollView\CCScrollView.h" />
<ClInclude Include="..\cocos-ext.h" />
<ClInclude Include="..\ExtensionMacros.h" />
<ClInclude Include="..\GUI\CCScrollView\CCTableView.h" />
<ClInclude Include="..\GUI\CCScrollView\CCTableViewCell.h" />
<ClInclude Include="..\physics-nodes\CCPhysicsDebugNode.h" />
<ClInclude Include="..\physics-nodes\CCPhysicsSprite.h" />
<ClInclude Include="Win32InputBox.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\cocos\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>

View File

@ -1,162 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="GUI">
<UniqueIdentifier>{202b519b-b5e0-499f-b3b8-ed5da144b248}</UniqueIdentifier>
</Filter>
<Filter Include="GUI\CCControlExtension">
<UniqueIdentifier>{c07abd14-e9dd-4e2d-85c4-a180070161b4}</UniqueIdentifier>
</Filter>
<Filter Include="GUI\CCScrollView">
<UniqueIdentifier>{46797895-f71d-4ddb-b381-d0884e678d39}</UniqueIdentifier>
</Filter>
<Filter Include="physics_nodes">
<UniqueIdentifier>{d5806151-7ae1-4fef-af5a-2fa1d1c7377b}</UniqueIdentifier>
</Filter>
<Filter Include="GUI\CCEditBox">
<UniqueIdentifier>{5d186e3d-0aaf-4904-a5d8-e5cb0f35f4cc}</UniqueIdentifier>
</Filter>
<Filter Include="AssetsManager">
<UniqueIdentifier>{49487dbe-5758-436a-b014-8e2edc6b33ae}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\GUI\CCScrollView\CCScrollView.cpp">
<Filter>GUI\CCScrollView</Filter>
</ClCompile>
<ClCompile Include="..\GUI\CCScrollView\CCTableView.cpp">
<Filter>GUI\CCScrollView</Filter>
</ClCompile>
<ClCompile Include="..\GUI\CCScrollView\CCTableViewCell.cpp">
<Filter>GUI\CCScrollView</Filter>
</ClCompile>
<ClCompile Include="..\GUI\CCControlExtension\CCControlColourPicker.cpp">
<Filter>GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\GUI\CCControlExtension\CCControlHuePicker.cpp">
<Filter>GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\GUI\CCControlExtension\CCControlPotentiometer.cpp">
<Filter>GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\GUI\CCControlExtension\CCControlSaturationBrightnessPicker.cpp">
<Filter>GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\GUI\CCControlExtension\CCControlSlider.cpp">
<Filter>GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\GUI\CCControlExtension\CCControlStepper.cpp">
<Filter>GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\GUI\CCControlExtension\CCControlSwitch.cpp">
<Filter>GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\GUI\CCControlExtension\CCControlUtils.cpp">
<Filter>GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\GUI\CCControlExtension\CCInvocation.cpp">
<Filter>GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\GUI\CCControlExtension\CCScale9Sprite.cpp">
<Filter>GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\GUI\CCControlExtension\CCControl.cpp">
<Filter>GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\GUI\CCControlExtension\CCControlButton.cpp">
<Filter>GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\GUI\CCEditBox\CCEditBoxImplWin.cpp">
<Filter>GUI\CCEditBox</Filter>
</ClCompile>
<ClCompile Include="Win32InputBox.cpp">
<Filter>GUI\CCEditBox</Filter>
</ClCompile>
<ClCompile Include="..\GUI\CCEditBox\CCEditBox.cpp">
<Filter>GUI\CCEditBox</Filter>
</ClCompile>
<ClCompile Include="..\assets-manager\AssetsManager.cpp">
<Filter>AssetsManager</Filter>
</ClCompile>
<ClCompile Include="..\physics-nodes\CCPhysicsDebugNode.cpp">
<Filter>physics_nodes</Filter>
</ClCompile>
<ClCompile Include="..\physics-nodes\CCPhysicsSprite.cpp">
<Filter>physics_nodes</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\GUI\CCScrollView\CCScrollView.h">
<Filter>GUI\CCScrollView</Filter>
</ClInclude>
<ClInclude Include="..\cocos-ext.h" />
<ClInclude Include="..\ExtensionMacros.h" />
<ClInclude Include="..\GUI\CCScrollView\CCTableView.h">
<Filter>GUI\CCScrollView</Filter>
</ClInclude>
<ClInclude Include="..\GUI\CCScrollView\CCTableViewCell.h">
<Filter>GUI\CCScrollView</Filter>
</ClInclude>
<ClInclude Include="..\GUI\CCControlExtension\CCControlButton.h">
<Filter>GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\GUI\CCControlExtension\CCControlColourPicker.h">
<Filter>GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\GUI\CCControlExtension\CCControlExtensions.h">
<Filter>GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\GUI\CCControlExtension\CCControlHuePicker.h">
<Filter>GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\GUI\CCControlExtension\CCControlPotentiometer.h">
<Filter>GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\GUI\CCControlExtension\CCControlSaturationBrightnessPicker.h">
<Filter>GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\GUI\CCControlExtension\CCControlSlider.h">
<Filter>GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\GUI\CCControlExtension\CCControlStepper.h">
<Filter>GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\GUI\CCControlExtension\CCControlSwitch.h">
<Filter>GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\GUI\CCControlExtension\CCControlUtils.h">
<Filter>GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\GUI\CCControlExtension\CCInvocation.h">
<Filter>GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\GUI\CCControlExtension\CCScale9Sprite.h">
<Filter>GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\GUI\CCControlExtension\CCControl.h">
<Filter>GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\GUI\CCEditBox\CCEditBoxImplWin.h">
<Filter>GUI\CCEditBox</Filter>
</ClInclude>
<ClInclude Include="Win32InputBox.h">
<Filter>GUI\CCEditBox</Filter>
</ClInclude>
<ClInclude Include="..\GUI\CCEditBox\CCEditBox.h">
<Filter>GUI\CCEditBox</Filter>
</ClInclude>
<ClInclude Include="..\GUI\CCEditBox\CCEditBoxImpl.h">
<Filter>GUI\CCEditBox</Filter>
</ClInclude>
<ClInclude Include="..\assets-manager\AssetsManager.h">
<Filter>AssetsManager</Filter>
</ClInclude>
<ClInclude Include="..\physics-nodes\CCPhysicsDebugNode.h">
<Filter>physics_nodes</Filter>
</ClInclude>
<ClInclude Include="..\physics-nodes\CCPhysicsSprite.h">
<Filter>physics_nodes</Filter>
</ClInclude>
<ClInclude Include="..\ExtensionExport.h" />
</ItemGroup>
</Project>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />

View File

@ -1,62 +0,0 @@
set(BOX2D_SRC
Collision/Shapes/b2ChainShape.cpp
Collision/Shapes/b2CircleShape.cpp
Collision/Shapes/b2EdgeShape.cpp
Collision/Shapes/b2PolygonShape.cpp
Collision/b2BroadPhase.cpp
Collision/b2CollideCircle.cpp
Collision/b2CollideEdge.cpp
Collision/b2CollidePolygon.cpp
Collision/b2Collision.cpp
Collision/b2Distance.cpp
Collision/b2DynamicTree.cpp
Collision/b2TimeOfImpact.cpp
Common/b2BlockAllocator.cpp
Common/b2Draw.cpp
Common/b2Math.cpp
Common/b2Settings.cpp
Common/b2StackAllocator.cpp
Common/b2Timer.cpp
Dynamics/Contacts/b2ChainAndCircleContact.cpp
Dynamics/Contacts/b2ChainAndPolygonContact.cpp
Dynamics/Contacts/b2CircleContact.cpp
Dynamics/Contacts/b2Contact.cpp
Dynamics/Contacts/b2ContactSolver.cpp
Dynamics/Contacts/b2EdgeAndCircleContact.cpp
Dynamics/Contacts/b2EdgeAndPolygonContact.cpp
Dynamics/Contacts/b2PolygonAndCircleContact.cpp
Dynamics/Contacts/b2PolygonContact.cpp
Dynamics/Joints/b2DistanceJoint.cpp
Dynamics/Joints/b2FrictionJoint.cpp
Dynamics/Joints/b2GearJoint.cpp
Dynamics/Joints/b2Joint.cpp
Dynamics/Joints/b2MouseJoint.cpp
Dynamics/Joints/b2MotorJoint.cpp
Dynamics/Joints/b2PrismaticJoint.cpp
Dynamics/Joints/b2PulleyJoint.cpp
Dynamics/Joints/b2RevoluteJoint.cpp
Dynamics/Joints/b2RopeJoint.cpp
Dynamics/Joints/b2WeldJoint.cpp
Dynamics/Joints/b2WheelJoint.cpp
Dynamics/b2Body.cpp
Dynamics/b2ContactManager.cpp
Dynamics/b2Fixture.cpp
Dynamics/b2Island.cpp
Dynamics/b2World.cpp
Dynamics/b2WorldCallbacks.cpp
Rope/b2Rope.cpp
)
include_directories(
..
)
add_library(box2d STATIC
${BOX2D_SRC}
)
set_target_properties(box2d
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)

View File

@ -10,6 +10,103 @@
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Collision\b2BroadPhase.cpp" />
<ClCompile Include="..\Collision\b2CollideCircle.cpp" />
<ClCompile Include="..\Collision\b2CollideEdge.cpp" />
<ClCompile Include="..\Collision\b2CollidePolygon.cpp" />
<ClCompile Include="..\Collision\b2Collision.cpp" />
<ClCompile Include="..\Collision\b2Distance.cpp" />
<ClCompile Include="..\Collision\b2DynamicTree.cpp" />
<ClCompile Include="..\Collision\b2TimeOfImpact.cpp" />
<ClCompile Include="..\Collision\Shapes\b2ChainShape.cpp" />
<ClCompile Include="..\Collision\Shapes\b2CircleShape.cpp" />
<ClCompile Include="..\Collision\Shapes\b2EdgeShape.cpp" />
<ClCompile Include="..\Collision\Shapes\b2PolygonShape.cpp" />
<ClCompile Include="..\Common\b2BlockAllocator.cpp" />
<ClCompile Include="..\Common\b2Draw.cpp" />
<ClCompile Include="..\Common\b2Math.cpp" />
<ClCompile Include="..\Common\b2Settings.cpp" />
<ClCompile Include="..\Common\b2StackAllocator.cpp" />
<ClCompile Include="..\Common\b2Timer.cpp" />
<ClCompile Include="..\Dynamics\b2Body.cpp" />
<ClCompile Include="..\Dynamics\b2ContactManager.cpp" />
<ClCompile Include="..\Dynamics\b2Fixture.cpp" />
<ClCompile Include="..\Dynamics\b2Island.cpp" />
<ClCompile Include="..\Dynamics\b2World.cpp" />
<ClCompile Include="..\Dynamics\b2WorldCallbacks.cpp" />
<ClCompile Include="..\Dynamics\Contacts\b2ChainAndCircleContact.cpp" />
<ClCompile Include="..\Dynamics\Contacts\b2ChainAndPolygonContact.cpp" />
<ClCompile Include="..\Dynamics\Contacts\b2CircleContact.cpp" />
<ClCompile Include="..\Dynamics\Contacts\b2Contact.cpp" />
<ClCompile Include="..\Dynamics\Contacts\b2ContactSolver.cpp" />
<ClCompile Include="..\Dynamics\Contacts\b2EdgeAndCircleContact.cpp" />
<ClCompile Include="..\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp" />
<ClCompile Include="..\Dynamics\Contacts\b2PolygonAndCircleContact.cpp" />
<ClCompile Include="..\Dynamics\Contacts\b2PolygonContact.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2DistanceJoint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2FrictionJoint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2GearJoint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2Joint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2MotorJoint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2MouseJoint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2PrismaticJoint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2PulleyJoint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2RevoluteJoint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2RopeJoint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2WeldJoint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2WheelJoint.cpp" />
<ClCompile Include="..\Rope\b2Rope.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Box2D.h" />
<ClInclude Include="..\Collision\b2BroadPhase.h" />
<ClInclude Include="..\Collision\b2Collision.h" />
<ClInclude Include="..\Collision\b2Distance.h" />
<ClInclude Include="..\Collision\b2DynamicTree.h" />
<ClInclude Include="..\Collision\b2TimeOfImpact.h" />
<ClInclude Include="..\Collision\Shapes\b2ChainShape.h" />
<ClInclude Include="..\Collision\Shapes\b2CircleShape.h" />
<ClInclude Include="..\Collision\Shapes\b2EdgeShape.h" />
<ClInclude Include="..\Collision\Shapes\b2PolygonShape.h" />
<ClInclude Include="..\Collision\Shapes\b2Shape.h" />
<ClInclude Include="..\Common\b2BlockAllocator.h" />
<ClInclude Include="..\Common\b2Draw.h" />
<ClInclude Include="..\Common\b2GrowableStack.h" />
<ClInclude Include="..\Common\b2Math.h" />
<ClInclude Include="..\Common\b2Settings.h" />
<ClInclude Include="..\Common\b2StackAllocator.h" />
<ClInclude Include="..\Common\b2Timer.h" />
<ClInclude Include="..\Dynamics\b2Body.h" />
<ClInclude Include="..\Dynamics\b2ContactManager.h" />
<ClInclude Include="..\Dynamics\b2Fixture.h" />
<ClInclude Include="..\Dynamics\b2Island.h" />
<ClInclude Include="..\Dynamics\b2TimeStep.h" />
<ClInclude Include="..\Dynamics\b2World.h" />
<ClInclude Include="..\Dynamics\b2WorldCallbacks.h" />
<ClInclude Include="..\Dynamics\Contacts\b2ChainAndCircleContact.h" />
<ClInclude Include="..\Dynamics\Contacts\b2ChainAndPolygonContact.h" />
<ClInclude Include="..\Dynamics\Contacts\b2CircleContact.h" />
<ClInclude Include="..\Dynamics\Contacts\b2Contact.h" />
<ClInclude Include="..\Dynamics\Contacts\b2ContactSolver.h" />
<ClInclude Include="..\Dynamics\Contacts\b2EdgeAndCircleContact.h" />
<ClInclude Include="..\Dynamics\Contacts\b2EdgeAndPolygonContact.h" />
<ClInclude Include="..\Dynamics\Contacts\b2PolygonAndCircleContact.h" />
<ClInclude Include="..\Dynamics\Contacts\b2PolygonContact.h" />
<ClInclude Include="..\Dynamics\Joints\b2DistanceJoint.h" />
<ClInclude Include="..\Dynamics\Joints\b2FrictionJoint.h" />
<ClInclude Include="..\Dynamics\Joints\b2GearJoint.h" />
<ClInclude Include="..\Dynamics\Joints\b2Joint.h" />
<ClInclude Include="..\Dynamics\Joints\b2MotorJoint.h" />
<ClInclude Include="..\Dynamics\Joints\b2MouseJoint.h" />
<ClInclude Include="..\Dynamics\Joints\b2PrismaticJoint.h" />
<ClInclude Include="..\Dynamics\Joints\b2PulleyJoint.h" />
<ClInclude Include="..\Dynamics\Joints\b2RevoluteJoint.h" />
<ClInclude Include="..\Dynamics\Joints\b2RopeJoint.h" />
<ClInclude Include="..\Dynamics\Joints\b2WeldJoint.h" />
<ClInclude Include="..\Dynamics\Joints\b2WheelJoint.h" />
<ClInclude Include="..\Rope\b2Rope.h" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>libbox2d</ProjectName>
<ProjectGuid>{929480E7-23C0-4DF6-8456-096D71547116}</ProjectGuid>
@ -99,103 +196,6 @@
<OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\Collision\b2BroadPhase.cpp" />
<ClCompile Include="..\Collision\b2CollideCircle.cpp" />
<ClCompile Include="..\Collision\b2CollideEdge.cpp" />
<ClCompile Include="..\Collision\b2CollidePolygon.cpp" />
<ClCompile Include="..\Collision\b2Collision.cpp" />
<ClCompile Include="..\Collision\b2Distance.cpp" />
<ClCompile Include="..\Collision\b2DynamicTree.cpp" />
<ClCompile Include="..\Collision\b2TimeOfImpact.cpp" />
<ClCompile Include="..\Collision\Shapes\b2ChainShape.cpp" />
<ClCompile Include="..\Collision\Shapes\b2CircleShape.cpp" />
<ClCompile Include="..\Collision\Shapes\b2EdgeShape.cpp" />
<ClCompile Include="..\Collision\Shapes\b2PolygonShape.cpp" />
<ClCompile Include="..\Common\b2BlockAllocator.cpp" />
<ClCompile Include="..\Common\b2Draw.cpp" />
<ClCompile Include="..\Common\b2Math.cpp" />
<ClCompile Include="..\Common\b2Settings.cpp" />
<ClCompile Include="..\Common\b2StackAllocator.cpp" />
<ClCompile Include="..\Common\b2Timer.cpp" />
<ClCompile Include="..\Dynamics\b2Body.cpp" />
<ClCompile Include="..\Dynamics\b2ContactManager.cpp" />
<ClCompile Include="..\Dynamics\b2Fixture.cpp" />
<ClCompile Include="..\Dynamics\b2Island.cpp" />
<ClCompile Include="..\Dynamics\b2World.cpp" />
<ClCompile Include="..\Dynamics\b2WorldCallbacks.cpp" />
<ClCompile Include="..\Dynamics\Contacts\b2ChainAndCircleContact.cpp" />
<ClCompile Include="..\Dynamics\Contacts\b2ChainAndPolygonContact.cpp" />
<ClCompile Include="..\Dynamics\Contacts\b2CircleContact.cpp" />
<ClCompile Include="..\Dynamics\Contacts\b2Contact.cpp" />
<ClCompile Include="..\Dynamics\Contacts\b2ContactSolver.cpp" />
<ClCompile Include="..\Dynamics\Contacts\b2EdgeAndCircleContact.cpp" />
<ClCompile Include="..\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp" />
<ClCompile Include="..\Dynamics\Contacts\b2PolygonAndCircleContact.cpp" />
<ClCompile Include="..\Dynamics\Contacts\b2PolygonContact.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2DistanceJoint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2FrictionJoint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2GearJoint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2Joint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2MotorJoint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2MouseJoint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2PrismaticJoint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2PulleyJoint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2RevoluteJoint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2RopeJoint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2WeldJoint.cpp" />
<ClCompile Include="..\Dynamics\Joints\b2WheelJoint.cpp" />
<ClCompile Include="..\Rope\b2Rope.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Collision\b2BroadPhase.h" />
<ClInclude Include="..\Collision\b2Collision.h" />
<ClInclude Include="..\Collision\b2Distance.h" />
<ClInclude Include="..\Collision\b2DynamicTree.h" />
<ClInclude Include="..\Collision\b2TimeOfImpact.h" />
<ClInclude Include="..\Collision\Shapes\b2ChainShape.h" />
<ClInclude Include="..\Collision\Shapes\b2CircleShape.h" />
<ClInclude Include="..\Collision\Shapes\b2EdgeShape.h" />
<ClInclude Include="..\Collision\Shapes\b2PolygonShape.h" />
<ClInclude Include="..\Collision\Shapes\b2Shape.h" />
<ClInclude Include="..\Common\b2BlockAllocator.h" />
<ClInclude Include="..\Common\b2Draw.h" />
<ClInclude Include="..\Common\b2GrowableStack.h" />
<ClInclude Include="..\Common\b2Math.h" />
<ClInclude Include="..\Common\b2Settings.h" />
<ClInclude Include="..\Common\b2StackAllocator.h" />
<ClInclude Include="..\Common\b2Timer.h" />
<ClInclude Include="..\Dynamics\b2Body.h" />
<ClInclude Include="..\Dynamics\b2ContactManager.h" />
<ClInclude Include="..\Dynamics\b2Fixture.h" />
<ClInclude Include="..\Dynamics\b2Island.h" />
<ClInclude Include="..\Dynamics\b2TimeStep.h" />
<ClInclude Include="..\Dynamics\b2World.h" />
<ClInclude Include="..\Dynamics\b2WorldCallbacks.h" />
<ClInclude Include="..\Dynamics\Contacts\b2ChainAndCircleContact.h" />
<ClInclude Include="..\Dynamics\Contacts\b2ChainAndPolygonContact.h" />
<ClInclude Include="..\Dynamics\Contacts\b2CircleContact.h" />
<ClInclude Include="..\Dynamics\Contacts\b2Contact.h" />
<ClInclude Include="..\Dynamics\Contacts\b2ContactSolver.h" />
<ClInclude Include="..\Dynamics\Contacts\b2EdgeAndCircleContact.h" />
<ClInclude Include="..\Dynamics\Contacts\b2EdgeAndPolygonContact.h" />
<ClInclude Include="..\Dynamics\Contacts\b2PolygonAndCircleContact.h" />
<ClInclude Include="..\Dynamics\Contacts\b2PolygonContact.h" />
<ClInclude Include="..\Dynamics\Joints\b2DistanceJoint.h" />
<ClInclude Include="..\Dynamics\Joints\b2FrictionJoint.h" />
<ClInclude Include="..\Dynamics\Joints\b2GearJoint.h" />
<ClInclude Include="..\Dynamics\Joints\b2Joint.h" />
<ClInclude Include="..\Dynamics\Joints\b2MotorJoint.h" />
<ClInclude Include="..\Dynamics\Joints\b2MouseJoint.h" />
<ClInclude Include="..\Dynamics\Joints\b2PrismaticJoint.h" />
<ClInclude Include="..\Dynamics\Joints\b2PulleyJoint.h" />
<ClInclude Include="..\Dynamics\Joints\b2RevoluteJoint.h" />
<ClInclude Include="..\Dynamics\Joints\b2RopeJoint.h" />
<ClInclude Include="..\Dynamics\Joints\b2WeldJoint.h" />
<ClInclude Include="..\Dynamics\Joints\b2WheelJoint.h" />
<ClInclude Include="..\Rope\b2Rope.h" />
<ClInclude Include="..\Box2D.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

View File

@ -2,25 +2,25 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Collision">
<UniqueIdentifier>{bdf099c5-cc32-468b-b53f-ec010d7f823f}</UniqueIdentifier>
<UniqueIdentifier>{96e593a1-0dd7-4dae-b88d-ee4fc8a03ad3}</UniqueIdentifier>
</Filter>
<Filter Include="Collision\Shapes">
<UniqueIdentifier>{92792f88-4e5c-46ee-8d87-002f3b2297ae}</UniqueIdentifier>
<UniqueIdentifier>{65359ee0-026c-4116-9235-72fbc83ad4cb}</UniqueIdentifier>
</Filter>
<Filter Include="Common">
<UniqueIdentifier>{f41a6fa6-5ac1-4514-9ac0-6f3a38f35b4d}</UniqueIdentifier>
<UniqueIdentifier>{4682feab-6913-410c-af1a-a6063c5a5c70}</UniqueIdentifier>
</Filter>
<Filter Include="Dynamics">
<UniqueIdentifier>{0b56913a-34b7-410a-b386-869d6f7a20be}</UniqueIdentifier>
<UniqueIdentifier>{82f2dcc2-92b3-41db-8482-9de0b1012103}</UniqueIdentifier>
</Filter>
<Filter Include="Dynamics\Contacts">
<UniqueIdentifier>{f0e7b230-79cc-49b8-9ed7-9dbfa062f2a4}</UniqueIdentifier>
<UniqueIdentifier>{85580c9a-58ff-4035-b17f-a539b89be2bb}</UniqueIdentifier>
</Filter>
<Filter Include="Dynamics\Joints">
<UniqueIdentifier>{932f2008-afbe-42f5-993d-a1df0ec67756}</UniqueIdentifier>
<UniqueIdentifier>{4857faee-e51c-4875-a34d-bde79c74b51a}</UniqueIdentifier>
</Filter>
<Filter Include="Rope">
<UniqueIdentifier>{f8937e09-93a4-49fa-8f3e-dfc36da764df}</UniqueIdentifier>
<UniqueIdentifier>{ac5c2bb8-243b-4c0e-bc5b-09299960f055}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
@ -135,6 +135,9 @@
<ClCompile Include="..\Dynamics\Joints\b2Joint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Joints\b2MotorJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Joints\b2MouseJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
@ -159,9 +162,6 @@
<ClCompile Include="..\Rope\b2Rope.cpp">
<Filter>Rope</Filter>
</ClCompile>
<ClCompile Include="..\Dynamics\Joints\b2MotorJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Collision\b2BroadPhase.h">
@ -275,6 +275,9 @@
<ClInclude Include="..\Dynamics\Joints\b2Joint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Joints\b2MotorJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\Dynamics\Joints\b2MouseJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
@ -300,8 +303,5 @@
<Filter>Rope</Filter>
</ClInclude>
<ClInclude Include="..\Box2D.h" />
<ClInclude Include="..\Dynamics\Joints\b2MotorJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
</ItemGroup>
</Project>

View File

@ -10,6 +10,65 @@
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\include\chipmunk\chipmunk.h" />
<ClInclude Include="..\include\chipmunk\chipmunk_ffi.h" />
<ClInclude Include="..\include\chipmunk\chipmunk_private.h" />
<ClInclude Include="..\include\chipmunk\chipmunk_types.h" />
<ClInclude Include="..\include\chipmunk\chipmunk_unsafe.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpConstraint.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpDampedRotarySpring.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpDampedSpring.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpGearJoint.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpGrooveJoint.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpPinJoint.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpPivotJoint.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpRatchetJoint.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpRotaryLimitJoint.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpSimpleMotor.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpSlideJoint.h" />
<ClInclude Include="..\include\chipmunk\constraints\util.h" />
<ClInclude Include="..\include\chipmunk\cpArbiter.h" />
<ClInclude Include="..\include\chipmunk\cpBB.h" />
<ClInclude Include="..\include\chipmunk\cpBody.h" />
<ClInclude Include="..\include\chipmunk\cpPolyShape.h" />
<ClInclude Include="..\include\chipmunk\cpShape.h" />
<ClInclude Include="..\include\chipmunk\cpSpace.h" />
<ClInclude Include="..\include\chipmunk\cpSpatialIndex.h" />
<ClInclude Include="..\include\chipmunk\cpVect.h" />
<ClInclude Include="..\src\prime.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\chipmunk.c" />
<ClCompile Include="..\src\constraints\cpConstraint.c" />
<ClCompile Include="..\src\constraints\cpDampedRotarySpring.c" />
<ClCompile Include="..\src\constraints\cpDampedSpring.c" />
<ClCompile Include="..\src\constraints\cpGearJoint.c" />
<ClCompile Include="..\src\constraints\cpGrooveJoint.c" />
<ClCompile Include="..\src\constraints\cpPinJoint.c" />
<ClCompile Include="..\src\constraints\cpPivotJoint.c" />
<ClCompile Include="..\src\constraints\cpRatchetJoint.c" />
<ClCompile Include="..\src\constraints\cpRotaryLimitJoint.c" />
<ClCompile Include="..\src\constraints\cpSimpleMotor.c" />
<ClCompile Include="..\src\constraints\cpSlideJoint.c" />
<ClCompile Include="..\src\cpArbiter.c" />
<ClCompile Include="..\src\cpArray.c" />
<ClCompile Include="..\src\cpBB.c" />
<ClCompile Include="..\src\cpBBTree.c" />
<ClCompile Include="..\src\cpBody.c" />
<ClCompile Include="..\src\cpCollision.c" />
<ClCompile Include="..\src\cpHashSet.c" />
<ClCompile Include="..\src\cpPolyShape.c" />
<ClCompile Include="..\src\cpShape.c" />
<ClCompile Include="..\src\cpSpace.c" />
<ClCompile Include="..\src\cpSpaceComponent.c" />
<ClCompile Include="..\src\cpSpaceHash.c" />
<ClCompile Include="..\src\cpSpaceQuery.c" />
<ClCompile Include="..\src\cpSpaceStep.c" />
<ClCompile Include="..\src\cpSpatialIndex.c" />
<ClCompile Include="..\src\cpSweep1D.c" />
<ClCompile Include="..\src\cpVect.c" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>libchipmunk</ProjectName>
<ProjectGuid>{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}</ProjectGuid>
@ -104,65 +163,6 @@
<OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\include\chipmunk\chipmunk.h" />
<ClInclude Include="..\include\chipmunk\chipmunk_ffi.h" />
<ClInclude Include="..\include\chipmunk\chipmunk_private.h" />
<ClInclude Include="..\include\chipmunk\chipmunk_types.h" />
<ClInclude Include="..\include\chipmunk\chipmunk_unsafe.h" />
<ClInclude Include="..\include\chipmunk\cpArbiter.h" />
<ClInclude Include="..\include\chipmunk\cpBB.h" />
<ClInclude Include="..\include\chipmunk\cpBody.h" />
<ClInclude Include="..\include\chipmunk\cpPolyShape.h" />
<ClInclude Include="..\include\chipmunk\cpShape.h" />
<ClInclude Include="..\include\chipmunk\cpSpace.h" />
<ClInclude Include="..\include\chipmunk\cpSpatialIndex.h" />
<ClInclude Include="..\include\chipmunk\cpVect.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpConstraint.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpDampedRotarySpring.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpDampedSpring.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpGearJoint.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpGrooveJoint.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpPinJoint.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpPivotJoint.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpRatchetJoint.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpRotaryLimitJoint.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpSimpleMotor.h" />
<ClInclude Include="..\include\chipmunk\constraints\cpSlideJoint.h" />
<ClInclude Include="..\include\chipmunk\constraints\util.h" />
<ClInclude Include="..\src\prime.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\chipmunk.c" />
<ClCompile Include="..\src\cpArbiter.c" />
<ClCompile Include="..\src\cpArray.c" />
<ClCompile Include="..\src\cpBB.c" />
<ClCompile Include="..\src\cpBBTree.c" />
<ClCompile Include="..\src\cpBody.c" />
<ClCompile Include="..\src\cpCollision.c" />
<ClCompile Include="..\src\cpHashSet.c" />
<ClCompile Include="..\src\cpPolyShape.c" />
<ClCompile Include="..\src\cpShape.c" />
<ClCompile Include="..\src\cpSpace.c" />
<ClCompile Include="..\src\cpSpaceComponent.c" />
<ClCompile Include="..\src\cpSpaceHash.c" />
<ClCompile Include="..\src\cpSpaceQuery.c" />
<ClCompile Include="..\src\cpSpaceStep.c" />
<ClCompile Include="..\src\cpSpatialIndex.c" />
<ClCompile Include="..\src\cpSweep1D.c" />
<ClCompile Include="..\src\cpVect.c" />
<ClCompile Include="..\src\constraints\cpConstraint.c" />
<ClCompile Include="..\src\constraints\cpDampedRotarySpring.c" />
<ClCompile Include="..\src\constraints\cpDampedSpring.c" />
<ClCompile Include="..\src\constraints\cpGearJoint.c" />
<ClCompile Include="..\src\constraints\cpGrooveJoint.c" />
<ClCompile Include="..\src\constraints\cpPinJoint.c" />
<ClCompile Include="..\src\constraints\cpPivotJoint.c" />
<ClCompile Include="..\src\constraints\cpRatchetJoint.c" />
<ClCompile Include="..\src\constraints\cpRotaryLimitJoint.c" />
<ClCompile Include="..\src\constraints\cpSimpleMotor.c" />
<ClCompile Include="..\src\constraints\cpSlideJoint.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

View File

@ -2,18 +2,16 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="include">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
<UniqueIdentifier>{ffa91ca5-f4b1-424f-9342-bd250042f423}</UniqueIdentifier>
</Filter>
<Filter Include="include\constraints">
<UniqueIdentifier>{4dabab00-1a6f-41ee-be09-a30737358f86}</UniqueIdentifier>
<UniqueIdentifier>{70e7e6e1-042e-42b6-a19d-547b8de61bbc}</UniqueIdentifier>
</Filter>
<Filter Include="src">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
<UniqueIdentifier>{78b690a1-6061-49d6-a8b7-ad6a231ddca2}</UniqueIdentifier>
</Filter>
<Filter Include="src\constraints">
<UniqueIdentifier>{e573d383-f016-40f6-999a-d804311ffc62}</UniqueIdentifier>
<UniqueIdentifier>{179bc1e1-ed4a-4412-92b1-f74fddef2877}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>

View File

@ -1,57 +0,0 @@
set(BUILD_STATIC 1)
file(GLOB chipmunk_source_files "*.c" "constraints/*.c")
file(GLOB chipmunk_public_header "${chipmunk_SOURCE_DIR}/include/chipmunk/*.h")
file(GLOB chipmunk_constraint_header "${chipmunk_SOURCE_DIR}/include/chipmunk/constraints/*.h")
include_directories(${chipmunk_SOURCE_DIR}/include/chipmunk)
if(BUILD_SHARED)
add_library(chipmunk SHARED
${chipmunk_source_files}
)
# Tell MSVC to compile the code as C++.
if(MSVC)
set_source_files_properties(${chipmunk_source_files} PROPERTIES LANGUAGE CXX)
set_target_properties(chipmunk PROPERTIES LINKER_LANGUAGE CXX)
endif(MSVC)
# set the lib's version number
# But avoid on Android because symlinks to version numbered .so's don't work with Android's Java-side loadLibrary.
if(NOT ANDROID)
set_target_properties(chipmunk PROPERTIES VERSION 6.2.1)
endif(NOT ANDROID)
if(ANDROID)
# need to explicitly link to the math library because the CMake/Android toolchains may not do it automatically
target_link_libraries(chipmunk m)
endif(ANDROID)
install(TARGETS chipmunk RUNTIME DESTINATION lib LIBRARY DESTINATION lib)
endif(BUILD_SHARED)
if(BUILD_STATIC)
add_library(chipmunk_static STATIC
${chipmunk_source_files}
)
# Tell MSVC to compile the code as C++.
if(MSVC)
set_source_files_properties(${chipmunk_source_files} PROPERTIES LANGUAGE CXX)
set_target_properties(chipmunk_static PROPERTIES LINKER_LANGUAGE CXX)
endif(MSVC)
# Sets chipmunk_static to output "libchipmunk.a" not "libchipmunk_static.a"
set_target_properties(chipmunk_static PROPERTIES OUTPUT_NAME chipmunk)
if(INSTALL_STATIC)
install(TARGETS chipmunk_static ARCHIVE DESTINATION lib)
endif(INSTALL_STATIC)
endif(BUILD_STATIC)
if(BUILD_SHARED OR INSTALL_STATIC)
# FIXME: change to PUBLIC_HEADER to allow building frameworks
install(FILES ${chipmunk_public_header} DESTINATION include/chipmunk)
install(FILES ${chipmunk_constraint_header} DESTINATION include/chipmunk/constraints)
endif(BUILD_SHARED OR INSTALL_STATIC)
set_target_properties(chipmunk_static
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)

View File

@ -179,7 +179,6 @@
"cocos/2d/CCTransitionProgress.h",
"cocos/2d/CCTweenFunction.cpp",
"cocos/2d/CCTweenFunction.h",
"cocos/2d/CMakeLists.txt",
"cocos/2d/cocos2d.def",
"cocos/2d/cocos2d_headers.props",
"cocos/2d/cocos2d_winrt.props",
@ -234,7 +233,6 @@
"cocos/3d/proj.win32/libcocos3d.vcxproj.user",
"cocos/Android.mk",
"cocos/CMakeLists.txt",
"cocos/audio/CMakeLists.txt",
"cocos/audio/android/Android.mk",
"cocos/audio/android/ccdandroidUtils.cpp",
"cocos/audio/android/ccdandroidUtils.h",
@ -349,8 +347,6 @@
"cocos/base/CCIMEDispatcher.cpp",
"cocos/base/CCIMEDispatcher.h",
"cocos/base/CCMap.h",
"cocos/base/CCModuleManager.cpp",
"cocos/base/CCModuleManager.h",
"cocos/base/CCNS.cpp",
"cocos/base/CCNS.h",
"cocos/base/CCPlatformConfig.h",
@ -374,7 +370,6 @@
"cocos/base/CCValue.cpp",
"cocos/base/CCValue.h",
"cocos/base/CCVector.h",
"cocos/base/CMakeLists.txt",
"cocos/base/ObjectFactory.cpp",
"cocos/base/ObjectFactory.h",
"cocos/base/TGAlib.cpp",
@ -427,7 +422,6 @@
"cocos/deprecated/CCSet.h",
"cocos/deprecated/CCString.cpp",
"cocos/deprecated/CCString.h",
"cocos/deprecated/CMakeLists.txt",
"cocos/editor-support/cocosbuilder/Android.mk",
"cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp",
"cocos/editor-support/cocosbuilder/CCBAnimationManager.h",
@ -477,7 +471,6 @@
"cocos/editor-support/cocosbuilder/CCScrollViewLoader.h",
"cocos/editor-support/cocosbuilder/CCSpriteLoader.cpp",
"cocos/editor-support/cocosbuilder/CCSpriteLoader.h",
"cocos/editor-support/cocosbuilder/CMakeLists.txt",
"cocos/editor-support/cocosbuilder/CocosBuilder.h",
"cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.filters",
"cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.user",
@ -560,7 +553,6 @@
"cocos/editor-support/cocostudio/CCTween.h",
"cocos/editor-support/cocostudio/CCUtilMath.cpp",
"cocos/editor-support/cocostudio/CCUtilMath.h",
"cocos/editor-support/cocostudio/CMakeLists.txt",
"cocos/editor-support/cocostudio/CocoLoader.cpp",
"cocos/editor-support/cocostudio/CocoLoader.h",
"cocos/editor-support/cocostudio/CocoStudio.h",
@ -702,7 +694,6 @@
"cocos/math/Vec4.h",
"cocos/math/Vec4.inl",
"cocos/network/Android.mk",
"cocos/network/CMakeLists.txt",
"cocos/network/HttpClient.cpp",
"cocos/network/HttpClient.h",
"cocos/network/HttpRequest.h",
@ -726,7 +717,6 @@
"cocos/physics/CCPhysicsShape.h",
"cocos/physics/CCPhysicsWorld.cpp",
"cocos/physics/CCPhysicsWorld.h",
"cocos/physics/CMakeLists.txt",
"cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.cpp",
"cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.h",
"cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.cpp",
@ -751,7 +741,6 @@
"cocos/platform/CCSAXParser.h",
"cocos/platform/CCThread.cpp",
"cocos/platform/CCThread.h",
"cocos/platform/CMakeLists.txt",
"cocos/platform/android/Android.mk",
"cocos/platform/android/CCApplication.cpp",
"cocos/platform/android/CCApplication.h",
@ -978,7 +967,6 @@
"cocos/renderer/CCVertexIndexBuffer.h",
"cocos/renderer/CCVertexIndexData.cpp",
"cocos/renderer/CCVertexIndexData.h",
"cocos/renderer/CMakeLists.txt",
"cocos/renderer/ccGLStateCache.cpp",
"cocos/renderer/ccGLStateCache.h",
"cocos/renderer/ccShader_3D_Color.frag",
@ -1008,7 +996,6 @@
"cocos/renderer/ccShader_Position_uColor.vert",
"cocos/renderer/ccShaders.cpp",
"cocos/renderer/ccShaders.h",
"cocos/storage/CMakeLists.txt",
"cocos/storage/local-storage/Android.mk",
"cocos/storage/local-storage/LocalStorage.cpp",
"cocos/storage/local-storage/LocalStorage.h",
@ -1016,7 +1003,6 @@
"cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj",
"cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj.filters",
"cocos/ui/Android.mk",
"cocos/ui/CMakeLists.txt",
"cocos/ui/CocosGUI.cpp",
"cocos/ui/CocosGUI.h",
"cocos/ui/GUIDefine.h",
@ -1149,7 +1135,6 @@
"extensions/proj.wp8/pch.h",
"external/Box2D/Android.mk",
"external/Box2D/Box2D.h",
"external/Box2D/CMakeLists.txt",
"external/Box2D/Collision/Shapes/b2ChainShape.cpp",
"external/Box2D/Collision/Shapes/b2ChainShape.h",
"external/Box2D/Collision/Shapes/b2CircleShape.cpp",
@ -1284,7 +1269,6 @@
"external/chipmunk/proj.winrt/chipmunk.vcxproj.filters",
"external/chipmunk/proj.wp8/chipmunk.vcxproj",
"external/chipmunk/proj.wp8/chipmunk.vcxproj.filters",
"external/chipmunk/src/CMakeLists.txt",
"external/chipmunk/src/chipmunk.c",
"external/chipmunk/src/constraints/cpConstraint.c",
"external/chipmunk/src/constraints/cpDampedRotarySpring.c",
@ -4087,23 +4071,6 @@
"cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj",
"cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj",
"cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj.filters",
"cocos/scripting/lua-bindings/proj.win32/libluacocos3d.vcxproj",
"cocos/scripting/lua-bindings/proj.win32/libluacocos3d.vcxproj.filters",
"cocos/scripting/lua-bindings/proj.win32/libluacocos3d.vcxproj.user",
"cocos/scripting/lua-bindings/proj.win32/libluacocosbuilder.vcxproj",
"cocos/scripting/lua-bindings/proj.win32/libluacocosbuilder.vcxproj.filters",
"cocos/scripting/lua-bindings/proj.win32/libluacocosdenshion.vcxproj",
"cocos/scripting/lua-bindings/proj.win32/libluacocosdenshion.vcxproj.filters",
"cocos/scripting/lua-bindings/proj.win32/libluacocostudio.vcxproj",
"cocos/scripting/lua-bindings/proj.win32/libluacocostudio.vcxproj.filters",
"cocos/scripting/lua-bindings/proj.win32/libluaextension.vcxproj",
"cocos/scripting/lua-bindings/proj.win32/libluaextension.vcxproj.filters",
"cocos/scripting/lua-bindings/proj.win32/libluanetwork.vcxproj",
"cocos/scripting/lua-bindings/proj.win32/libluanetwork.vcxproj.filters",
"cocos/scripting/lua-bindings/proj.win32/libluaspine.vcxproj",
"cocos/scripting/lua-bindings/proj.win32/libluaspine.vcxproj.filters",
"cocos/scripting/lua-bindings/proj.win32/libluaui.vcxproj",
"cocos/scripting/lua-bindings/proj.win32/libluaui.vcxproj.filters",
"cocos/scripting/lua-bindings/script/cocos2d/Cocos2d.lua",
"cocos/scripting/lua-bindings/script/cocos2d/Cocos2dConstants.lua",
"cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dClass.lua",

View File

@ -1,12 +1,10 @@
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 2.8)
set(APP_NAME MyGame)
project (${APP_NAME})
include(cocos2d/build/BuildHelpers.CMakeLists.txt)
option(USE_CHIPMUNK "Use chipmunk for physics library" ON)
option(USE_BOX2D "Use box2d for physics library" OFF)
option(DEBUG_MODE "Debug or release?" ON)
if(DEBUG_MODE)
@ -27,26 +25,10 @@ elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-deprecated-declarations -Wno-reorder")
endif()
if(USE_CHIPMUNK)
message("Using chipmunk ...")
add_definitions(-DCC_ENABLE_CHIPMUNK_INTEGRATION=1)
if(UNIX) # assuming linux
add_definitions(-DLINUX )
endif()
elseif(USE_BOX2D)
message("Using box2d ...")
add_definitions(-DCC_ENABLE_BOX2D_INTEGRATION=1)
if(UNIX) # assuming linux
add_definitions(-DLINUX )
endif()
else(USE_CHIPMUNK)
message(FATAL_ERROR "Must choose a physics library.")
endif(USE_CHIPMUNK)
# architecture
if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
set(ARCH_DIR "64-bit")
@ -150,6 +132,8 @@ include_directories(
${COCOS2D_ROOT}/external/xxhash
)
ADD_DEFINITIONS(-DLINUX)
link_directories(
/usr/local/lib
${COCOS2D_ROOT}/external/jpeg/prebuilt/linux/${ARCH_DIR}
@ -162,81 +146,13 @@ link_directories(
)
endif()
if(USE_CHIPMUNK)
include_directories(${COCOS2D_ROOT}/external/chipmunk/include/chipmunk)
# chipmunk library
add_subdirectory(${COCOS2D_ROOT}/external/chipmunk/src)
endif()
if(USE_BOX2D)
# box2d library
add_subdirectory(${COCOS2D_ROOT}/external/Box2D)
endif()
# unzip library
add_subdirectory(${COCOS2D_ROOT}/external/unzip)
# tinyxml2 library
add_subdirectory(${COCOS2D_ROOT}/external/tinyxml2)
# audio
add_subdirectory(${COCOS2D_ROOT}/cocos/audio)
# xxhash library
add_subdirectory(${COCOS2D_ROOT}/external/xxhash)
# cocos2d
# libcocos2d
add_subdirectory(${COCOS2D_ROOT}/cocos)
# cocos3d library
add_subdirectory(${COCOS2D_ROOT}/cocos/3d)
# network library
add_subdirectory(${COCOS2D_ROOT}/cocos/network)
add_executable(${APP_NAME} ${GAME_SRC})
# ui library
add_subdirectory(${COCOS2D_ROOT}/cocos/ui)
# sqlite3 library
add_subdirectory(${COCOS2D_ROOT}/cocos/storage)
# extensions
add_subdirectory(${COCOS2D_ROOT}/extensions)
## Editor Support
# spine
add_subdirectory(${COCOS2D_ROOT}/cocos/editor-support/spine)
# cocosbuilder
add_subdirectory(${COCOS2D_ROOT}/cocos/editor-support/cocosbuilder)
# cocostudio
add_subdirectory(${COCOS2D_ROOT}/cocos/editor-support/cocostudio)
if ( WIN32 )
# add the executable
add_executable(${APP_NAME}
WIN32
${GAME_SRC}
)
else()
# add the executable
add_executable(${APP_NAME}
${GAME_SRC}
)
endif()
if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
set(FMOD_LIB "fmodex64")
else()
set(FMOD_LIB "fmodex")
endif()
target_link_libraries(${APP_NAME}
cocos2d
)
target_link_libraries(${APP_NAME} cocos2d)
set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin")

View File

@ -16,27 +16,8 @@ LOCAL_SRC_FILES := hellocpp/main.cpp \
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../src
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos3d_static
# LOCAL_WHOLE_STATIC_LIBRARIES += box2d_static
# LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static
# LOCAL_WHOLE_STATIC_LIBRARIES += spine_static
# LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static
# LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static
# LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
LOCAL_STATIC_LIBRARIES := cocos2dx_static
include $(BUILD_SHARED_LIBRARY)
$(call import-module,.)
$(call import-module,audio/android)
$(call import-module,3d)
# $(call import-module,Box2D)
# $(call import-module,editor-support/cocosbuilder)
# $(call import-module,editor-support/spine)
# $(call import-module,editor-support/cocostudio)
# $(call import-module,network)
# $(call import-module,extensions)

View File

@ -7,8 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
158C12AB19A1E4DF00781A76 /* libcocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 158C12AA19A1E4C800781A76 /* libcocos3d iOS.a */; };
158C12AE19A1E4FE00781A76 /* libcocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 158C12A819A1E4C800781A76 /* libcocos3d Mac.a */; };
15A6DA93199CFB1100B56DBF /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15A6DA8F199CFB1100B56DBF /* AppDelegate.cpp */; };
15A6DA94199CFB1100B56DBF /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15A6DA8F199CFB1100B56DBF /* AppDelegate.cpp */; };
15A6DA95199CFB1100B56DBF /* HelloWorldScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15A6DA91199CFB1100B56DBF /* HelloWorldScene.cpp */; };
@ -19,16 +17,8 @@
15A6DA9E199CFB9800B56DBF /* CloseSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A6DA99199CFB9800B56DBF /* CloseSelected.png */; };
15A6DA9F199CFB9800B56DBF /* HelloWorld.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A6DA9A199CFB9800B56DBF /* HelloWorld.png */; };
15A6DAA0199CFB9800B56DBF /* HelloWorld.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A6DA9A199CFB9800B56DBF /* HelloWorld.png */; };
1AC6FB1F180E996B004C840B /* libbox2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FAFF180E9839004C840B /* libbox2d Mac.a */; };
1AC6FB20180E996B004C840B /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FAFD180E9839004C840B /* libchipmunk Mac.a */; };
1AC6FB21180E996B004C840B /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FAF9180E9839004C840B /* libcocos2d Mac.a */; };
1AC6FB22180E996B004C840B /* libextension Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FAFB180E9839004C840B /* libextension Mac.a */; };
1AC6FB23180E996B004C840B /* libcocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB01180E9839004C840B /* libcocosdenshion Mac.a */; };
1AC6FB2E180E99EB004C840B /* libbox2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB0D180E9839004C840B /* libbox2d iOS.a */; };
1AC6FB2F180E99EB004C840B /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB0B180E9839004C840B /* libchipmunk iOS.a */; };
1AC6FB30180E99EB004C840B /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB07180E9839004C840B /* libcocos2d iOS.a */; };
1AC6FB31180E99EB004C840B /* libextension iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB09180E9839004C840B /* libextension iOS.a */; };
1AC6FB32180E99EB004C840B /* libcocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB0F180E9839004C840B /* libcocosdenshion iOS.a */; };
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; };
@ -74,104 +64,6 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
158C129719A1E4C800781A76 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 15162030199E7810006099B8;
remoteInfo = "libcocos3d iOS";
};
158C12A719A1E4C800781A76 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1516200B199E7363006099B8;
remoteInfo = "libcocos3d Mac";
};
158C12A919A1E4C800781A76 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 15162201199E7810006099B8;
remoteInfo = "libcocos3d iOS";
};
158C12AC19A1E4EB00781A76 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 15161E42199E7362006099B8;
remoteInfo = "libcocos3d Mac";
};
15A6DA7A199CFAFD00B56DBF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = B245F13A19766132001920FD;
remoteInfo = "libui Mac";
};
15A6DA7C199CFAFD00B56DBF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = B2DB484D1976716E00411E16;
remoteInfo = "libcocostudio Mac";
};
15A6DA7E199CFAFD00B56DBF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = B2DB47D2197669A100411E16;
remoteInfo = "libcocosbuilder Mac";
};
15A6DA80199CFAFD00B56DBF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = B2DB490119767F1F00411E16;
remoteInfo = "libspine Mac";
};
15A6DA82199CFAFD00B56DBF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = B2DB49C4197686CB00411E16;
remoteInfo = "libnetwork Mac";
};
15A6DA84199CFAFD00B56DBF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = B24EEA6619775E92004493CC;
remoteInfo = "libui iOS";
};
15A6DA86199CFAFD00B56DBF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = B24EEA6E19775EBB004493CC;
remoteInfo = "libcocostudio iOS";
};
15A6DA88199CFAFD00B56DBF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = B24EEA7619775ECE004493CC;
remoteInfo = "libcocosbuilder iOS";
};
15A6DA8A199CFAFD00B56DBF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = B24EEA7E19775EE1004493CC;
remoteInfo = "libspine iOS";
};
15A6DA8C199CFAFD00B56DBF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = B24EEA8619775EF3004493CC;
remoteInfo = "libnetwork iOS";
};
1AC6FAF8180E9839004C840B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
@ -179,34 +71,6 @@
remoteGlobalIDString = 1551A33F158F2AB200E66CFE;
remoteInfo = "cocos2dx Mac";
};
1AC6FAFA180E9839004C840B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = A03F2FD617814595006731B9;
remoteInfo = "cocos2dx-extensions Mac";
};
1AC6FAFC180E9839004C840B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = A03F2CB81780BD04006731B9;
remoteInfo = "chipmunk Mac";
};
1AC6FAFE180E9839004C840B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = A03F2D9B1780BDF7006731B9;
remoteInfo = "box2d Mac";
};
1AC6FB00180E9839004C840B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = A03F2ED617814268006731B9;
remoteInfo = "CocosDenshion Mac";
};
1AC6FB06180E9839004C840B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
@ -214,34 +78,6 @@
remoteGlobalIDString = A07A4D641783777C0073F6A7;
remoteInfo = "cocos2dx iOS";
};
1AC6FB08180E9839004C840B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = A07A4EFC1783867C0073F6A7;
remoteInfo = "cocos2dx-extensions iOS";
};
1AC6FB0A180E9839004C840B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = A07A4F3B178387670073F6A7;
remoteInfo = "chipmunk iOS";
};
1AC6FB0C180E9839004C840B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = A07A4F9E1783876B0073F6A7;
remoteInfo = "box2d iOS";
};
1AC6FB0E180E9839004C840B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = A07A4FB4178387730073F6A7;
remoteInfo = "CocosDenshion iOS";
};
1AC6FB15180E9959004C840B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
@ -249,34 +85,6 @@
remoteGlobalIDString = 1551A33E158F2AB200E66CFE;
remoteInfo = "cocos2dx Mac";
};
1AC6FB17180E9959004C840B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A03F2FC117814595006731B9;
remoteInfo = "cocos2dx-extensions Mac";
};
1AC6FB19180E9959004C840B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A03F2B781780BD04006731B9;
remoteInfo = "chipmunk Mac";
};
1AC6FB1B180E9959004C840B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A03F2E9817814268006731B9;
remoteInfo = "CocosDenshion Mac";
};
1AC6FB1D180E9963004C840B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A03F2D5D1780BDF7006731B9;
remoteInfo = "box2d Mac";
};
1AC6FB24180E99E1004C840B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
@ -284,34 +92,6 @@
remoteGlobalIDString = A07A4C241783777C0073F6A7;
remoteInfo = "cocos2dx iOS";
};
1AC6FB26180E99E1004C840B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A07A4E111783867C0073F6A7;
remoteInfo = "cocos2dx-extensions iOS";
};
1AC6FB28180E99E1004C840B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A07A4EFD178387670073F6A7;
remoteInfo = "chipmunk iOS";
};
1AC6FB2A180E99E1004C840B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A07A4F3C1783876B0073F6A7;
remoteInfo = "box2d iOS";
};
1AC6FB2C180E99E1004C840B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A07A4F9F178387730073F6A7;
remoteInfo = "CocosDenshion iOS";
};
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
@ -374,12 +154,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
158C12AB19A1E4DF00781A76 /* libcocos3d iOS.a in Frameworks */,
1AC6FB2E180E99EB004C840B /* libbox2d iOS.a in Frameworks */,
1AC6FB2F180E99EB004C840B /* libchipmunk iOS.a in Frameworks */,
1AC6FB30180E99EB004C840B /* libcocos2d iOS.a in Frameworks */,
1AC6FB31180E99EB004C840B /* libextension iOS.a in Frameworks */,
1AC6FB32180E99EB004C840B /* libcocosdenshion iOS.a in Frameworks */,
D6B0611B1803AB670077942B /* CoreMotion.framework in Frameworks */,
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
@ -397,12 +172,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
158C12AE19A1E4FE00781A76 /* libcocos3d Mac.a in Frameworks */,
1AC6FB1F180E996B004C840B /* libbox2d Mac.a in Frameworks */,
1AC6FB20180E996B004C840B /* libchipmunk Mac.a in Frameworks */,
1AC6FB21180E996B004C840B /* libcocos2d Mac.a in Frameworks */,
1AC6FB22180E996B004C840B /* libextension Mac.a in Frameworks */,
1AC6FB23180E996B004C840B /* libcocosdenshion Mac.a in Frameworks */,
503AE11217EB99EE00D1A890 /* libcurl.dylib in Frameworks */,
5087E76717EB910900C73F5D /* libz.dylib in Frameworks */,
503AE11B17EB9C5A00D1A890 /* IOKit.framework in Frameworks */,
@ -469,27 +239,7 @@
isa = PBXGroup;
children = (
1AC6FAF9180E9839004C840B /* libcocos2d Mac.a */,
1AC6FAFB180E9839004C840B /* libextension Mac.a */,
15A6DA7B199CFAFD00B56DBF /* libui Mac.a */,
15A6DA7D199CFAFD00B56DBF /* libcocostudio Mac.a */,
15A6DA7F199CFAFD00B56DBF /* libcocosbuilder Mac.a */,
15A6DA81199CFAFD00B56DBF /* libspine Mac.a */,
15A6DA83199CFAFD00B56DBF /* libnetwork Mac.a */,
1AC6FAFD180E9839004C840B /* libchipmunk Mac.a */,
1AC6FAFF180E9839004C840B /* libbox2d Mac.a */,
1AC6FB01180E9839004C840B /* libcocosdenshion Mac.a */,
158C12A819A1E4C800781A76 /* libcocos3d Mac.a */,
1AC6FB07180E9839004C840B /* libcocos2d iOS.a */,
1AC6FB09180E9839004C840B /* libextension iOS.a */,
1AC6FB0B180E9839004C840B /* libchipmunk iOS.a */,
1AC6FB0D180E9839004C840B /* libbox2d iOS.a */,
1AC6FB0F180E9839004C840B /* libcocosdenshion iOS.a */,
15A6DA85199CFAFD00B56DBF /* libui iOS.a */,
15A6DA87199CFAFD00B56DBF /* libcocostudio iOS.a */,
15A6DA89199CFAFD00B56DBF /* libcocosbuilder iOS.a */,
15A6DA8B199CFAFD00B56DBF /* libspine iOS.a */,
15A6DA8D199CFAFD00B56DBF /* libnetwork iOS.a */,
158C12AA19A1E4C800781A76 /* libcocos3d iOS.a */,
);
name = Products;
sourceTree = "<group>";
@ -589,12 +339,7 @@
buildRules = (
);
dependencies = (
158C129819A1E4C800781A76 /* PBXTargetDependency */,
1AC6FB25180E99E1004C840B /* PBXTargetDependency */,
1AC6FB27180E99E1004C840B /* PBXTargetDependency */,
1AC6FB29180E99E1004C840B /* PBXTargetDependency */,
1AC6FB2B180E99E1004C840B /* PBXTargetDependency */,
1AC6FB2D180E99E1004C840B /* PBXTargetDependency */,
);
name = "HelloCpp iOS";
productName = iphone;
@ -612,12 +357,7 @@
buildRules = (
);
dependencies = (
158C12AD19A1E4EB00781A76 /* PBXTargetDependency */,
1AC6FB1E180E9963004C840B /* PBXTargetDependency */,
1AC6FB16180E9959004C840B /* PBXTargetDependency */,
1AC6FB18180E9959004C840B /* PBXTargetDependency */,
1AC6FB1A180E9959004C840B /* PBXTargetDependency */,
1AC6FB1C180E9959004C840B /* PBXTargetDependency */,
);
name = "HelloCpp Mac";
productName = iphone;
@ -664,90 +404,6 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
158C12A819A1E4C800781A76 /* libcocos3d Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libcocos3d Mac.a";
remoteRef = 158C12A719A1E4C800781A76 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
158C12AA19A1E4C800781A76 /* libcocos3d iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libcocos3d iOS.a";
remoteRef = 158C12A919A1E4C800781A76 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
15A6DA7B199CFAFD00B56DBF /* libui Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libui Mac.a";
remoteRef = 15A6DA7A199CFAFD00B56DBF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
15A6DA7D199CFAFD00B56DBF /* libcocostudio Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libcocostudio Mac.a";
remoteRef = 15A6DA7C199CFAFD00B56DBF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
15A6DA7F199CFAFD00B56DBF /* libcocosbuilder Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libcocosbuilder Mac.a";
remoteRef = 15A6DA7E199CFAFD00B56DBF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
15A6DA81199CFAFD00B56DBF /* libspine Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libspine Mac.a";
remoteRef = 15A6DA80199CFAFD00B56DBF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
15A6DA83199CFAFD00B56DBF /* libnetwork Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libnetwork Mac.a";
remoteRef = 15A6DA82199CFAFD00B56DBF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
15A6DA85199CFAFD00B56DBF /* libui iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libui iOS.a";
remoteRef = 15A6DA84199CFAFD00B56DBF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
15A6DA87199CFAFD00B56DBF /* libcocostudio iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libcocostudio iOS.a";
remoteRef = 15A6DA86199CFAFD00B56DBF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
15A6DA89199CFAFD00B56DBF /* libcocosbuilder iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libcocosbuilder iOS.a";
remoteRef = 15A6DA88199CFAFD00B56DBF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
15A6DA8B199CFAFD00B56DBF /* libspine iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libspine iOS.a";
remoteRef = 15A6DA8A199CFAFD00B56DBF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
15A6DA8D199CFAFD00B56DBF /* libnetwork iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libnetwork iOS.a";
remoteRef = 15A6DA8C199CFAFD00B56DBF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1AC6FAF9180E9839004C840B /* libcocos2d Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@ -755,34 +411,6 @@
remoteRef = 1AC6FAF8180E9839004C840B /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1AC6FAFB180E9839004C840B /* libextension Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libextension Mac.a";
remoteRef = 1AC6FAFA180E9839004C840B /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1AC6FAFD180E9839004C840B /* libchipmunk Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libchipmunk Mac.a";
remoteRef = 1AC6FAFC180E9839004C840B /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1AC6FAFF180E9839004C840B /* libbox2d Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libbox2d Mac.a";
remoteRef = 1AC6FAFE180E9839004C840B /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1AC6FB01180E9839004C840B /* libcocosdenshion Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libcocosdenshion Mac.a";
remoteRef = 1AC6FB00180E9839004C840B /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1AC6FB07180E9839004C840B /* libcocos2d iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@ -790,34 +418,6 @@
remoteRef = 1AC6FB06180E9839004C840B /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1AC6FB09180E9839004C840B /* libextension iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libextension iOS.a";
remoteRef = 1AC6FB08180E9839004C840B /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1AC6FB0B180E9839004C840B /* libchipmunk iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libchipmunk iOS.a";
remoteRef = 1AC6FB0A180E9839004C840B /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1AC6FB0D180E9839004C840B /* libbox2d iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libbox2d iOS.a";
remoteRef = 1AC6FB0C180E9839004C840B /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1AC6FB0F180E9839004C840B /* libcocosdenshion iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libcocosdenshion iOS.a";
remoteRef = 1AC6FB0E180E9839004C840B /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
@ -886,66 +486,16 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
158C129819A1E4C800781A76 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libcocos3d iOS";
targetProxy = 158C129719A1E4C800781A76 /* PBXContainerItemProxy */;
};
158C12AD19A1E4EB00781A76 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libcocos3d Mac";
targetProxy = 158C12AC19A1E4EB00781A76 /* PBXContainerItemProxy */;
};
1AC6FB16180E9959004C840B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "cocos2dx Mac";
targetProxy = 1AC6FB15180E9959004C840B /* PBXContainerItemProxy */;
};
1AC6FB18180E9959004C840B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "cocos2dx-extensions Mac";
targetProxy = 1AC6FB17180E9959004C840B /* PBXContainerItemProxy */;
};
1AC6FB1A180E9959004C840B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "chipmunk Mac";
targetProxy = 1AC6FB19180E9959004C840B /* PBXContainerItemProxy */;
};
1AC6FB1C180E9959004C840B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "CocosDenshion Mac";
targetProxy = 1AC6FB1B180E9959004C840B /* PBXContainerItemProxy */;
};
1AC6FB1E180E9963004C840B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "box2d Mac";
targetProxy = 1AC6FB1D180E9963004C840B /* PBXContainerItemProxy */;
};
1AC6FB25180E99E1004C840B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "cocos2dx iOS";
targetProxy = 1AC6FB24180E99E1004C840B /* PBXContainerItemProxy */;
};
1AC6FB27180E99E1004C840B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "cocos2dx-extensions iOS";
targetProxy = 1AC6FB26180E99E1004C840B /* PBXContainerItemProxy */;
};
1AC6FB29180E99E1004C840B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "chipmunk iOS";
targetProxy = 1AC6FB28180E99E1004C840B /* PBXContainerItemProxy */;
};
1AC6FB2B180E99E1004C840B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "box2d iOS";
targetProxy = 1AC6FB2A180E99E1004C840B /* PBXContainerItemProxy */;
};
1AC6FB2D180E99E1004C840B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "CocosDenshion iOS";
targetProxy = 1AC6FB2C180E99E1004C840B /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */

View File

@ -38,6 +38,10 @@ static AppDelegate s_sharedApplication;
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
cocos2d::Application *app = cocos2d::Application::getInstance();
app->initGLContextAttrs();
cocos2d::GLViewImpl::convertAttrs();
// Override point for customization after application launch.
// Add the view controller's view to the window and display.
@ -45,12 +49,12 @@ static AppDelegate s_sharedApplication;
// Init the CCEAGLView
CCEAGLView *eaglView = [CCEAGLView viewWithFrame: [window bounds]
pixelFormat: kEAGLColorFormatRGBA8
depthFormat: GL_DEPTH24_STENCIL8_OES
preserveBackbuffer: NO
sharegroup: nil
multiSampling: NO
numberOfSamples: 0];
pixelFormat: (NSString*)cocos2d::GLViewImpl::_pixelFormat
depthFormat: cocos2d::GLViewImpl::_depthFormat
preserveBackbuffer: NO
sharegroup: nil
multiSampling: NO
numberOfSamples: 0 ];
// Use RootViewController manage CCEAGLView
_viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil];
@ -77,7 +81,7 @@ static AppDelegate s_sharedApplication;
cocos2d::GLView *glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView);
cocos2d::Director::getInstance()->setOpenGLView(glview);
cocos2d::Application::getInstance()->run();
app->run();
return YES;
}

View File

@ -11,8 +11,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos2d\co
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\cocos2d\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos3d", "..\cocos2d\cocos\3d\proj.win32\libcocos3d.vcxproj", "{E24950FA-5BC1-4AEE-A900-4F0259354BF0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -31,10 +29,6 @@ Global
{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32
{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32
{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.ActiveCfg = Debug|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.Build.0 = Debug|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.ActiveCfg = Release|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@ -151,9 +151,6 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)"</C
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\cocos2d\cocos\3d\proj.win32\libcocos3d.vcxproj">
<Project>{e24950fa-5bc1-4aee-a900-4f0259354bf0}</Project>
</ProjectReference>
<ProjectReference Include="..\cocos2d\external\chipmunk\proj.win32\chipmunk.vcxproj">
<Project>{207bc7a9-ccf1-4f2f-a04d-45f72242ae25}</Project>
</ProjectReference>

View File

@ -11,6 +11,17 @@ AppDelegate::~AppDelegate()
{
}
//if you want a different context,just modify the value of glContextAttrs
//it will takes effect on all platforms
void AppDelegate::initGLContextAttrs()
{
//set OpenGL context attributions,now can only set six attributions:
//red,green,blue,alpha,depth,stencil
GLContextAttrs glContextAttrs = {8, 8, 8, 8, 24, 8};
GLView::setGLContextAttrs(glContextAttrs);
}
bool AppDelegate::applicationDidFinishLaunching() {
// initialize director
auto director = Director::getInstance();

View File

@ -14,6 +14,8 @@ public:
AppDelegate();
virtual ~AppDelegate();
virtual void initGLContextAttrs();
/**
@brief Implement Director and Scene init code here.
@return true Initialize success, app continue.

View File

@ -1,12 +1,10 @@
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 2.8)
set(APP_NAME HelloLua)
project (${APP_NAME})
include(cocos2d-x/build/BuildHelpers.CMakeLists.txt)
option(USE_CHIPMUNK "Use chipmunk for physics library" ON)
option(USE_BOX2D "Use box2d for physics library" OFF)
option(DEBUG_MODE "Debug or release?" ON)
if(DEBUG_MODE)
@ -19,17 +17,8 @@ set(CMAKE_C_FLAGS_DEBUG "-g -Wall -DCOCOS2D_DEBUG=1")
set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} "-std=c99")
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++11")
if(USE_CHIPMUNK)
message("Using chipmunk ...")
add_definitions(-DLINUX -DCC_ENABLE_CHIPMUNK_INTEGRATION=1)
elseif(USE_BOX2D)
message("Using box2d ...")
add_definitions(-DLINUX -DCC_ENABLE_BOX2D_INTEGRATION=1)
else(USE_CHIPMUNK)
message(FATAL_ERROR "Must choose a physics library.")
endif(USE_CHIPMUNK)
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++11 -Wno-deprecated-declarations -Wno-reorder")
ADD_DEFINITIONS(-DLINUX)
# architecture
if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
@ -88,70 +77,14 @@ link_directories(
${COCOS2D_ROOT}/external/linux-specific/fmod/prebuilt/${ARCH_DIR}
)
# chipmunk library
add_subdirectory(${COCOS2D_ROOT}/external/chipmunk/src)
# box2d library
add_subdirectory(${COCOS2D_ROOT}/external/Box2D)
# unzip library
add_subdirectory(${COCOS2D_ROOT}/external/unzip)
# tinyxml2 library
add_subdirectory(${COCOS2D_ROOT}/external/tinyxml2)
# audio
add_subdirectory(${COCOS2D_ROOT}/cocos/audio)
# xxhash library
add_subdirectory(${COCOS2D_ROOT}/external/xxhash)
# cocos 2d library
# libcocos2d
add_subdirectory(${COCOS2D_ROOT}/cocos)
# cocos 3d library
add_subdirectory(${COCOS2D_ROOT}/cocos/3d)
# network library
add_subdirectory(${COCOS2D_ROOT}/cocos/network)
# ui library
add_subdirectory(${COCOS2D_ROOT}/cocos/ui)
# sqlite3 library
add_subdirectory(${COCOS2D_ROOT}/cocos/storage)
# extensions
add_subdirectory(${COCOS2D_ROOT}/extensions)
# xxtea library
add_subdirectory(${COCOS2D_ROOT}/external/xxtea)
## Editor Support
# spine
add_subdirectory(${COCOS2D_ROOT}/cocos/editor-support/spine)
# cocosbuilder
add_subdirectory(${COCOS2D_ROOT}/cocos/editor-support/cocosbuilder)
# cocostudio
add_subdirectory(${COCOS2D_ROOT}/cocos/editor-support/cocostudio)
## Scripting
# lua
add_subdirectory(${COCOS2D_ROOT}/external/lua/lua)
# tolua
add_subdirectory(${COCOS2D_ROOT}/external/lua/tolua)
# luabinding
# libluacocos2d
add_subdirectory(${COCOS2D_ROOT}/cocos/scripting/lua-bindings)
# add the executable
add_executable(${APP_NAME}
${GAME_SRC}
)
add_executable(${APP_NAME} ${GAME_SRC})
if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
set(FMOD_LIB "fmodex64")
@ -159,26 +92,7 @@ else()
set(FMOD_LIB "fmodex")
endif()
target_link_libraries(${APP_NAME}
luacocos2d
luacocos3d
luacocosdenshion
luanetwork
luacocosbuilder
luacocostudio
luaspine
luaextension
luaui
cocos2d
cocos3d
audio
cocostudio
spine
cocosbuilder
extensions
ui
network
)
target_link_libraries(${APP_NAME} cocos2d luacocos2d)
set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin")

View File

@ -18,6 +18,17 @@ AppDelegate::~AppDelegate()
SimpleAudioEngine::end();
}
//if you want a different context,just modify the value of glContextAttrs
//it will takes effect on all platforms
void AppDelegate::initGLContextAttrs()
{
//set OpenGL context attributions,now can only set six attributions:
//red,green,blue,alpha,depth,stencil
GLContextAttrs glContextAttrs = {8, 8, 8, 8, 24, 8};
GLView::setGLContextAttrs(glContextAttrs);
}
bool AppDelegate::applicationDidFinishLaunching()
{
auto engine = LuaEngine::getInstance();

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