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

Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_wp8fix

This commit is contained in:
huangshiwu 2014-08-07 11:58:01 +08:00
parent 24d68305e1 1ece703945
commit 0016c7af70
172 changed files with 13186 additions and 8373 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -108,6 +108,7 @@ Developers:
Added support for x64 target of windows.
Added Dutch Language support.
Added clang support for Windows.
Cmake update and remove old scripts from build folder
mchinen
fix emulator issue for OpenGL ES 2.0 on Android
@ -963,6 +964,7 @@ Developers:
rny
Fixed LabelTTF::getBoundingBox() position error
SpriteFrameCache load from plist file content data
Retired Core Developers:
WenSheng Yang

2
CHANGELOG
View File

@ -7,6 +7,7 @@ cocos2d-x-3.3 ??
[NEW] Image: support of software PVRTC v1 decompression
[NEW] RotateTo: added 3D rotation support
[NEW] ScrollView: added `setMinScale()` and `setMaxScale()`
[NEW] SpriteFrameCache: load from plist file content data
[NEW] UIText: added getter and setter for TextColor
[NEW] utils: added gettime()
[NEW] TextField: support utf8
@ -16,6 +17,7 @@ cocos2d-x-3.3 ??
[FIX] Label: can not set charmap after it is created
[FIX] Label: setTextColor does not have any effect on Mac OS X
[FIX] Label: result of LabelTTF::getBoundingBox() is wrong
[FIX] Label: can not set outline color correctly if using system font on iOS
[FIX] LabelBMFont: result of LabelBMFont::getBoundingBox() is wrong
[FIX] ParticleSystem: effect is wrong if scene scaled
[FIX] ParticleSystemQuad: setTotalParticles() can't set a value larger than initialized value

113
CMakeLists.txt
View File

@ -1,7 +1,7 @@
#/****************************************************************************
# Copyright (c) 2013 cocos2d-x.org
# Copyright (c) 2012-2013 martell malone
#
# Copyright (c) 2014 martell malone
#
# http://www.cocos2d-x.org
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
@ -28,38 +28,23 @@ project (Cocos2dx)
# The version number
set(Cocos2dxSamples_VERSION_MAJOR 3)
set(Cocos2dxSamples_VERSION_MINOR 0)
set(Cocos2dxSamples_VERSION_MINOR 1)
include(build/BuildHelpers.CMakeLists.txt)
if(WIN32 OR APPLE)
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_LIBS_LUA "Build lua libraries" OFF)
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_CppTests "Only build TestCpp sample" ON)
option(BUILD_LuaTests "Only build TestLua sample" OFF)
else()#temp
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_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_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_CppTests "Only build TestCpp sample" ON)
option(BUILD_LuaTests "Only build TestLua sample" ON)
endif()#temp
option(BUILD_LuaTests "Build TestLua samples" ON)
if(DEBUG_MODE)
set(CMAKE_BUILD_TYPE DEBUG)
@ -70,31 +55,25 @@ endif(DEBUG_MODE)
set(CMAKE_C_FLAGS_DEBUG "-DCOCOS2D_DEBUG=1")
set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
if(WIN32)
if(MSVC)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
-wd4251 -wd4244 -wd4334 -wd4005 -wd4820 -wd4710
-wd4514 -wd4056 -wd4996 -wd4099)
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")
endif(MSVC)
if(WINDOWS)
ADD_DEFINITIONS (-D_USRDLL -DCOCOS2DXWIN32_EXPORTS -D_WINDOWS -DWIN32)
if(MSVC)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS
-D_SCL_SECURE_NO_WARNINGS
-wd4251 -wd4244 -wd4334
-wd4005 -wd4820 -wd4710
-wd4514 -wd4056 -wd4996 -wd4099)
else(MSVC)#MINGW
endif(MSVC)
elseif(APPLE)
else()#Linux
ADD_DEFINITIONS(-DLINUX)
endif()
if(NOT MSVC)# all gcc
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")
set(PLATFORM_FOLDER win32)
elseif(MACOSX)
set(PLATFORM_FOLDER mac)
else(LINUX)
ADD_DEFINITIONS(-DLINUX)
set(PLATFORM_FOLDER linux)
endif()
if(MINGW)
@ -102,8 +81,12 @@ if(MINGW)
add_definitions(-D__SSIZE_T)
set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lws2_32")
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lws2_32")
endif()
if(CLANG)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions ")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions ")
endif()
endif()
if(USE_CHIPMUNK)
message("Using chipmunk ...")
@ -122,14 +105,6 @@ else()
set(ARCH_DIR "32-bit")
endif()
if(WIN32) # Win32
set(PLATFORM_FOLDER win32)
elseif(APPLE)# osx or ios
set(PLATFORM_FOLDER mac)
else() # Assume Linux
set(PLATFORM_FOLDER linux)
endif()
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/cocos
@ -156,18 +131,18 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/external/xxtea
)
if(WIN32 AND NOT MINGW)
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(APPLE)
elseif(MACOSX)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/external/curl/include/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/external/curl/include/${PLATFORM_FOLDER}
)
else()
elseif(LINUX)
include_directories(
/usr/include
/usr/include/GLFW
@ -177,9 +152,8 @@ else()
endif()
if(WIN32)
if(MSVC)
if(NOT MINGW)
link_directories(
${CMAKE_CURRENT_SOURCE_DIR}/external/jpeg/prebuilt/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/external/tiff/prebuilt/${PLATFORM_FOLDER}
@ -189,11 +163,8 @@ if(WIN32)
${CMAKE_CURRENT_SOURCE_DIR}/external/${PLATFORM_FOLDER}-specific/icon/prebuilt
${CMAKE_CURRENT_SOURCE_DIR}/external/${PLATFORM_FOLDER}-specific/zlib/prebuilt
)
endif()
elseif(APPLE)
else()
elseif(LINUX)
link_directories(
/usr/local/lib
@ -208,17 +179,21 @@ else()
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)
@ -266,15 +241,13 @@ add_subdirectory(cocos/scripting/lua-bindings)
add_subdirectory(external/xxtea)
endif(BUILD_LIBS_LUA)
# build tests
add_subdirectory(tests/cpp-empty-test)
# 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)
endif(BUILD_LuaTests)

56
build/BuildHelpers.CMakeLists.txt
View File

@ -11,3 +11,59 @@ macro(pre_build TARGET_NAME)
add_custom_target( ${TARGET_NAME}_CORE_PRE_BUILD )
add_dependencies( ${TARGET_NAME}_PRE_BUILD ${TARGET_NAME}_CORE_PRE_BUILD )
endmacro()
#cmake has some strange defaults, this should help us a lot
#Please use them everywhere
#WINDOWS = Windows Desktop
#WINRT = Windows RT
#WP8 = Windows Phone 8
#ANDROID = ANDROID
#IOS = IOS
#MACOSX = MAC OSX
if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
if(WINRT)
set(SYSTEM_STRING "Windows RT")
elseif(WP8)
set(SYSTEM_STRING "Windows Phone 8")
else()
set(WINDOWS TRUE)
set(SYSTEM_STRING "Windows Desktop")
endif()
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
if(ANDROID)
set(SYSTEM_STRING "Android")
else()
set(LINUX TRUE)
set(SYSTEM_STRING "Linux")
endif()
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
if(IOS)
set(SYSTEM_STRING "IOS")
else()
set(MACOSX TRUE)
set(SYSTEM_STRING "Mac OSX")
endif()
endif()
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
set(COMPILER_STRING ${CMAKE_CXX_COMPILER_ID})
set(CLANG TRUE)
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
if(MINGW)
set(COMPILER_STRING "Mingw GCC")
else()
set(COMPILER_STRING "GCC")
endif()
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
set(COMPILER_STRING "${CMAKE_CXX_COMPILER_ID} C++")
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
set(COMPILER_STRING "Visual Studio C++")
endif()
if(CMAKE_CROSSCOMPILING)
set(BUILDING_STRING "It appears you are cross compiling for ${SYSTEM_STRING} with ${COMPILER_STRING}")
else()
set(BUILDING_STRING "It appears you are builing natively for ${SYSTEM_STRING} with ${COMPILER_STRING}")
endif()

62
build/build-mingw32-clang-make.sh
View File

@ -1,62 +0,0 @@
#!/bin/bash
# msys2 Pacman Manager for cocos2d-x
#/****************************************************************************
# Copyright (c) 2013-2014 Martell Malone
#
#
# 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.
# ****************************************************************************/
set -e
THISDIR="$(dirname $0)"
test "$THISDIR" = "." && THISDIR=${PWD}
OSTYPE=${OSTYPE//[0-9.]/}
HOST_ARCH=$(uname -m)
if [ "${HOST_ARCH}" = "i686" ]; then
BITS=32
elif [ "${HOST_ARCH}" = "x86_64" ]; then
BITS=64
fi
if [ "${OSTYPE}" = "msys" ]; then
CC=clang
CXX=clang++
PP=mingw-w64-${HOST_ARCH}
MINGW_PACKAGES=(glfw glew libwebp libjpeg-turbo libpng freetype libiconv zlib curl
make clang binutils headers cmake)
MINGW_PACKAGES=(${MINGW_PACKAGES[@]/#/${PP}-})
pacman -S --force --noconfirm --needed ${MINGW_PACKAGES[@]}
mkdir -p mingw${BITS}-clang && cd mingw${BITS}-clang
export PATH=/mingw${BITS}/bin:${PATH}
cmake -G"MinGW Makefiles" -DCMAKE_MAKE_PROGRAM="mingw32-make" \
-DCMAKE_C_COMPILER="${CC}" -DCMAKE_CXX_COMPILER="${CXX}" ../..
mingw32-make
fi

62
build/build-mingw32-gcc-make.sh
View File

@ -1,62 +0,0 @@
#!/bin/bash
# msys2 Pacman Manager for cocos2d-x
#/****************************************************************************
# Copyright (c) 2012-2013 Martell Malone
#
#
# 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.
# ****************************************************************************/
set -e
THISDIR="$(dirname $0)"
test "$THISDIR" = "." && THISDIR=${PWD}
OSTYPE=${OSTYPE//[0-9.]/}
HOST_ARCH=$(uname -m)
if [ "${HOST_ARCH}" = "i686" ]; then
BITS=32
elif [ "${HOST_ARCH}" = "x86_64" ]; then
BITS=64
fi
if [ "${OSTYPE}" = "msys" ]; then
CC=${HOST_ARCH}-w64-mingw32-gcc
CXX=${HOST_ARCH}-w64-mingw32-g++
PP=mingw-w64-${HOST_ARCH}
MINGW_PACKAGES=(glfw glew libwebp libjpeg-turbo libpng freetype libiconv zlib curl
make gcc binutils headers cmake)
MINGW_PACKAGES=(${MINGW_PACKAGES[@]/#/${PP}-})
pacman -S --force --noconfirm --needed ${MINGW_PACKAGES[@]}
mkdir -p mingw${BITS} && cd mingw${BITS}
export PATH=/mingw${BITS}/bin:${PATH}
cmake -G"MinGW Makefiles" -DCMAKE_MAKE_PROGRAM="mingw32-make" \
-DCMAKE_C_COMPILER="${CC}" -DCMAKE_CXX_COMPILER="${CXX}" ../..
mingw32-make
fi

54
build/cocos2d-win32.vc2012.sln
View File

@ -7,8 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-tests", "..\tests\cpp-t
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}") = "liblua", "..\cocos\scripting\lua-bindings\proj.win32\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}"
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}"
@ -31,6 +29,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosbuilder", "..\cocos
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
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -49,10 +63,6 @@ Global
{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
{DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.ActiveCfg = Debug|Win32
{DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.Build.0 = Debug|Win32
{DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Release|Win32.ActiveCfg = Release|Win32
{DDC3E27F-004D-4DD4-9DD3-931A013D2159}.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
@ -97,6 +107,38 @@ Global
{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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

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

File diff suppressed because it is too large Load Diff

17
cocos/2d/CCSpriteFrameCache.cpp
View File

@ -210,6 +210,12 @@ void SpriteFrameCache::addSpriteFramesWithFile(const std::string& plist, Texture
_loadedFileNames->insert(plist);
}
void SpriteFrameCache::addSpriteFramesWithFileContent(const std::string& plist_content, Texture2D *texture)
{
ValueMap dict = FileUtils::getInstance()->getValueMapFromData(plist_content.c_str(), plist_content.size());
addSpriteFramesWithDictionary(dict, texture);
}
void SpriteFrameCache::addSpriteFramesWithFile(const std::string& plist, const std::string& textureFileName)
{
CCASSERT(textureFileName.size()>0, "texture name should not be null");
@ -357,6 +363,17 @@ void SpriteFrameCache::removeSpriteFramesFromFile(const std::string& plist)
}
}
void SpriteFrameCache::removeSpriteFramesFromFileContent(const std::string& plist_content)
{
ValueMap dict = FileUtils::getInstance()->getValueMapFromData(plist_content.data(), plist_content.size());
if (dict.empty())
{
CCLOG("cocos2d:SpriteFrameCache:removeSpriteFramesFromFileContent: create dict by fail.");
return;
}
removeSpriteFramesFromDictionary(dict);
}
void SpriteFrameCache::removeSpriteFramesFromDictionary(ValueMap& dictionary)
{
ValueMap framesDict = dictionary["frames"].asValueMap();

12
cocos/2d/CCSpriteFrameCache.h
View File

@ -106,6 +106,12 @@ public:
*/
void addSpriteFramesWithFile(const std::string&plist, Texture2D *texture);
/** Adds multiple Sprite Frames from a plist file content. The texture will be associated with the created sprite frames.
* @js addSpriteFrames
* @lua addSpriteFrames
*/
void addSpriteFramesWithFileContent(const std::string& plist_content, Texture2D *texture);
/** Adds an sprite frame with a given name.
If the name already exists, then the contents of the old name will be replaced with the new one.
*/
@ -135,6 +141,12 @@ public:
*/
void removeSpriteFramesFromFile(const std::string& plist);
/** Removes multiple Sprite Frames from a plist file content.
* Sprite Frames stored in this file will be removed.
* It is convenient to call this method when a specific texture needs to be removed.
*/
void removeSpriteFramesFromFileContent(const std::string& plist_content);
/** Removes all Sprite Frames associated with the specified textures.
* It is convenient to call this method when a specific texture needs to be removed.
* @since v0.995.

7
cocos/2d/CMakeLists.txt
View File

@ -1,9 +1,3 @@
if(WIN32)
ADD_DEFINITIONS(-DUNICODE -D_UNICODE)
endif()
include_directories(
../external/ConvertUTF
)
@ -76,4 +70,3 @@ set(COCOS_2D_SRC
2d/CCTransitionProgress.cpp
2d/CCTweenFunction.cpp
)

1
cocos/3d/CMakeLists.txt
View File

@ -13,4 +13,3 @@ set(COCOS_3D_SRC
3d/CCMeshSkin.cpp
3d/CCBundleReader.cpp
)

68
cocos/CMakeLists.txt
View File

@ -1,11 +1,8 @@
if(WIN32)
ADD_DEFINITIONS(-DUNICODE -D_UNICODE)
if(WINDOWS)
ADD_DEFINITIONS(-DUNICODE -D_UNICODE)
endif()
set(COCOS_SRC
cocos2d.cpp
)
set(COCOS_SRC cocos2d.cpp)
include(2d/CMakeLists.txt)
include(3d/CMakeLists.txt)
@ -34,60 +31,12 @@ add_library(cocos2d STATIC
${COCOS_DEPRECATED_SRC}
)
if(WIN32)
if(MINGW)
set(COCOS_LINK
z
jpeg
png
webp
tiff
glfw3
glew32
opengl32
iconv
freetype
bz2
)
else()
set(COCOS_LINK
libjpeg
libpng
libwebp
libtiff
freetype250
glfw3
glew32
opengl32
libiconv
libzlib
)
endif()
elseif(APPLE)
else()
set(COCOS_LINK
jpeg
webp
tiff
freetype
fontconfig
png
pthread
glfw
GLEW
GL
X11
rt
z
)
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
@ -105,4 +54,3 @@ set_target_properties(cocos2d
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)

50
cocos/audio/CMakeLists.txt
View File

@ -1,29 +1,26 @@
# architecture
if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
set(ARCH_DIR "64-bit")
else()
set(ARCH_DIR "32-bit")
endif()
#if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
#set(ARCH_DIR "64-bit")
#else()
#set(ARCH_DIR "32-bit")
#endif()
if(WIN32)
if(WINDOWS)
set(AUDIO_SRC
win32/SimpleAudioEngine.cpp
win32/MciPlayer.cpp
win32/MciPlayer.h
win32/MciPlayer.h
)
elseif(APPLE)
else()
elseif(LINUX)
set(AUDIO_SRC
linux/SimpleAudioEngineFMOD.cpp
linux/FmodAudioPlayer.cpp
linux/FmodAudioPlayer.h
linux/AudioPlayer.h
linux/FmodAudioPlayer.h
linux/AudioPlayer.h
)
include_directories(
../../external/linux-specific/fmod/include/${ARCH_DIR}
)
include_directories( ../../external/linux-specific/fmod/include/${ARCH_DIR} )
endif()
@ -33,28 +30,23 @@ add_library(audio STATIC
include/SimpleAudioEngine.h
)
if((NOT APPLE) AND (NOT WIN32))
if(LINUX)
if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
set(FMOD_LIB "fmodex64")
else()
set(FMOD_LIB "fmodex")
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()
target_link_libraries(audio
${FMOD_LIB}
)
set_target_properties(audio
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)
elseif(WIN32)
target_link_libraries(audio
Winmm
)
endif()

9
cocos/editor-support/cocosbuilder/CMakeLists.txt
View File

@ -23,17 +23,12 @@ set(CCB_SRC
CCNode+CCBRelativePositioning.cpp
)
include_directories(
..
)
include_directories( .. )
add_library(cocosbuilder STATIC
${CCB_SRC}
)
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"
)

11
cocos/editor-support/cocostudio/CMakeLists.txt
View File

@ -55,16 +55,11 @@ set(CS_SRC
ActionTimeline/CCTimeLine.cpp
)
include_directories(
..
)
include_directories( .. )
add_library(cocostudio STATIC
${CS_SRC}
)
add_library(cocostudio STATIC ${CS_SRC} )
target_link_libraries(cocostudio
)
target_link_libraries(cocostudio)
set_target_properties(cocostudio
PROPERTIES

8
cocos/editor-support/spine/CMakeLists.txt
View File

@ -32,13 +32,9 @@ set(SPINE_SRC
SkeletonBounds.cpp
)
include_directories(
..
)
include_directories( .. )
add_library(spine STATIC
${SPINE_SRC}
)
add_library(spine STATIC ${SPINE_SRC})
set_target_properties(spine
PROPERTIES

44
cocos/network/CMakeLists.txt
View File

@ -1,37 +1,13 @@
if(WIN32)
set(PLATFORM_SRC
network/WebSocket.cpp
)
set(PLATFORM_LINK
websockets
)
elseif(NOT APPLE)
set(PLATFORM_SRC
network/WebSocket.cpp
)
set(PLATFORM_LINK
websockets
ssl
crypto
)
if(WINDOWS)
set(PLATFORM_LINK websockets)
elseif(LINUX)
set(PLATFORM_LINK websockets ssl crypto)
endif()
set(COCOS_NETWORK_SRC
network/HttpClient.cpp
network/SocketIO.cpp
${PLATFORM_SRC}
)
set(COCOS_NETWORK_SRC network/HttpClient.cpp network/SocketIO.cpp network/WebSocket.cpp)
IF (WIN32 AND NOT MINGW)
set(COCOS_NETWORK_LINK
libcurl_imp
${PLATFORM_LINK}
)
ELSE()
set(COCOS_NETWORK_LINK
curl
${PLATFORM_LINK}
)
ENDIF()
if(MSVC)
set(COCOS_NETWORK_LINK libcurl_imp ${PLATFORM_LINK})
else()
set(COCOS_NETWORK_LINK curl ${PLATFORM_LINK} )
endif()

19
cocos/platform/CCFileUtils.cpp
View File

@ -105,6 +105,18 @@ public:
return _rootDict;
}
ValueMap dictionaryWithDataOfFile(const char* filedata, int filesize)
{
_resultType = SAX_RESULT_DICT;
SAXParser parser;
CCASSERT(parser.init("UTF-8"), "The file format isn't UTF-8");
parser.setDelegator(this);
parser.parse(filedata, filesize);
return _rootDict;
}
ValueVector arrayWithContentsOfFile(const std::string& fileName)
{
_resultType = SAX_RESULT_ARRAY;
@ -321,6 +333,12 @@ ValueMap FileUtils::getValueMapFromFile(const std::string& filename)
return tMaker.dictionaryWithContentsOfFile(fullPath.c_str());
}
ValueMap FileUtils::getValueMapFromData(const char* filedata, int filesize)
{
DictMaker tMaker;
return tMaker.dictionaryWithDataOfFile(filedata, filesize);
}
ValueVector FileUtils::getValueVectorFromFile(const std::string& filename)
{
const std::string fullPath = fullPathForFilename(filename.c_str());
@ -472,6 +490,7 @@ NS_CC_BEGIN
/* The subclass FileUtilsApple should override these two method. */
ValueMap FileUtils::getValueMapFromFile(const std::string& filename) {return ValueMap();}
ValueMap FileUtils::getValueMapFromData(const char* filedata, int filesize) {return ValueMap();}
ValueVector FileUtils::getValueVectorFromFile(const std::string& filename) {return ValueVector();}
bool FileUtils::writeToFile(ValueMap& dict, const std::string &fullPath) {return false;}

6
cocos/platform/CCFileUtils.h
View File

@ -294,6 +294,12 @@ public:
* @note This method is used internally.
*/
virtual ValueMap getValueMapFromFile(const std::string& filename);
/**
* Converts the contents of a file to a ValueMap.
* @note This method is used internally.
*/
virtual ValueMap getValueMapFromData(const char* filedata, int filesize);
/**
* Write a ValueMap to a plist file.

1
cocos/platform/apple/CCFileUtilsApple.h
View File

@ -49,6 +49,7 @@ public:
virtual std::string getFullPathForDirectoryAndFilename(const std::string& directory, const std::string& filename) override;
virtual ValueMap getValueMapFromFile(const std::string& filename) override;
virtual ValueMap getValueMapFromData(const char* filedata, int filesize);
virtual bool writeToFile(ValueMap& dict, const std::string& fullPath) override;
virtual ValueVector getValueVectorFromFile(const std::string& filename) override;

20
cocos/platform/apple/CCFileUtilsApple.mm
View File

@ -428,6 +428,26 @@ ValueMap FileUtilsApple::getValueMapFromFile(const std::string& filename)
return ret;
}
ValueMap FileUtilsApple::getValueMapFromData(const char* filedata, int filesize)
{
NSData* file = [NSData dataWithBytes:filedata length:filesize];
NSPropertyListFormat format;
NSError* error;
NSDictionary* dict = [NSPropertyListSerialization propertyListWithData:file options:NSPropertyListImmutable format:&format error:&error];
ValueMap ret;
if (dict != nil)
{
for (id key in [dict allKeys])
{
id value = [dict objectForKey:key];
addValueToDict(key, value, ret);
}
}
return ret;
}
bool FileUtilsApple::writeToFile(ValueMap& dict, const std::string &fullPath)
{
//CCLOG("iOS||Mac Dictionary %d write to file %s", dict->_ID, fullPath.c_str());

14
cocos/platform/ios/CCDevice.mm
View File

@ -348,7 +348,7 @@ static bool _initWithString(const char * text, cocos2d::Device::TextAlign align,
}
// text color
CGContextSetRGBFillColor(context, info->tintColorR / 255.0f, info->tintColorG / 255.0f, info->tintColorB / 255.0f, 1);
CGContextSetRGBFillColor(context, info->tintColorR, info->tintColorG, info->tintColorB, 1);
// move Y rendering to the top of the image
CGContextTranslateCTM(context, 0.0f, (dim.height - shadowStrokePaddingY) );
CGContextScaleCTM(context, 1.0f, -1.0f); //NOTE: NSString draws in UIKit referential i.e. renders upside-down compared to CGBitmapContext referential
@ -456,13 +456,13 @@ Data Device::getTextureDataForText(const char * text, const FontDefinition& text
info.shadowBlur = textDefinition._shadow._shadowBlur;
info.shadowOpacity = textDefinition._shadow._shadowOpacity;
info.hasStroke = textDefinition._stroke._strokeEnabled;
info.strokeColorR = textDefinition._stroke._strokeColor.r;
info.strokeColorG = textDefinition._stroke._strokeColor.g;
info.strokeColorB = textDefinition._stroke._strokeColor.b;
info.strokeColorR = textDefinition._stroke._strokeColor.r / 255.0f;
info.strokeColorG = textDefinition._stroke._strokeColor.g / 255.0f;
info.strokeColorB = textDefinition._stroke._strokeColor.b / 255.0f;
info.strokeSize = textDefinition._stroke._strokeSize;
info.tintColorR = textDefinition._fontFillColor.r;
info.tintColorG = textDefinition._fontFillColor.g;
info.tintColorB = textDefinition._fontFillColor.b;
info.tintColorR = textDefinition._fontFillColor.r / 255.0f;
info.tintColorG = textDefinition._fontFillColor.g / 255.0f;
info.tintColorB = textDefinition._fontFillColor.b / 255.0f;
if (! _initWithString(text, align, textDefinition._fontName.c_str(), textDefinition._fontSize, &info))
{

3
cocos/platform/win32/CCDevice.cpp
View File

@ -405,7 +405,8 @@ Data Device::getTextureDataForText(const char * text, const FontDefinition& text
}
// draw text
SIZE size = {textDefinition._dimensions.width, textDefinition._dimensions.height};
// does changing to SIZE here affects the font size by rounding from float?
SIZE size = {(LONG) textDefinition._dimensions.width,(LONG) textDefinition._dimensions.height};
CC_BREAK_IF(! dc.drawText(text, size, align));
int dataLen = size.cx * size.cy * 4;

4
cocos/platform/win32/CCStdC.h
View File

@ -124,12 +124,14 @@ inline int vsnprintf_s(char *buffer, size_t sizeOfBuffer, size_t count,
const char *format, va_list argptr) {
return vsnprintf(buffer, sizeOfBuffer, format, argptr);
}
#ifndef __clang__
inline errno_t strcpy_s(char *strDestination, size_t numberOfElements,
const char *strSource) {
strcpy(strDestination, strSource);
return 0;
}
#endif
#endif // __MINGW32__
// Conflicted with cocos2d::MessageBox, so we need to undef it.

1
cocos/renderer/CMakeLists.txt
View File

@ -16,4 +16,3 @@ set(COCOS_RENDERER_SRC
renderer/CCTextureAtlas.cpp
renderer/CCTextureCache.cpp
)

112
cocos/scripting/lua-bindings/Android.mk
View File

@ -1,112 +0,0 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := cocos_lua_static
LOCAL_MODULE_FILENAME := liblua
LOCAL_SRC_FILES := manual/CCLuaBridge.cpp \
manual/CCLuaEngine.cpp \
manual/CCLuaStack.cpp \
manual/lua_debugger.c \
manual/CCLuaValue.cpp \
manual/Cocos2dxLuaLoader.cpp \
manual/CCBProxy.cpp \
manual/Lua_web_socket.cpp \
manual/LuaOpengl.cpp \
manual/LuaScriptHandlerMgr.cpp \
manual/LuaBasicConversions.cpp \
manual/LuaSkeletonAnimation.cpp \
manual/lua_cocos2dx_manual.cpp \
manual/lua_cocos2dx_extension_manual.cpp \
manual/lua_cocos2dx_coco_studio_manual.cpp \
manual/lua_cocos2dx_ui_manual.cpp \
manual/lua_cocos2dx_spine_manual.cpp \
manual/lua_cocos2dx_physics_manual.cpp \
manual/lua_cocos2dx_experimental_manual.cpp \
manual/lua_cocos2dx_experimental_video_manual.cpp \
manual/lua_cocos2dx_deprecated.cpp \
manual/lua_xml_http_request.cpp \
manual/platform/android/CCLuaJavaBridge.cpp \
manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp \
manual/tolua_fix.cpp \
manual/lua_extensions.c \
auto/lua_cocos2dx_auto.cpp \
auto/lua_cocos2dx_extension_auto.cpp \
auto/lua_cocos2dx_studio_auto.cpp \
auto/lua_cocos2dx_ui_auto.cpp \
auto/lua_cocos2dx_spine_auto.cpp \
auto/lua_cocos2dx_physics_auto.cpp \
auto/lua_cocos2dx_experimental_auto.cpp \
auto/lua_cocos2dx_experimental_video_auto.cpp \
../../../external/lua/tolua/tolua_event.c \
../../../external/lua/tolua/tolua_is.c \
../../../external/lua/tolua/tolua_map.c \
../../../external/lua/tolua/tolua_push.c \
../../../external/lua/tolua/tolua_to.c \
../../../external/lua/luasocket/auxiliar.c \
../../../external/lua/luasocket/buffer.c \
../../../external/lua/luasocket/except.c \
../../../external/lua/luasocket/inet.c \
../../../external/lua/luasocket/io.c \
../../../external/lua/luasocket/luasocket.c \
../../../external/lua/luasocket/mime.c \
../../../external/lua/luasocket/options.c \
../../../external/lua/luasocket/select.c \
../../../external/lua/luasocket/serial.c \
../../../external/lua/luasocket/tcp.c \
../../../external/lua/luasocket/timeout.c \
../../../external/lua/luasocket/udp.c \
../../../external/lua/luasocket/unix.c \
../../../external/lua/luasocket/usocket.c \
../../../external/xxtea/xxtea.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../external/lua/tolua \
$(LOCAL_PATH)/../../../external/lua/luajit/include \
$(LOCAL_PATH)/../../../external/lua \
$(LOCAL_PATH)/../../../extensions \
$(LOCAL_PATH)/../../editor-support/spine \
$(LOCAL_PATH)/../../editor-support/cocosbuilder \
$(LOCAL_PATH)/../../editor-support/cocostudio \
$(LOCAL_PATH)/../../ui \
$(LOCAL_PATH)/../../2d \
$(LOCAL_PATH)/../../3d \
$(LOCAL_PATH)/auto \
$(LOCAL_PATH)/manual \
$(LOCAL_PATH)/manual/platform/android \
$(LOCAL_PATH)/manual/platform/android/jni \
$(LOCAL_PATH)/../../../external/xxtea
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../external/lua/tolua \
$(LOCAL_PATH)/../../../external/lua/luajit/include \
$(LOCAL_PATH)/../external \
$(LOCAL_PATH)/auto \
$(LOCAL_PATH)/manual
LOCAL_WHOLE_STATIC_LIBRARIES := luajit_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dx_static
LOCAL_WHOLE_STATIC_LIBRARIES += websockets_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static
LOCAL_WHOLE_STATIC_LIBRARIES += spine_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
LOCAL_CFLAGS += -Wno-psabi
LOCAL_EXPORT_CFLAGS += -Wno-psabi
include $(BUILD_STATIC_LIBRARY)
$(call import-module,lua/luajit/prebuilt/android)
$(call import-module,extensions)
$(call import-module,.)
$(call import-module,websockets/prebuilt/android)
$(call import-module,network)
$(call import-module,editor-support/cocostudio)
$(call import-module,editor-support/cocosbuilder)
$(call import-module,editor-support/spine)
$(call import-module,audio/android)

199
cocos/scripting/lua-bindings/CMakeLists.txt
View File

@ -1,9 +1,6 @@
set(LUABINDING_SRC
#luacocos2d
set(LIBLUACOCOS2D_SRC
auto/lua_cocos2dx_auto.cpp
auto/lua_cocos2dx_extension_auto.cpp
auto/lua_cocos2dx_studio_auto.cpp
auto/lua_cocos2dx_ui_auto.cpp
auto/lua_cocos2dx_spine_auto.cpp
auto/lua_cocos2dx_physics_auto.cpp
auto/lua_cocos2dx_experimental_auto.cpp
manual/tolua_fix.cpp
@ -12,51 +9,199 @@ set(LUABINDING_SRC
manual/CCLuaStack.cpp
manual/CCLuaValue.cpp
manual/Cocos2dxLuaLoader.cpp
manual/CCBProxy.cpp
manual/LuaOpengl.cpp
manual/LuaScriptHandlerMgr.cpp
manual/LuaBasicConversions.cpp
manual/lua_cocos2dx_manual.cpp
manual/lua_cocos2dx_extension_manual.cpp
manual/lua_cocos2dx_coco_studio_manual.cpp
manual/lua_cocos2dx_ui_manual.cpp
manual/lua_cocos2dx_spine_manual.cpp
manual/lua_cocos2dx_physics_manual.cpp
manual/lua_cocos2dx_deprecated.cpp
manual/lua_xml_http_request.cpp
manual/LuaSkeletonAnimation.cpp
manual/lua_cocos2dx_experimental_manual.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
)
include_directories(
auto
manual
../../editor-support/cocosbuilder
../../editor-support/cocostudio
../../editor-support/spine
../../ui
manual/cocos2d
manual/extension
manual/cocostudio
manual/ui
../../2d
../../3d
../../../extensions
../../../external/lua/lua
../../../external/lua/tolua
../../../external/xxtea
)
add_library(luabinding STATIC
${LUABINDING_SRC}
add_library(luacocos2d STATIC
${LIBLUACOCOS2D_SRC}
)
target_link_libraries(luabinding
target_link_libraries(luacocos2d
tolua
lua
spine
xxtea
)
set_target_properties(luabinding
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"
)

7
cocos/scripting/lua-bindings/auto/api/FileUtils.lua
View File

@ -74,6 +74,13 @@
-- @param #string str
-- @return map_table#map_table ret (return value: map_table)
--------------------------------
-- @function [parent=#FileUtils] getValueMapFromData
-- @param self
-- @param #char char
-- @param #int int
-- @return map_table#map_table ret (return value: map_table)
--------------------------------
-- @function [parent=#FileUtils] removeDirectory
-- @param self

11
cocos/scripting/lua-bindings/auto/api/SpriteFrameCache.lua
View File

@ -4,6 +4,12 @@
-- @extend Ref
-- @parent_module cc
--------------------------------
-- @function [parent=#SpriteFrameCache] addSpriteFramesWithFileContent
-- @param self
-- @param #string str
-- @param #cc.Texture2D texture2d
--------------------------------
-- @overload self, string, string
-- @overload self, string
@ -48,6 +54,11 @@
-- @param self
-- @param #cc.Texture2D texture2d
--------------------------------
-- @function [parent=#SpriteFrameCache] removeSpriteFramesFromFileContent
-- @param self
-- @param #string str
--------------------------------
-- @function [parent=#SpriteFrameCache] removeSpriteFrameByName
-- @param self

5
cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
View File

@ -1231,11 +1231,6 @@
-- @field [parent=#cc] AttachNode#AttachNode AttachNode preloaded module
--------------------------------------------------------
-- the cc SimpleAudioEngine
-- @field [parent=#cc] SimpleAudioEngine#SimpleAudioEngine SimpleAudioEngine preloaded module
--------------------------------------------------------
-- the cc ProtectedNode
-- @field [parent=#cc] ProtectedNode#ProtectedNode ProtectedNode preloaded module

14
cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_cocosbuilder_auto_api.lua Normal file
View File

@ -0,0 +1,14 @@
--------------------------------
-- @module cc
--------------------------------------------------------
-- the cc CCBAnimationManager
-- @field [parent=#cc] CCBAnimationManager#CCBAnimationManager CCBAnimationManager preloaded module
--------------------------------------------------------
-- the cc CCBReader
-- @field [parent=#cc] CCBReader#CCBReader CCBReader preloaded module
return nil

9
cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_cocosdenshion_auto_api.lua Normal file
View File

@ -0,0 +1,9 @@
--------------------------------
-- @module cc
--------------------------------------------------------
-- the cc SimpleAudioEngine
-- @field [parent=#cc] SimpleAudioEngine#SimpleAudioEngine SimpleAudioEngine preloaded module
return nil

10
cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_extension_auto_api.lua
View File

@ -76,14 +76,4 @@
-- @field [parent=#cc] AssetsManager#AssetsManager AssetsManager preloaded module
--------------------------------------------------------
-- the cc CCBAnimationManager
-- @field [parent=#cc] CCBAnimationManager#CCBAnimationManager CCBAnimationManager preloaded module
--------------------------------------------------------
-- the cc CCBReader
-- @field [parent=#cc] CCBReader#CCBReader CCBReader preloaded module
return nil

1288
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
View File

File diff suppressed because it is too large Load Diff

21
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
View File

@ -1547,27 +1547,6 @@ int register_all_cocos2dx(lua_State* tolua_S);

2772
cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosbuilder_auto.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

74
cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosbuilder_auto.hpp Normal file
View File

@ -0,0 +1,74 @@
#include "base/ccConfig.h"
#ifndef __cocos2dx_cocosbuilder_h__
#define __cocos2dx_cocosbuilder_h__
#ifdef __cplusplus
extern "C" {
#endif
#include "tolua++.h"
#ifdef __cplusplus
}
#endif
int register_all_cocos2dx_cocosbuilder(lua_State* tolua_S);
#endif // __cocos2dx_cocosbuilder_h__

1157
cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosdenshion_auto.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

39
cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosdenshion_auto.hpp Normal file
View File

@ -0,0 +1,39 @@
#include "base/ccConfig.h"
#ifndef __cocos2dx_cocosdenshion_h__
#define __cocos2dx_cocosdenshion_h__
#ifdef __cplusplus
extern "C" {
#endif
#include "tolua++.h"
#ifdef __cplusplus
}
#endif
int register_all_cocos2dx_cocosdenshion(lua_State* tolua_S);
#endif // __cocos2dx_cocosdenshion_h__

2777
cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp
View File

File diff suppressed because it is too large Load Diff

59
cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp
View File

@ -290,65 +290,6 @@ int register_all_cocos2dx_extension(lua_State* tolua_S);

6
cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp
View File

@ -57,9 +57,9 @@ bool LuaEngine::init(void)
{
_stack = LuaStack::create();
_stack->retain();
executeScriptFile("DeprecatedEnum.lua");
executeScriptFile("DeprecatedClass.lua");
executeScriptFile("Deprecated.lua");
executeScriptFile("DeprecatedCocos2dClass");
executeScriptFile("DeprecatedCocos2dEnum");
executeScriptFile("DeprecatedCocos2dFunc");
return true;
}

2
cocos/scripting/lua-bindings/manual/CCLuaEngine.h
View File

@ -34,7 +34,7 @@ extern "C" {
#include "base/CCScriptSupport.h"
#include "CCLuaStack.h"
#include "CCLuaValue.h"
#include "LuaScriptHandlerMgr.h"
#include "cocos2d/LuaScriptHandlerMgr.h"
NS_CC_BEGIN

55
cocos/scripting/lua-bindings/manual/CCLuaStack.cpp
View File

@ -31,9 +31,6 @@ extern "C" {
#include "tolua++.h"
#include "lualib.h"
#include "lauxlib.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
#include "lua_extensions.h"
#endif
}
#include "Cocos2dxLuaLoader.h"
@ -46,37 +43,17 @@ extern "C" {
#include "platform/android/CCLuaJavaBridge.h"
#endif
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
#include "platform/android/CCLuaJavaBridge.h"
#endif
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
#include "Lua_web_socket.h"
#endif
#include "LuaOpengl.h"
#include "LuaScriptHandlerMgr.h"
#include "lua_cocos2dx_auto.hpp"
#include "lua_cocos2dx_extension_auto.hpp"
#include "lua_cocos2dx_manual.hpp"
#include "LuaBasicConversions.h"
#include "lua_cocos2dx_extension_manual.h"
#include "lua_cocos2dx_deprecated.h"
#include "lua_xml_http_request.h"
#include "lua_cocos2dx_studio_auto.hpp"
#include "lua_cocos2dx_coco_studio_manual.hpp"
#include "lua_cocos2dx_spine_auto.hpp"
#include "lua_cocos2dx_spine_manual.hpp"
#include "lua_cocos2dx_physics_auto.hpp"
#include "lua_cocos2dx_physics_manual.hpp"
#include "lua_cocos2dx_ui_auto.hpp"
#include "lua_cocos2dx_ui_manual.hpp"
#include "lua_cocos2dx_experimental_auto.hpp"
#include "lua_cocos2dx_experimental_manual.hpp"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
#include "lua_cocos2dx_experimental_video_auto.hpp"
#include "lua_cocos2dx_experimental_video_manual.hpp"
#endif
namespace {
int lua_print(lua_State * luastate)
@ -160,23 +137,15 @@ bool LuaStack::init(void)
{NULL, NULL}
};
luaL_register(_state, "_G", global_functions);
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
luaopen_lua_extensions(_state);
#endif
g_luaType.clear();
register_all_cocos2dx(_state);
register_all_cocos2dx_extension(_state);
register_cocos2dx_extension_CCBProxy(_state);
tolua_opengl_open(_state);
register_all_cocos2dx_ui(_state);
register_all_cocos2dx_studio(_state);
register_all_cocos2dx_manual(_state);
register_all_cocos2dx_module_manual(_state);
register_all_cocos2dx_extension_manual(_state);
register_all_cocos2dx_coco_studio_manual(_state);
register_all_cocos2dx_ui_manual(_state);
register_all_cocos2dx_spine(_state);
register_all_cocos2dx_spine_manual(_state);
register_all_cocos2dx_experimental(_state);
register_all_cocos2dx_experimental_manual(_state);
register_glnode_manual(_state);
#if CC_USE_PHYSICS
register_all_cocos2dx_physics(_state);
@ -186,24 +155,10 @@ bool LuaStack::init(void)
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
LuaObjcBridge::luaopen_luaoc(_state);
#endif
register_all_cocos2dx_experimental(_state);
register_all_cocos2dx_experimental_manual(_state);
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
register_all_cocos2dx_experimental_video(_state);
register_all_cocos2dx_experimental_video_manual(_state);
#endif
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
LuaJavaBridge::luaopen_luaj(_state);
#endif
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
tolua_web_socket_open(_state);
register_web_socket_manual(_state);
#endif
register_xml_http_request(_state);
register_all_cocos2dx_deprecated(_state);
register_all_cocos2dx_manual_deprecated(_state);

0
cocos/scripting/lua-bindings/manual/LuaOpengl.cpp → cocos/scripting/lua-bindings/manual/cocos2d/LuaOpengl.cpp
View File

0
cocos/scripting/lua-bindings/manual/LuaOpengl.h → cocos/scripting/lua-bindings/manual/cocos2d/LuaOpengl.h
View File

1
cocos/scripting/lua-bindings/manual/LuaScriptHandlerMgr.cpp → cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.cpp
View File

@ -30,7 +30,6 @@
#include "CCLuaStack.h"
#include "CCLuaValue.h"
#include "CCLuaEngine.h"
#include "Lua_web_socket.h"
#include "LuaOpengl.h"
using namespace cocos2d;

0
cocos/scripting/lua-bindings/manual/LuaScriptHandlerMgr.h → cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h
View File

0
cocos/scripting/lua-bindings/manual/lua_cocos2dx_deprecated.cpp → cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_deprecated.cpp
View File

0
cocos/scripting/lua-bindings/manual/lua_cocos2dx_deprecated.h → cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_deprecated.h
View File

1
cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.cpp → cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_experimental_manual.cpp
View File

@ -1,5 +1,4 @@
#include "lua_cocos2dx_experimental_manual.hpp"
#include "UIVideoPlayer.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
#include "CCLuaValue.h"

0
cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.hpp → cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_experimental_manual.hpp
View File

0
cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.cpp → cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp
View File

0
cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.hpp → cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.hpp
View File

0
cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.cpp → cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.cpp
View File

0
cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.hpp → cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.hpp
View File

0
cocos/scripting/lua-bindings/manual/CCBProxy.cpp → cocos/scripting/lua-bindings/manual/cocosbuilder/CCBProxy.cpp
View File

0
cocos/scripting/lua-bindings/manual/CCBProxy.h → cocos/scripting/lua-bindings/manual/cocosbuilder/CCBProxy.h
View File

471
cocos/scripting/lua-bindings/manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp Normal file
View File

@ -0,0 +1,471 @@
/****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Inc.
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 "lua_cocos2dx_cocosbuilder_manual.h"
#include "lua_cocos2dx_cocosbuilder_auto.hpp"
#include "cocos2d.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
#include "CCLuaEngine.h"
#include "CCLuaValue.h"
#include "CCBProxy.h"
USING_NS_CC;
USING_NS_CC_EXT;
static int tolua_cocos2d_CCBProxy_create(lua_State* tolua_S)
{
if (NULL == tolua_S)
return 0;
int argc = 0;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
if (!tolua_isusertable(tolua_S,1,"cc.CCBProxy",0,&tolua_err)) goto tolua_lerror;
#endif
argc = lua_gettop(tolua_S) - 1;
if (0 == argc)
{
CCBProxy* tolua_ret = (CCBProxy*)CCBProxy::create();
int nID = (tolua_ret) ? (int)tolua_ret->_ID : -1;
int *pLuaID = (tolua_ret) ? &tolua_ret->_luaID : NULL;
toluafix_pushusertype_ccobject(tolua_S, nID, pLuaID, (void*)tolua_ret,"cc.CCBProxy");
return 1;
}
CCLOG("%s function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", "cc.CCBProxy:create", argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_create'.",&tolua_err);
return 0;
#endif
}
static int tolua_cocos2d_CCBProxy_createCCBReader(lua_State* tolua_S)
{
if (NULL == tolua_S)
return 0;
int argc = 0;
CCBProxy* self = nullptr;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
if (!tolua_isusertype(tolua_S,1,"cc.CCBProxy",0,&tolua_err)) goto tolua_lerror;
#endif
self = static_cast<CCBProxy*>(tolua_tousertype(tolua_S,1,0));
#if COCOS2D_DEBUG >= 1
if (nullptr == self) {
tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBProxy_createCCBReader'\n", NULL);
return 0;
}
#endif
argc = lua_gettop(tolua_S) - 1;
if (0 == argc)
{
CCBReader* tolua_ret = (CCBReader*) self->createCCBReader();
int nID = (tolua_ret) ? (int)tolua_ret->_ID : -1;
int* pLuaID = (tolua_ret) ? &tolua_ret->_luaID : NULL;
toluafix_pushusertype_ccobject(tolua_S, nID, pLuaID, (void*)tolua_ret,"cc.CCBReader");
return 1;
}
CCLOG("%s function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", "cc.CCBProxy:createCCBReader", argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_createCCBReader'.",&tolua_err);
return 0;
#endif
}
static int tolua_cocos2d_CCBProxy_readCCBFromFile(lua_State* tolua_S)
{
if (NULL == tolua_S)
return 0;
int argc = 0;
CCBProxy* self = nullptr;
const char* ccbFilePath = nullptr;
CCBReader* ccbReader = nullptr;
bool setOwner = false;
Node* tolua_ret = nullptr;
int ID = 0;
int* luaID = nullptr;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
if (!tolua_isusertype(tolua_S,1,"cc.CCBProxy",0,&tolua_err)) goto tolua_lerror;
#endif
self = static_cast<CCBProxy*>(tolua_tousertype(tolua_S,1,0));
#if COCOS2D_DEBUG >= 1
if (nullptr == self) {
tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBProxy_readCCBFromFile'\n", NULL);
return 0;
}
#endif
argc = lua_gettop(tolua_S) - 1;
if (2 == argc || 3 == argc)
{
#if COCOS2D_DEBUG >= 1
if (!tolua_isstring(tolua_S, 2, 0, &tolua_err)||
!tolua_isusertype(tolua_S,3,"cc.CCBReader",0,&tolua_err)||
!tolua_isboolean(tolua_S,4,1,&tolua_err )
)
goto tolua_lerror;
#endif
ccbFilePath = ((const char*) tolua_tostring(tolua_S,2,0));
ccbReader = ((CCBReader*) tolua_tousertype(tolua_S,3,0));
setOwner = (bool) tolua_toboolean(tolua_S,4,-1);
tolua_ret = (Node*) self->readCCBFromFile(ccbFilePath, ccbReader, setOwner);
ID = (tolua_ret) ? (int)tolua_ret->_ID : -1;
luaID = (tolua_ret) ? &tolua_ret->_luaID : NULL;
toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)tolua_ret,"cc.Node");
return 1;
}
CCLOG("%s function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", "cc.CCBReader:readCCBFromFile", argc, 2);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_readCCBFromFile'.",&tolua_err);
return 0;
#endif
}
static int tolua_cocos2d_CCBProxy_getNodeTypeName(lua_State* tolua_S)
{
if (nullptr == tolua_S)
return 0;
int argc = 0;
CCBProxy* self = nullptr;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
if (!tolua_isusertype(tolua_S,1,"cc.CCBProxy",0,&tolua_err)) goto tolua_lerror;
#endif
self = static_cast<CCBProxy*>(tolua_tousertype(tolua_S,1,0));
#if COCOS2D_DEBUG >= 1
if (nullptr == self) {
tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBProxy_getNodeTypeName'\n", NULL);
return 0;
}
#endif
argc = lua_gettop(tolua_S) - 1;
if (1 == argc)
{
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"cc.Node",0,&tolua_err)) goto tolua_lerror;
#endif
Node* node = static_cast<Node*>(tolua_tousertype(tolua_S,2,0));
const char* tolua_ret = (const char*)self->getNodeTypeName(node);
tolua_pushstring(tolua_S,(const char*)tolua_ret);
return 1;
}
CCLOG(" %s has wrong number of arguments: %d, was expecting %d\n", "cc.CCBProxy:getNodeTypeName", argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_getNodeTypeName'.",&tolua_err);
return 0;
#endif
}
static int tolua_cocos2d_CCBProxy_setCallback(lua_State* tolua_S)
{
if (nullptr == tolua_S)
return 0;
int argc = 0;
CCBProxy* self = nullptr;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
if (!tolua_isusertype(tolua_S,1,"cc.CCBProxy",0,&tolua_err)) goto tolua_lerror;
#endif
self = static_cast<CCBProxy*>(tolua_tousertype(tolua_S,1,0));
#if COCOS2D_DEBUG >= 1
if (nullptr == self) {
tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBProxy_setCallback'\n", NULL);
return 0;
}
#endif
argc = lua_gettop(tolua_S) - 1;
if ( argc >= 2 && argc <= 3 )
{
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,2,"cc.Node",0,&tolua_err) ||
!toluafix_isfunction(tolua_S, 3, "LUA_FUNCTION", 0, &tolua_err) ||
!tolua_isnumber(tolua_S, 4, 1, &tolua_err)
)
goto tolua_lerror;
#endif
Node* node = ((Node*)tolua_tousertype(tolua_S,2,0));
LUA_FUNCTION funID = ( toluafix_ref_function(tolua_S,3,0));
int controlEvents = (int)tolua_tonumber(tolua_S, 4, 1);
self->setCallback(node, funID, controlEvents);
return 0;
}
CCLOG(" %s has wrong number of arguments: %d, was expecting %d\n", "cc.CCBProxy:setCallback", argc, 2);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_setCallback'.",&tolua_err);
return 0;
#endif
}
int register_cocos2dx_extension_CCBProxy(lua_State* tolua_S)
{
tolua_module(tolua_S,"cc",0);
tolua_beginmodule(tolua_S,"cc");
tolua_usertype(tolua_S,"cc.CCBProxy");
tolua_cclass(tolua_S,"CCBProxy","cc.CCBProxy","cc.Layer",NULL);
tolua_beginmodule(tolua_S,"CCBProxy");
tolua_function(tolua_S, "create", tolua_cocos2d_CCBProxy_create);
tolua_function(tolua_S, "createCCBReader", tolua_cocos2d_CCBProxy_createCCBReader);
tolua_function(tolua_S, "readCCBFromFile", tolua_cocos2d_CCBProxy_readCCBFromFile);
tolua_function(tolua_S, "getNodeTypeName", tolua_cocos2d_CCBProxy_getNodeTypeName);
tolua_function(tolua_S, "setCallback", tolua_cocos2d_CCBProxy_setCallback);
tolua_endmodule(tolua_S);
tolua_endmodule(tolua_S);
std::string typeName = typeid(CCBProxy).name();
g_luaType[typeName] = "cc.CCBProxy";
return 1;
}
static int tolua_cocos2d_CCBReader_load(lua_State* tolua_S)
{
if (nullptr == tolua_S)
return 0;
int argc = 0;
CCBReader* self = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
if (!tolua_isusertype(tolua_S,1,"cc.CCBReader",0,&tolua_err)) goto tolua_lerror;
#endif
self = static_cast<CCBReader*>(tolua_tousertype(tolua_S,1,0));
#if COCOS2D_DEBUG >= 1
if (nullptr == self) {
tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBReader_load'\n", NULL);
return 0;
}
#endif
argc = lua_gettop(tolua_S) - 1;
if (argc >= 1 && argc <= 3)
{
const char* fileName = nullptr;
std::string fileName_tmp = "";
ok &= luaval_to_std_string(tolua_S, 2, &fileName_tmp, "cc.CCBReader:load");
fileName = fileName_tmp.c_str();
if (!ok)
return 0;
if (1 == argc)
{
Node* tolua_ret = (Node*) self->readNodeGraphFromFile(fileName);
int ID = (tolua_ret) ? (int)tolua_ret->_ID : -1;
int* luaID = (tolua_ret) ? &tolua_ret->_luaID : NULL;
toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)tolua_ret,"cc.Node");
return 1;
}
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S, 3, "cc.Ref", 0, &tolua_err))
goto tolua_lerror;
#endif
Ref* owner = static_cast<Ref*>(tolua_tousertype(tolua_S, 3, 0));
//In lua owner always define in lua script by table, so owner is always nullptr
if (2 == argc)
{
Node* tolua_ret = (Node*) self->readNodeGraphFromFile(fileName,owner);
int ID = (tolua_ret) ? (int)tolua_ret->_ID : -1;
int* luaID = (tolua_ret) ? &tolua_ret->_luaID : NULL;
toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)tolua_ret,"cc.Node");
return 1;
}
Size size;
ok &= luaval_to_size(tolua_S, 4, &size, "cc.CCBReader:load");
if (!ok)
return 0;
Node* tolua_ret = (Node*) self->readNodeGraphFromFile(fileName,owner,size);
int ID = (tolua_ret) ? (int)tolua_ret->_ID : -1;
int* luaID = (tolua_ret) ? &tolua_ret->_luaID : NULL;
toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)tolua_ret,"cc.Node");
return 1;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CCBReader:load",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBReader_load'.",&tolua_err);
return 0;
#endif
}
static void extendCCBReader(lua_State* tolua_S)
{
lua_pushstring(tolua_S, "cc.CCBReader");
lua_rawget(tolua_S, LUA_REGISTRYINDEX);
if (lua_istable(tolua_S,-1))
{
lua_pushstring(tolua_S,"load");
lua_pushcfunction(tolua_S,tolua_cocos2d_CCBReader_load );
lua_rawset(tolua_S,-3);
}
lua_pop(tolua_S, 1);
}
static int tolua_cocos2d_CCBAnimationManager_setCallFuncForLuaCallbackNamed(lua_State* tolua_S)
{
if (nullptr == tolua_S)
return 0;
int argc = 0;
CCBAnimationManager* self = nullptr;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
if (!tolua_isusertype(tolua_S,1,"cc.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror;
#endif
self = static_cast<CCBAnimationManager*>(tolua_tousertype(tolua_S,1,0));
#if COCOS2D_DEBUG >= 1
if (nullptr == self) {
tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBAnimationManager_setCallFuncForLuaCallbackNamed'\n", NULL);
return 0;
}
#endif
argc = lua_gettop(tolua_S) - 1;
if (2 == argc)
{
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,2, "cc.CallFunc", 0, &tolua_err) ||
!tolua_isstring(tolua_S, 3, 0, &tolua_err) )
goto tolua_lerror;
#endif
CallFunc* pCallFunc = static_cast<CallFunc*>(tolua_tousertype(tolua_S,2,0));
const char* keyframeCallback = ((const char*) tolua_tostring(tolua_S,3,0));
std::string strKey = "";
if (NULL != keyframeCallback) {
strKey = keyframeCallback;
}
self->setCallFunc(pCallFunc, strKey);
return 0;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CCBAnimationManager:setCallFuncForLuaCallbackNamed",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBAnimationManager_setCallFuncForLuaCallbackNamed'.",&tolua_err);
return 0;
#endif
}
static void extendCCBAnimationManager(lua_State* tolua_S)
{
lua_pushstring(tolua_S, "cc.CCBAnimationManager");
lua_rawget(tolua_S, LUA_REGISTRYINDEX);
if (lua_istable(tolua_S,-1))
{
lua_pushstring(tolua_S,"setCallFuncForLuaCallbackNamed");
lua_pushcfunction(tolua_S,tolua_cocos2d_CCBAnimationManager_setCallFuncForLuaCallbackNamed );
lua_rawset(tolua_S,-3);
}
lua_pop(tolua_S, 1);
}
int register_all_cocos2dx_cocosbuilder_manual(lua_State* tolua_S)
{
register_cocos2dx_extension_CCBProxy(tolua_S);
extendCCBReader(tolua_S);
extendCCBAnimationManager(tolua_S);
return 0;
}
int register_cocosbuilder_module(lua_State* tolua_S)
{
lua_getglobal(tolua_S, "_G");
if (lua_istable(tolua_S,-1))//stack:...,_G,
{
register_all_cocos2dx_cocosbuilder(tolua_S);
register_all_cocos2dx_cocosbuilder_manual(tolua_S);
}
lua_pop(tolua_S, 1);
LuaEngine::getInstance()->executeScriptFile("DeprecatedCocosBuilderClass");
return 1;
}

38
cocos/scripting/lua-bindings/manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.h Normal file
View File

@ -0,0 +1,38 @@
/****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Inc.
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 COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_LUA_COCOS2DX_COCOSBUILDER_H
#define COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_LUA_COCOS2DX_COCOSBUILDER_H
#ifdef __cplusplus
extern "C" {
#endif
#include "tolua++.h"
#ifdef __cplusplus
}
#endif
TOLUA_API int register_all_cocos2dx_cocosbuilder_manual(lua_State* tolua_S);
TOLUA_API int register_cocosbuilder_module(lua_State* tolua_S);
#endif // #ifndef COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_LUA_COCOS2DX_COCOSBUILDER_H

40
cocos/scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp Normal file
View File

@ -0,0 +1,40 @@
/****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Inc.
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 "lua_cocos2dx_cocosdenshion_manual.h"
#include "lua_cocos2dx_cocosdenshion_auto.hpp"
#include "CCLuaEngine.h"
int register_cocosdenshion_module(lua_State* L)
{
lua_getglobal(L, "_G");
if (lua_istable(L,-1))//stack:...,_G,
{
register_all_cocos2dx_cocosdenshion(L);
}
lua_pop(L, 1);
cocos2d::LuaEngine::getInstance()->executeScriptFile("DeprecatedCocosDenshionClass");
cocos2d::LuaEngine::getInstance()->executeScriptFile("DeprecatedCocosDenshionFunc");
return 1;
}

38
cocos/scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.h Normal file
View File

@ -0,0 +1,38 @@
/****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Inc.
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 COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_COCOSDENSHION_LUA_COCOS2DX_COCOSDENSHION_MANUAL_H__
#define COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_COCOSDENSHION_LUA_COCOS2DX_COCOSDENSHION_MANUAL_H__
#ifdef __cplusplus
extern "C" {
#endif
#include "tolua++.h"
#ifdef __cplusplus
}
#endif
TOLUA_API int register_cocosdenshion_module(lua_State* L);
#endif // #ifndef COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_COCOSDENSHION_LUA_COCOS2DX_COCOSDENSHION_MANUAL_H__

16
cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.cpp → cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp
View File

@ -22,6 +22,7 @@
THE SOFTWARE.
****************************************************************************/
#include "lua_cocos2dx_coco_studio_manual.hpp"
#include "lua_cocos2dx_studio_auto.hpp"
#include "cocos2d.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
@ -567,3 +568,18 @@ int register_all_cocos2dx_coco_studio_manual(lua_State* L)
return 0;
}
int register_cocostudio_module(lua_State* L)
{
lua_getglobal(L, "_G");
if (lua_istable(L,-1))//stack:...,_G,
{
register_all_cocos2dx_studio(L);
register_all_cocos2dx_coco_studio_manual(L);
}
lua_pop(L, 1);
LuaEngine::getInstance()->executeScriptFile("DeprecatedCocoStudioClass");
LuaEngine::getInstance()->executeScriptFile("DeprecatedCocoStudioFunc");
return 1;
}

3
cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.hpp → cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.hpp
View File

@ -35,7 +35,8 @@ extern "C" {
#include "base/CCRef.h"
#include <string>
TOLUA_API int register_all_cocos2dx_coco_studio_manual(lua_State* L);
TOLUA_API int register_all_cocos2dx_coco_studio_manual(lua_State* L);
TOLUA_API int register_cocostudio_module(lua_State* L);
struct LuaArmatureWrapperEventData
{

2
cocos/scripting/lua-bindings/manual/lua_cocos2dx_controller_manual.cpp → cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.cpp
View File

@ -28,7 +28,7 @@
#include "cocos2d.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
#include "LuaScriptHandlerMgr.h"
#include "cocos2d/LuaScriptHandlerMgr.h"
#include "CCLuaValue.h"
#include "CCLuaEngine.h"
#include "CCGameController.h"

0
cocos/scripting/lua-bindings/manual/lua_cocos2dx_controller_manual.hpp → cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.hpp
View File

438
cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.cpp → cocos/scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.cpp
View File

@ -22,17 +22,17 @@
THE SOFTWARE.
****************************************************************************/
#include "lua_cocos2dx_extension_manual.h"
#include "lua_cocos2dx_extension_auto.hpp"
#include "cocos2d.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
#include "CCLuaValue.h"
#include "cocos-ext.h"
#include "CCBProxy.h"
#include "cocostudio/CocoStudio.h"
#include "CCLuaEngine.h"
#include "LuaScriptHandlerMgr.h"
USING_NS_CC;
USING_NS_CC_EXT;
using namespace cocostudio;
class LuaScrollViewDelegate:public Ref, public ScrollViewDelegate
{
@ -461,420 +461,6 @@ static void extendEditBox(lua_State* tolua_S)
lua_pop(tolua_S, 1);
}
static int tolua_cocos2d_CCBProxy_create(lua_State* tolua_S)
{
if (NULL == tolua_S)
return 0;
int argc = 0;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
if (!tolua_isusertable(tolua_S,1,"cc.CCBProxy",0,&tolua_err)) goto tolua_lerror;
#endif
argc = lua_gettop(tolua_S) - 1;
if (0 == argc)
{
CCBProxy* tolua_ret = (CCBProxy*)CCBProxy::create();
int nID = (tolua_ret) ? (int)tolua_ret->_ID : -1;
int *pLuaID = (tolua_ret) ? &tolua_ret->_luaID : NULL;
toluafix_pushusertype_ccobject(tolua_S, nID, pLuaID, (void*)tolua_ret,"cc.CCBProxy");
return 1;
}
CCLOG("%s function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", "cc.CCBProxy:create", argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_create'.",&tolua_err);
return 0;
#endif
}
static int tolua_cocos2d_CCBProxy_createCCBReader(lua_State* tolua_S)
{
if (NULL == tolua_S)
return 0;
int argc = 0;
CCBProxy* self = nullptr;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
if (!tolua_isusertype(tolua_S,1,"cc.CCBProxy",0,&tolua_err)) goto tolua_lerror;
#endif
self = static_cast<CCBProxy*>(tolua_tousertype(tolua_S,1,0));
#if COCOS2D_DEBUG >= 1
if (nullptr == self) {
tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBProxy_createCCBReader'\n", NULL);
return 0;
}
#endif
argc = lua_gettop(tolua_S) - 1;
if (0 == argc)
{
CCBReader* tolua_ret = (CCBReader*) self->createCCBReader();
int nID = (tolua_ret) ? (int)tolua_ret->_ID : -1;
int* pLuaID = (tolua_ret) ? &tolua_ret->_luaID : NULL;
toluafix_pushusertype_ccobject(tolua_S, nID, pLuaID, (void*)tolua_ret,"cc.CCBReader");
return 1;
}
CCLOG("%s function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", "cc.CCBProxy:createCCBReader", argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_createCCBReader'.",&tolua_err);
return 0;
#endif
}
static int tolua_cocos2d_CCBProxy_readCCBFromFile(lua_State* tolua_S)
{
if (NULL == tolua_S)
return 0;
int argc = 0;
CCBProxy* self = nullptr;
const char* ccbFilePath = nullptr;
CCBReader* ccbReader = nullptr;
bool setOwner = false;
Node* tolua_ret = nullptr;
int ID = 0;
int* luaID = nullptr;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
if (!tolua_isusertype(tolua_S,1,"cc.CCBProxy",0,&tolua_err)) goto tolua_lerror;
#endif
self = static_cast<CCBProxy*>(tolua_tousertype(tolua_S,1,0));
#if COCOS2D_DEBUG >= 1
if (nullptr == self) {
tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBProxy_readCCBFromFile'\n", NULL);
return 0;
}
#endif
argc = lua_gettop(tolua_S) - 1;
if (2 == argc || 3 == argc)
{
#if COCOS2D_DEBUG >= 1
if (!tolua_isstring(tolua_S, 2, 0, &tolua_err)||
!tolua_isusertype(tolua_S,3,"cc.CCBReader",0,&tolua_err)||
!tolua_isboolean(tolua_S,4,1,&tolua_err )
)
goto tolua_lerror;
#endif
ccbFilePath = ((const char*) tolua_tostring(tolua_S,2,0));
ccbReader = ((CCBReader*) tolua_tousertype(tolua_S,3,0));
setOwner = (bool) tolua_toboolean(tolua_S,4,-1);
tolua_ret = (Node*) self->readCCBFromFile(ccbFilePath, ccbReader, setOwner);
ID = (tolua_ret) ? (int)tolua_ret->_ID : -1;
luaID = (tolua_ret) ? &tolua_ret->_luaID : NULL;
toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)tolua_ret,"cc.Node");
return 1;
}
CCLOG("%s function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", "cc.CCBReader:readCCBFromFile", argc, 2);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_readCCBFromFile'.",&tolua_err);
return 0;
#endif
}
static int tolua_cocos2d_CCBProxy_getNodeTypeName(lua_State* tolua_S)
{
if (nullptr == tolua_S)
return 0;
int argc = 0;
CCBProxy* self = nullptr;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
if (!tolua_isusertype(tolua_S,1,"cc.CCBProxy",0,&tolua_err)) goto tolua_lerror;
#endif
self = static_cast<CCBProxy*>(tolua_tousertype(tolua_S,1,0));
#if COCOS2D_DEBUG >= 1
if (nullptr == self) {
tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBProxy_getNodeTypeName'\n", NULL);
return 0;
}
#endif
argc = lua_gettop(tolua_S) - 1;
if (1 == argc)
{
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"cc.Node",0,&tolua_err)) goto tolua_lerror;
#endif
Node* node = static_cast<Node*>(tolua_tousertype(tolua_S,2,0));
const char* tolua_ret = (const char*)self->getNodeTypeName(node);
tolua_pushstring(tolua_S,(const char*)tolua_ret);
return 1;
}
CCLOG(" %s has wrong number of arguments: %d, was expecting %d\n", "cc.CCBProxy:getNodeTypeName", argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_getNodeTypeName'.",&tolua_err);
return 0;
#endif
}
static int tolua_cocos2d_CCBProxy_setCallback(lua_State* tolua_S)
{
if (nullptr == tolua_S)
return 0;
int argc = 0;
CCBProxy* self = nullptr;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
if (!tolua_isusertype(tolua_S,1,"cc.CCBProxy",0,&tolua_err)) goto tolua_lerror;
#endif
self = static_cast<CCBProxy*>(tolua_tousertype(tolua_S,1,0));
#if COCOS2D_DEBUG >= 1
if (nullptr == self) {
tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBProxy_setCallback'\n", NULL);
return 0;
}
#endif
argc = lua_gettop(tolua_S) - 1;
if ( argc >= 2 && argc <= 3 )
{
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,2,"cc.Node",0,&tolua_err) ||
!toluafix_isfunction(tolua_S, 3, "LUA_FUNCTION", 0, &tolua_err) ||
!tolua_isnumber(tolua_S, 4, 1, &tolua_err)
)
goto tolua_lerror;
#endif
Node* node = ((Node*)tolua_tousertype(tolua_S,2,0));
LUA_FUNCTION funID = ( toluafix_ref_function(tolua_S,3,0));
int controlEvents = (int)tolua_tonumber(tolua_S, 4, 1);
self->setCallback(node, funID, controlEvents);
return 0;
}
CCLOG(" %s has wrong number of arguments: %d, was expecting %d\n", "cc.CCBProxy:setCallback", argc, 2);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_setCallback'.",&tolua_err);
return 0;
#endif
}
int register_cocos2dx_extension_CCBProxy(lua_State* tolua_S)
{
tolua_module(tolua_S,"cc",0);
tolua_beginmodule(tolua_S,"cc");
tolua_usertype(tolua_S,"cc.CCBProxy");
tolua_cclass(tolua_S,"CCBProxy","cc.CCBProxy","cc.Layer",NULL);
tolua_beginmodule(tolua_S,"CCBProxy");
tolua_function(tolua_S, "create", tolua_cocos2d_CCBProxy_create);
tolua_function(tolua_S, "createCCBReader", tolua_cocos2d_CCBProxy_createCCBReader);
tolua_function(tolua_S, "readCCBFromFile", tolua_cocos2d_CCBProxy_readCCBFromFile);
tolua_function(tolua_S, "getNodeTypeName", tolua_cocos2d_CCBProxy_getNodeTypeName);
tolua_function(tolua_S, "setCallback", tolua_cocos2d_CCBProxy_setCallback);
tolua_endmodule(tolua_S);
tolua_endmodule(tolua_S);
std::string typeName = typeid(CCBProxy).name();
g_luaType[typeName] = "cc.CCBProxy";
return 1;
}
static int tolua_cocos2d_CCBReader_load(lua_State* tolua_S)
{
if (nullptr == tolua_S)
return 0;
int argc = 0;
CCBReader* self = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
if (!tolua_isusertype(tolua_S,1,"cc.CCBReader",0,&tolua_err)) goto tolua_lerror;
#endif
self = static_cast<CCBReader*>(tolua_tousertype(tolua_S,1,0));
#if COCOS2D_DEBUG >= 1
if (nullptr == self) {
tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBReader_load'\n", NULL);
return 0;
}
#endif
argc = lua_gettop(tolua_S) - 1;
if (argc >= 1 && argc <= 3)
{
const char* fileName = nullptr;
std::string fileName_tmp = "";
ok &= luaval_to_std_string(tolua_S, 2, &fileName_tmp, "cc.CCBReader:load");
fileName = fileName_tmp.c_str();
if (!ok)
return 0;
if (1 == argc)
{
Node* tolua_ret = (Node*) self->readNodeGraphFromFile(fileName);
int ID = (tolua_ret) ? (int)tolua_ret->_ID : -1;
int* luaID = (tolua_ret) ? &tolua_ret->_luaID : NULL;
toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)tolua_ret,"cc.Node");
return 1;
}
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S, 3, "cc.Ref", 0, &tolua_err))
goto tolua_lerror;
#endif
Ref* owner = static_cast<Ref*>(tolua_tousertype(tolua_S, 3, 0));
//In lua owner always define in lua script by table, so owner is always nullptr
if (2 == argc)
{
Node* tolua_ret = (Node*) self->readNodeGraphFromFile(fileName,owner);
int ID = (tolua_ret) ? (int)tolua_ret->_ID : -1;
int* luaID = (tolua_ret) ? &tolua_ret->_luaID : NULL;
toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)tolua_ret,"cc.Node");
return 1;
}
Size size;
ok &= luaval_to_size(tolua_S, 4, &size, "cc.CCBReader:load");
if (!ok)
return 0;
Node* tolua_ret = (Node*) self->readNodeGraphFromFile(fileName,owner,size);
int ID = (tolua_ret) ? (int)tolua_ret->_ID : -1;
int* luaID = (tolua_ret) ? &tolua_ret->_luaID : NULL;
toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)tolua_ret,"cc.Node");
return 1;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CCBReader:load",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBReader_load'.",&tolua_err);
return 0;
#endif
}
static void extendCCBReader(lua_State* tolua_S)
{
lua_pushstring(tolua_S, "cc.CCBReader");
lua_rawget(tolua_S, LUA_REGISTRYINDEX);
if (lua_istable(tolua_S,-1))
{
lua_pushstring(tolua_S,"load");
lua_pushcfunction(tolua_S,tolua_cocos2d_CCBReader_load );
lua_rawset(tolua_S,-3);
}
lua_pop(tolua_S, 1);
}
static int tolua_cocos2d_CCBAnimationManager_setCallFuncForLuaCallbackNamed(lua_State* tolua_S)
{
if (nullptr == tolua_S)
return 0;
int argc = 0;
CCBAnimationManager* self = nullptr;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
if (!tolua_isusertype(tolua_S,1,"cc.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror;
#endif
self = static_cast<CCBAnimationManager*>(tolua_tousertype(tolua_S,1,0));
#if COCOS2D_DEBUG >= 1
if (nullptr == self) {
tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBAnimationManager_setCallFuncForLuaCallbackNamed'\n", NULL);
return 0;
}
#endif
argc = lua_gettop(tolua_S) - 1;
if (2 == argc)
{
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,2, "cc.CallFunc", 0, &tolua_err) ||
!tolua_isstring(tolua_S, 3, 0, &tolua_err) )
goto tolua_lerror;
#endif
CallFunc* pCallFunc = static_cast<CallFunc*>(tolua_tousertype(tolua_S,2,0));
const char* keyframeCallback = ((const char*) tolua_tostring(tolua_S,3,0));
std::string strKey = "";
if (NULL != keyframeCallback) {
strKey = keyframeCallback;
}
self->setCallFunc(pCallFunc, strKey);
return 0;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CCBAnimationManager:setCallFuncForLuaCallbackNamed",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBAnimationManager_setCallFuncForLuaCallbackNamed'.",&tolua_err);
return 0;
#endif
}
static void extendCCBAnimationManager(lua_State* tolua_S)
{
lua_pushstring(tolua_S, "cc.CCBAnimationManager");
lua_rawget(tolua_S, LUA_REGISTRYINDEX);
if (lua_istable(tolua_S,-1))
{
lua_pushstring(tolua_S,"setCallFuncForLuaCallbackNamed");
lua_pushcfunction(tolua_S,tolua_cocos2d_CCBAnimationManager_setCallFuncForLuaCallbackNamed );
lua_rawset(tolua_S,-3);
}
lua_pop(tolua_S, 1);
}
class LuaAssetsManagerDelegateProtocol:public Ref, public AssetsManagerDelegateProtocol
{
public:
@ -1460,10 +1046,24 @@ int register_all_cocos2dx_extension_manual(lua_State* tolua_S)
{
extendControl(tolua_S);
extendEditBox(tolua_S);
extendCCBReader(tolua_S);
extendCCBAnimationManager(tolua_S);
extendAssetsManager(tolua_S);
extendScrollView(tolua_S);
extendTableView(tolua_S);
return 0;
}
int register_extension_module(lua_State* tolua_S)
{
lua_getglobal(tolua_S, "_G");
if (lua_istable(tolua_S,-1))//stack:...,_G,
{
register_all_cocos2dx_extension(tolua_S);
register_all_cocos2dx_extension_manual(tolua_S);
}
lua_pop(tolua_S, 1);
LuaEngine::getInstance()->executeScriptFile("DeprecatedExtensionClass");
LuaEngine::getInstance()->executeScriptFile("DeprecatedExtensionEnum");
LuaEngine::getInstance()->executeScriptFile("DeprecatedExtensionFunc");
return 1;
}

7
cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.h → cocos/scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.h
View File

@ -32,10 +32,8 @@ extern "C" {
}
#endif
#include "LuaScriptHandlerMgr.h"
TOLUA_API int register_all_cocos2dx_extension_manual(lua_State* tolua_S);
TOLUA_API int register_cocos2dx_extension_CCBProxy(lua_State* tolua_S);
TOLUA_API int register_all_cocos2dx_extension_manual(lua_State* tolua_S);
TOLUA_API int register_extension_module(lua_State* tolua_S);
struct LuaAssetsManagerEventData
{
@ -57,5 +55,4 @@ struct LuaTableViewEventData
}
};
#endif // #ifndef COCOS2DX_SCRIPT_LUA_COCOS2DX_SUPPORT_LUA_COCOS2DX_EXTENSION_MANUAL_H

2
cocos/scripting/lua-bindings/manual/Lua_web_socket.cpp → cocos/scripting/lua-bindings/manual/network/Lua_web_socket.cpp
View File

@ -35,7 +35,6 @@
using namespace cocos2d;
static int SendBinaryMessageToLua(int nHandler,const unsigned char* pTable,int nLength)
{
if (NULL == pTable || nHandler <= 0) {
@ -464,5 +463,4 @@ TOLUA_API int register_web_socket_manual(lua_State* tolua_S)
return 1;
}
#endif//(CC_TARGET_PLATFORM == CC_PLATFORM_IOS ...

0
cocos/scripting/lua-bindings/manual/Lua_web_socket.h → cocos/scripting/lua-bindings/manual/network/Lua_web_socket.h
View File

61
cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.cpp Normal file
View File

@ -0,0 +1,61 @@
/****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Inc.
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 "lua_cocos2dx_network_manual.h"
extern "C" {
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
#include "lua_extensions.h"
#endif
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
#include "Lua_web_socket.h"
#endif
#include "lua_xml_http_request.h"
#include "CCLuaEngine.h"
int register_network_module(lua_State* L)
{
lua_getglobal(L, "_G");
if (lua_istable(L,-1))//stack:...,_G,
{
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
luaopen_lua_extensions(L);
#endif
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
tolua_web_socket_open(L);
register_web_socket_manual(L);
#endif
register_xml_http_request(L);
}
lua_pop(L, 1);
cocos2d::LuaEngine::getInstance()->executeScriptFile("DeprecatedNetworkClass");
cocos2d::LuaEngine::getInstance()->executeScriptFile("DeprecatedNetworkEnum");
cocos2d::LuaEngine::getInstance()->executeScriptFile("DeprecatedNetworkFunc");
return 1;
}

37
cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.h Normal file
View File

@ -0,0 +1,37 @@
/****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Inc.
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 __COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_NETWORK_LUA_COCOS2DX_NETWORK_MANUAL_H__
#define __COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_NETWORK_LUA_COCOS2DX_NETWORK_MANUAL_H__
#ifdef __cplusplus
extern "C" {
#endif
#include "tolua++.h"
#ifdef __cplusplus
}
#endif
TOLUA_API int register_network_module(lua_State* L);
#endif //#ifndef __COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_NETWORK_LUA_COCOS2DX_NETWORK_MANUAL_H__

0
cocos/scripting/lua-bindings/manual/lua_extensions.c → cocos/scripting/lua-bindings/manual/network/lua_extensions.c
View File

0
cocos/scripting/lua-bindings/manual/lua_extensions.h → cocos/scripting/lua-bindings/manual/network/lua_extensions.h
View File

0
cocos/scripting/lua-bindings/manual/lua_xml_http_request.cpp → cocos/scripting/lua-bindings/manual/network/lua_xml_http_request.cpp
View File

0
cocos/scripting/lua-bindings/manual/lua_xml_http_request.h → cocos/scripting/lua-bindings/manual/network/lua_xml_http_request.h
View File

0
cocos/scripting/lua-bindings/manual/LuaSkeletonAnimation.cpp → cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.cpp
View File

0
cocos/scripting/lua-bindings/manual/LuaSkeletonAnimation.h → cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.h
View File

15
cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.cpp → cocos/scripting/lua-bindings/manual/spine/lua_cocos2dx_spine_manual.cpp
View File

@ -22,6 +22,7 @@
THE SOFTWARE.
****************************************************************************/
#include "lua_cocos2dx_spine_manual.hpp"
#include "lua_cocos2dx_spine_auto.hpp"
#include "cocos2d.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
@ -30,6 +31,7 @@
#include "spine.h"
#include "spine-cocos2dx.h"
#include "LuaSkeletonAnimation.h"
#include "CCLuaEngine.h"
using namespace spine;
@ -465,3 +467,16 @@ int register_all_cocos2dx_spine_manual(lua_State* L)
return 0;
}
int register_spine_module(lua_State* L)
{
lua_getglobal(L, "_G");
if (lua_istable(L,-1))//stack:...,_G,
{
register_all_cocos2dx_spine(L);
register_all_cocos2dx_spine_manual(L);
}
lua_pop(L, 1);
return 1;
}

4
cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.hpp → cocos/scripting/lua-bindings/manual/spine/lua_cocos2dx_spine_manual.hpp
View File

@ -32,9 +32,7 @@ extern "C" {
}
#endif
#include "base/CCRef.h"
TOLUA_API int register_all_cocos2dx_spine_manual(lua_State* L);
TOLUA_API int register_spine_module(lua_State* L);
#endif // #ifndef COCOS_SCRIPTING_LUA_BINDINGS_LUA_COCOS2DX_SPINE_MANUAL_H

0
cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.cpp → cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_video_manual.cpp
View File

0
cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.hpp → cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_video_manual.hpp
View File

24
cocos/scripting/lua-bindings/manual/lua_cocos2dx_ui_manual.cpp → cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.cpp
View File

@ -22,6 +22,11 @@
THE SOFTWARE.
****************************************************************************/
#include "lua_cocos2dx_ui_manual.hpp"
#include "lua_cocos2dx_ui_auto.hpp"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
#include "lua_cocos2dx_experimental_video_auto.hpp"
#include "lua_cocos2dx_experimental_video_manual.hpp"
#endif
#include "cocos2d.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
@ -681,3 +686,22 @@ int register_all_cocos2dx_ui_manual(lua_State* L)
return 0;
}
int register_ui_moudle(lua_State* L)
{
lua_getglobal(L, "_G");
if (lua_istable(L,-1))//stack:...,_G,
{
register_all_cocos2dx_ui(L);
register_all_cocos2dx_ui_manual(L);
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
register_all_cocos2dx_experimental_video(L);
register_all_cocos2dx_experimental_video_manual(L);
#endif
}
lua_pop(L, 1);
LuaEngine::getInstance()->executeScriptFile("DeprecatedUIEnum");
LuaEngine::getInstance()->executeScriptFile("DeprecatedUIFunc");
return 1;
}

4
cocos/scripting/lua-bindings/manual/lua_cocos2dx_ui_manual.hpp → cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.hpp
View File

@ -32,7 +32,7 @@ extern "C" {
}
#endif
#include "base/CCRef.h"
TOLUA_API int register_all_cocos2dx_ui_manual(lua_State* L);
TOLUA_API int register_ui_moudle(lua_State* L);
#endif // #ifndef COCOS_SCRIPTING_LUA_BINDINGS_LUA_COCOS2DX_GUI_MANUAL_H

87
cocos/scripting/lua-bindings/manual/video/lua_cocos2dx_experimental_video_manual.cpp Normal file
View File

@ -0,0 +1,87 @@
#include "lua_cocos2dx_experimental_video_manual.hpp"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
#include "UIVideoPlayer.h"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
#include "CCLuaValue.h"
#include "CCLuaEngine.h"
static int lua_cocos2dx_experimental_video_VideoPlayer_addEventListener(lua_State* L)
{
int argc = 0;
cocos2d::experimental::ui::VideoPlayer* self = nullptr;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
if (!tolua_isusertype(L,1,"ccexp.VideoPlayer",0,&tolua_err)) goto tolua_lerror;
#endif
self = static_cast<cocos2d::experimental::ui::VideoPlayer*>(tolua_tousertype(L,1,0));
#if COCOS2D_DEBUG >= 1
if (nullptr == self) {
tolua_error(L,"invalid 'self' in function 'lua_cocos2dx_Widget_addTouchEventListener'\n", nullptr);
return 0;
}
#endif
argc = lua_gettop(L) - 1;
if (argc == 1)
{
#if COCOS2D_DEBUG >= 1
if (!toluafix_isfunction(L,2,"LUA_FUNCTION",0,&tolua_err))
{
goto tolua_lerror;
}
#endif
LUA_FUNCTION handler = ( toluafix_ref_function(L,2,0));
self->addEventListener([=](cocos2d::Ref* ref, cocos2d::experimental::ui::VideoPlayer::EventType eventType){
LuaStack* stack = LuaEngine::getInstance()->getLuaStack();
stack->pushObject(ref, "cc.Ref");
stack->pushInt((int)eventType);
stack->executeFunctionByHandler(handler, 2);
});
return 0;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccexp.VideoPlayer:addEventListener",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(L, "#ferror in function 'lua_cocos2dx_experimental_VideoPlayer_addEventListener'.", &tolua_err);
#endif
return 0;
}
static void extendVideoPlayer(lua_State* L)
{
lua_pushstring(L, "ccexp.VideoPlayer");
lua_rawget(L, LUA_REGISTRYINDEX);
if (lua_istable(L,-1))
{
tolua_function(L, "addEventListener", lua_cocos2dx_experimental_video_VideoPlayer_addEventListener);
}
lua_pop(L, 1);
}
int register_all_cocos2dx_experimental_video_manual(lua_State* L)
{
if (nullptr == L)
return 0;
extendVideoPlayer(L);
return 0;
}
#endif

41
cocos/scripting/lua-bindings/manual/video/lua_cocos2dx_experimental_video_manual.hpp Normal file
View File

@ -0,0 +1,41 @@
/****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Inc.
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/ccConfig.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
#ifndef COCOS_SCRIPTING_LUA_BINDINGS_LUA_COCOS2DX_EXPERIMENTAL_VIDEO_MANUAL_H
#define COCOS_SCRIPTING_LUA_BINDINGS_LUA_COCOS2DX_EXPERIMENTAL_VIDEO_MANUAL_H
#ifdef __cplusplus
extern "C" {
#endif
#include "tolua++.h"
#ifdef __cplusplus
}
#endif
TOLUA_API int register_all_cocos2dx_experimental_video_manual(lua_State* L);
#endif //#ifndef COCOS_SCRIPTING_LUA_BINDINGS_LUA_COCOS2DX_EXPERIMENTAL_VIDEO_MANUAL_H
#endif //#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS)

243
cocos/scripting/lua-bindings/proj.android/Android.mk Normal file
View File

@ -0,0 +1,243 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := cocos2d_lua_static
LOCAL_MODULE_FILENAME := libluacocos2d
LOCAL_SRC_FILES := ../manual/CCLuaBridge.cpp \
../manual/CCLuaEngine.cpp \
../manual/CCLuaStack.cpp \
../manual/lua_debugger.c \
../manual/CCLuaValue.cpp \
../manual/Cocos2dxLuaLoader.cpp \
../manual/LuaBasicConversions.cpp \
../auto/lua_cocos2dx_auto.cpp \
../auto/lua_cocos2dx_physics_auto.cpp \
../auto/lua_cocos2dx_experimental_auto.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 \
../manual/platform/android/CCLuaJavaBridge.cpp \
../manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp \
../manual/tolua_fix.cpp \
../../../../external/lua/tolua/tolua_event.c \
../../../../external/lua/tolua/tolua_is.c \
../../../../external/lua/tolua/tolua_map.c \
../../../../external/lua/tolua/tolua_push.c \
../../../../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_WHOLE_STATIC_LIBRARIES := luajit_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dx_static
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := cocosdenshion_lua_static
LOCAL_MODULE_FILENAME := libluacocosdenshion
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_WHOLE_STATIC_LIBRARIES := cocosdenshion_static
LOCAL_WHOLE_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 \
../manual/network/lua_extensions.c \
../manual/network/Lua_web_socket.cpp \
../manual/network/lua_xml_http_request.cpp \
../../../../external/lua/luasocket/auxiliar.c \
../../../../external/lua/luasocket/buffer.c \
../../../../external/lua/luasocket/except.c \
../../../../external/lua/luasocket/inet.c \
../../../../external/lua/luasocket/io.c \
../../../../external/lua/luasocket/luasocket.c \
../../../../external/lua/luasocket/mime.c \
../../../../external/lua/luasocket/options.c \
../../../../external/lua/luasocket/select.c \
../../../../external/lua/luasocket/serial.c \
../../../../external/lua/luasocket/tcp.c \
../../../../external/lua/luasocket/timeout.c \
../../../../external/lua/luasocket/udp.c \
../../../../external/lua/luasocket/unix.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_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_WHOLE_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 \
../manual/cocosbuilder/CCBProxy.cpp \
../auto/lua_cocos2dx_cocosbuilder_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_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_WHOLE_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_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_WHOLE_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 \
../manual/spine/LuaSkeletonAnimation.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_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_WHOLE_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_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_WHOLE_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 \
../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 \
$(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../../../ui
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/ui
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_ui_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)

2596
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
View File

File diff suppressed because it is too large Load Diff

77
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings Mac.xcscheme
View File

@ -1,77 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A6FB50417854BC200CDF010"
BuildableName = "libluabindings Mac.a"
BlueprintName = "luabindings Mac"
ReferencedContainer = "container:cocos2d_lua_bindings.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A6FB50417854BC200CDF010"
BuildableName = "libluabindings Mac.a"
BlueprintName = "luabindings Mac"
ReferencedContainer = "container:cocos2d_lua_bindings.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A6FB50417854BC200CDF010"
BuildableName = "libluabindings Mac.a"
BlueprintName = "luabindings Mac"
ReferencedContainer = "container:cocos2d_lua_bindings.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

77
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings iOS.xcscheme
View File

@ -1,77 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A119716178526AA00D62A44"
BuildableName = "libluabindings iOS.a"
BlueprintName = "luabindings iOS"
ReferencedContainer = "container:cocos2d_lua_bindings.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A119716178526AA00D62A44"
BuildableName = "libluabindings iOS.a"
BlueprintName = "luabindings iOS"
ReferencedContainer = "container:cocos2d_lua_bindings.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A119716178526AA00D62A44"
BuildableName = "libluabindings iOS.a"
BlueprintName = "luabindings iOS"
ReferencedContainer = "container:cocos2d_lua_bindings.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

386
cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.filters
View File

@ -1,386 +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="luasocket">
<UniqueIdentifier>{c36f2204-a252-47c0-b36c-b84cda218746}</UniqueIdentifier>
</Filter>
<Filter Include="tolua">
<UniqueIdentifier>{24fae6d6-ebb5-4da1-b0da-3f3845a9e9a9}</UniqueIdentifier>
</Filter>
<Filter Include="luajit">
<UniqueIdentifier>{cc863463-a948-487a-aacd-dc233c3e5200}</UniqueIdentifier>
</Filter>
<Filter Include="xxtea">
<UniqueIdentifier>{1fa7ff75-c142-4928-8aef-e6a2eb2b465f}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\auto\lua_cocos2dx_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\auto\lua_cocos2dx_extension_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\auto\lua_cocos2dx_ui_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\auto\lua_cocos2dx_physics_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="..\manual\CCBProxy.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\CCLuaBridge.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\CCLuaEngine.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\CCLuaStack.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\CCLuaValue.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\Cocos2dxLuaLoader.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\lua_cocos2dx_coco_studio_manual.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\lua_cocos2dx_deprecated.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\lua_cocos2dx_extension_manual.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\lua_cocos2dx_ui_manual.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\lua_cocos2dx_manual.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\lua_cocos2dx_physics_manual.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\lua_cocos2dx_spine_manual.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\lua_extensions.c">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\Lua_web_socket.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\lua_xml_http_request.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\LuaBasicConversions.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\LuaOpengl.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\LuaScriptHandlerMgr.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\LuaSkeletonAnimation.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\tolua_fix.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\lua_debugger.c">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\auxiliar.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\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>
<ClCompile Include="..\..\..\..\external\lua\luasocket\buffer.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\luasocket\io.c">
<Filter>luasocket</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_event.c">
<Filter>tolua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_is.c">
<Filter>tolua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_map.c">
<Filter>tolua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_push.c">
<Filter>tolua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_to.c">
<Filter>tolua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\xxtea\xxtea.cpp">
<Filter>xxtea</Filter>
</ClCompile>
<ClCompile Include="..\manual\lua_cocos2dx_experimental_manual.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\auto\lua_cocos2dx_experimental_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\auto\lua_cocos2dx_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\auto\lua_cocos2dx_extension_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\auto\lua_cocos2dx_ui_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\auto\lua_cocos2dx_physics_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="..\manual\CCBProxy.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\CCLuaBridge.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\CCLuaEngine.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\CCLuaStack.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\CCLuaValue.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\Cocos2dxLuaLoader.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\lua_cocos2dx_coco_studio_manual.hpp">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\lua_cocos2dx_deprecated.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\lua_cocos2dx_extension_manual.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\lua_cocos2dx_ui_manual.hpp">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\lua_cocos2dx_manual.hpp">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\lua_cocos2dx_physics_manual.hpp">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\lua_cocos2dx_spine_manual.hpp">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\lua_extensions.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\Lua_web_socket.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\lua_xml_http_request.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\LuaBasicConversions.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\LuaOpengl.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\LuaScriptHandlerMgr.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\LuaSkeletonAnimation.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\tolua_fix.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\lua_debugger.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\auxiliar.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\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>
<ClInclude Include="..\..\..\..\external\lua\luasocket\buffer.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luasocket\io.h">
<Filter>luasocket</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\tolua\tolua++.h">
<Filter>tolua</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\tolua\tolua_event.h">
<Filter>tolua</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luajit\include\lauxlib.h">
<Filter>luajit</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luajit\include\lua.h">
<Filter>luajit</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luajit\include\luaconf.h">
<Filter>luajit</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luajit\include\lualib.h">
<Filter>luajit</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\xxtea\xxtea.h">
<Filter>xxtea</Filter>
</ClInclude>
<ClInclude Include="..\manual\lua_cocos2dx_experimental_manual.hpp">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\auto\lua_cocos2dx_experimental_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\script\Cocos2dConstants.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\CocoStudio.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\Deprecated.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\DeprecatedClass.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\DeprecatedEnum.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\DeprecatedOpenglEnum.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\DrawPrimitives.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\extern.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\GuiConstants.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\json.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\luaj.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\luaoc.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\Opengl.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\OpenglConstants.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\StudioConstants.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\AudioEngine.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\CCBReaderLoad.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\Cocos2d.lua">
<Filter>script</Filter>
</None>
</ItemGroup>
</Project>

3
cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.user
View File

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

96
cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj → cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj
View File

@ -11,19 +11,6 @@
</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" />
@ -32,33 +19,20 @@
<ClCompile Include="..\..\..\..\external\xxtea\xxtea.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_auto.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_experimental_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\CCBProxy.cpp" />
<ClCompile Include="..\manual\CCLuaBridge.cpp" />
<ClCompile Include="..\manual\CCLuaEngine.cpp" />
<ClCompile Include="..\manual\CCLuaStack.cpp" />
<ClCompile Include="..\manual\CCLuaValue.cpp" />
<ClCompile Include="..\manual\Cocos2dxLuaLoader.cpp" />
<ClCompile Include="..\manual\cocos2d\LuaOpengl.cpp" />
<ClCompile Include="..\manual\cocos2d\LuaScriptHandlerMgr.cpp" />
<ClCompile Include="..\manual\cocos2d\lua_cocos2dx_deprecated.cpp" />
<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\LuaBasicConversions.cpp" />
<ClCompile Include="..\manual\LuaOpengl.cpp" />
<ClCompile Include="..\manual\LuaScriptHandlerMgr.cpp" />
<ClCompile Include="..\manual\LuaSkeletonAnimation.cpp" />
<ClCompile Include="..\manual\lua_cocos2dx_coco_studio_manual.cpp" />
<ClCompile Include="..\manual\lua_cocos2dx_deprecated.cpp" />
<ClCompile Include="..\manual\lua_cocos2dx_experimental_manual.cpp" />
<ClCompile Include="..\manual\lua_cocos2dx_extension_manual.cpp" />
<ClCompile Include="..\manual\lua_cocos2dx_manual.cpp" />
<ClCompile Include="..\manual\lua_cocos2dx_physics_manual.cpp" />
<ClCompile Include="..\manual\lua_cocos2dx_spine_manual.cpp" />
<ClCompile Include="..\manual\lua_cocos2dx_ui_manual.cpp" />
<ClCompile Include="..\manual\lua_debugger.c" />
<ClCompile Include="..\manual\lua_extensions.c" />
<ClCompile Include="..\manual\Lua_web_socket.cpp" />
<ClCompile Include="..\manual\lua_xml_http_request.cpp" />
<ClCompile Include="..\manual\tolua_fix.cpp" />
</ItemGroup>
<ItemGroup>
@ -66,73 +40,41 @@
<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_auto.hpp" />
<ClInclude Include="..\auto\lua_cocos2dx_experimental_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\CCBProxy.h" />
<ClInclude Include="..\manual\CCLuaBridge.h" />
<ClInclude Include="..\manual\CCLuaEngine.h" />
<ClInclude Include="..\manual\CCLuaStack.h" />
<ClInclude Include="..\manual\CCLuaValue.h" />
<ClInclude Include="..\manual\Cocos2dxLuaLoader.h" />
<ClInclude Include="..\manual\cocos2d\LuaOpengl.h" />
<ClInclude Include="..\manual\cocos2d\LuaScriptHandlerMgr.h" />
<ClInclude Include="..\manual\cocos2d\lua_cocos2dx_deprecated.h" />
<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\LuaBasicConversions.h" />
<ClInclude Include="..\manual\LuaOpengl.h" />
<ClInclude Include="..\manual\LuaScriptHandlerMgr.h" />
<ClInclude Include="..\manual\LuaSkeletonAnimation.h" />
<ClInclude Include="..\manual\lua_cocos2dx_coco_studio_manual.hpp" />
<ClInclude Include="..\manual\lua_cocos2dx_deprecated.h" />
<ClInclude Include="..\manual\lua_cocos2dx_experimental_manual.hpp" />
<ClInclude Include="..\manual\lua_cocos2dx_extension_manual.h" />
<ClInclude Include="..\manual\lua_cocos2dx_manual.hpp" />
<ClInclude Include="..\manual\lua_cocos2dx_physics_manual.hpp" />
<ClInclude Include="..\manual\lua_cocos2dx_spine_manual.hpp" />
<ClInclude Include="..\manual\lua_cocos2dx_ui_manual.hpp" />
<ClInclude Include="..\manual\lua_debugger.h" />
<ClInclude Include="..\manual\lua_extensions.h" />
<ClInclude Include="..\manual\Lua_web_socket.h" />
<ClInclude Include="..\manual\lua_xml_http_request.h" />
<ClInclude Include="..\manual\tolua_fix.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\script\AudioEngine.lua" />
<None Include="..\script\CCBReaderLoad.lua" />
<None Include="..\script\Cocos2d.lua" />
<None Include="..\script\Cocos2dConstants.lua" />
<None Include="..\script\CocoStudio.lua" />
<None Include="..\script\Deprecated.lua" />
<None Include="..\script\DeprecatedClass.lua" />
<None Include="..\script\DeprecatedEnum.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\GuiConstants.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\StudioConstants.lua" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\2d\libcocos2d.vcxproj">
@ -140,8 +82,8 @@
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{DDC3E27F-004D-4DD4-9DD3-931A013D2159}</ProjectGuid>
<RootNamespace>liblua</RootNamespace>
<ProjectGuid>{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}</ProjectGuid>
<RootNamespace>libluacocos2d</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@ -197,7 +139,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot)extensions\network;$(EngineRoot)external;$(EngineRoot)external\libwebsockets\win32\include;$(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;%(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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -229,7 +171,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$
<ClCompile>
<Optimization>MinSpace</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot)extensions\network;$(EngineRoot)external;$(EngineRoot)external\libwebsockets\win32\include;$(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;%(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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>

212
cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj.filters Normal file
View File

@ -0,0 +1,212 @@
<?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="tolua">
<UniqueIdentifier>{24fae6d6-ebb5-4da1-b0da-3f3845a9e9a9}</UniqueIdentifier>
</Filter>
<Filter Include="luajit">
<UniqueIdentifier>{cc863463-a948-487a-aacd-dc233c3e5200}</UniqueIdentifier>
</Filter>
<Filter Include="xxtea">
<UniqueIdentifier>{1fa7ff75-c142-4928-8aef-e6a2eb2b465f}</UniqueIdentifier>
</Filter>
<Filter Include="manual\cocos2d">
<UniqueIdentifier>{d326dcc4-b1e3-4326-95c2-c14144076fd9}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\auto\lua_cocos2dx_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_event.c">
<Filter>tolua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_is.c">
<Filter>tolua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_map.c">
<Filter>tolua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_push.c">
<Filter>tolua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_to.c">
<Filter>tolua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\xxtea\xxtea.cpp">
<Filter>xxtea</Filter>
</ClCompile>
<ClCompile Include="..\auto\lua_cocos2dx_experimental_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\manual\CCLuaBridge.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\CCLuaEngine.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\CCLuaStack.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\CCLuaValue.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\Cocos2dxLuaLoader.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\lua_debugger.c">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\LuaBasicConversions.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\tolua_fix.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="..\manual\cocos2d\lua_cocos2dx_deprecated.cpp">
<Filter>manual\cocos2d</Filter>
</ClCompile>
<ClCompile Include="..\manual\cocos2d\lua_cocos2dx_experimental_manual.cpp">
<Filter>manual\cocos2d</Filter>
</ClCompile>
<ClCompile Include="..\manual\cocos2d\lua_cocos2dx_manual.cpp">
<Filter>manual\cocos2d</Filter>
</ClCompile>
<ClCompile Include="..\manual\cocos2d\lua_cocos2dx_physics_manual.cpp">
<Filter>manual\cocos2d</Filter>
</ClCompile>
<ClCompile Include="..\manual\cocos2d\LuaOpengl.cpp">
<Filter>manual\cocos2d</Filter>
</ClCompile>
<ClCompile Include="..\manual\cocos2d\LuaScriptHandlerMgr.cpp">
<Filter>manual\cocos2d</Filter>
</ClCompile>
<ClCompile Include="..\auto\lua_cocos2dx_physics_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\auto\lua_cocos2dx_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\tolua\tolua++.h">
<Filter>tolua</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\tolua\tolua_event.h">
<Filter>tolua</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luajit\include\lauxlib.h">
<Filter>luajit</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luajit\include\lua.h">
<Filter>luajit</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luajit\include\luaconf.h">
<Filter>luajit</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\luajit\include\lualib.h">
<Filter>luajit</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\xxtea\xxtea.h">
<Filter>xxtea</Filter>
</ClInclude>
<ClInclude Include="..\auto\lua_cocos2dx_experimental_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\manual\CCLuaBridge.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\CCLuaEngine.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\CCLuaStack.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\CCLuaValue.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\Cocos2dxLuaLoader.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\lua_debugger.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\LuaBasicConversions.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\tolua_fix.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="..\manual\cocos2d\lua_cocos2dx_deprecated.h">
<Filter>manual\cocos2d</Filter>
</ClInclude>
<ClInclude Include="..\manual\cocos2d\lua_cocos2dx_experimental_manual.hpp">
<Filter>manual\cocos2d</Filter>
</ClInclude>
<ClInclude Include="..\manual\cocos2d\lua_cocos2dx_manual.hpp">
<Filter>manual\cocos2d</Filter>
</ClInclude>
<ClInclude Include="..\manual\cocos2d\lua_cocos2dx_physics_manual.hpp">
<Filter>manual\cocos2d</Filter>
</ClInclude>
<ClInclude Include="..\manual\cocos2d\LuaOpengl.h">
<Filter>manual\cocos2d</Filter>
</ClInclude>
<ClInclude Include="..\manual\cocos2d\LuaScriptHandlerMgr.h">
<Filter>manual\cocos2d</Filter>
</ClInclude>
<ClInclude Include="..\auto\lua_cocos2dx_physics_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\script\Cocos2dConstants.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\DeprecatedOpenglEnum.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\DrawPrimitives.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\extern.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\json.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\luaj.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\luaoc.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\Opengl.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\OpenglConstants.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\Cocos2d.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\DeprecatedCocos2dClass.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\DeprecatedCocos2dEnum.lua">
<Filter>script</Filter>
</None>
<None Include="..\script\DeprecatedCocos2dFunc.lua">
<Filter>script</Filter>
</None>
</ItemGroup>
</Project>

153
cocos/scripting/lua-bindings/proj.win32/libluacocosbuilder.vcxproj Normal file
View File

@ -0,0 +1,153 @@
<?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\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\</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>

47
cocos/scripting/lua-bindings/proj.win32/libluacocosbuilder.vcxproj.filters Normal file
View File

@ -0,0 +1,47 @@
<?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>

152
cocos/scripting/lua-bindings/proj.win32/libluacocosdenshion.vcxproj Normal file
View File

@ -0,0 +1,152 @@
<?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\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\</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>

44
cocos/scripting/lua-bindings/proj.win32/libluacocosdenshion.vcxproj.filters Normal file
View File

@ -0,0 +1,44 @@
<?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>

152
cocos/scripting/lua-bindings/proj.win32/libluacocostudio.vcxproj Normal file
View File

@ -0,0 +1,152 @@
<?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\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\</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>

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