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

Adjust the xxtea directory structure and modify configs files for platforms

This commit is contained in:
samuele3hu 2014-06-04 11:50:04 +08:00
parent 3fddb798ea
commit c785d64ba1
17 changed files with 69 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -151,6 +151,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/external/freetype2/include/${PLATFORM_FOLDER} ${CMAKE_CURRENT_SOURCE_DIR}/external/freetype2/include/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/external/websockets/include/${PLATFORM_FOLDER} ${CMAKE_CURRENT_SOURCE_DIR}/external/websockets/include/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/external/xxhash ${CMAKE_CURRENT_SOURCE_DIR}/external/xxhash
${CMAKE_CURRENT_SOURCE_DIR}/external/xxtea
) )
if(WIN32 AND NOT MINGW) if(WIN32 AND NOT MINGW)
@ -258,6 +259,9 @@ add_subdirectory(external/lua/tolua)
# luabinding # luabinding
add_subdirectory(cocos/scripting/lua-bindings) add_subdirectory(cocos/scripting/lua-bindings)
# xxtea
add_subdirectory(external/xxtea)
endif(BUILD_LIBS_LUA) endif(BUILD_LIBS_LUA)
# build tests # build tests

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

@ -56,10 +56,6 @@
06CAAAD0186AD7FE0012A414 /* TriggerBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAABC186AD63B0012A414 /* TriggerBase.cpp */; }; 06CAAAD0186AD7FE0012A414 /* TriggerBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAABC186AD63B0012A414 /* TriggerBase.cpp */; };
06CAAAD1186AD8010012A414 /* ObjectFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAABB186AD63B0012A414 /* ObjectFactory.h */; }; 06CAAAD1186AD8010012A414 /* ObjectFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAABB186AD63B0012A414 /* ObjectFactory.h */; };
06CAAAD2186AD8030012A414 /* ObjectFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAABB186AD63B0012A414 /* ObjectFactory.h */; }; 06CAAAD2186AD8030012A414 /* ObjectFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAABB186AD63B0012A414 /* ObjectFactory.h */; };
1540AF41193EB3A000717D8E /* xxtea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1540AF3F193EB3A000717D8E /* xxtea.cpp */; };
1540AF42193EB3A000717D8E /* xxtea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1540AF3F193EB3A000717D8E /* xxtea.cpp */; };
1540AF43193EB3A000717D8E /* xxtea.h in Headers */ = {isa = PBXBuildFile; fileRef = 1540AF40193EB3A000717D8E /* xxtea.h */; };
1540AF44193EB3A000717D8E /* xxtea.h in Headers */ = {isa = PBXBuildFile; fileRef = 1540AF40193EB3A000717D8E /* xxtea.h */; };
1A01C68418F57BE800EFE3A6 /* CCArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A01C67618F57BE800EFE3A6 /* CCArray.cpp */; }; 1A01C68418F57BE800EFE3A6 /* CCArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A01C67618F57BE800EFE3A6 /* CCArray.cpp */; };
1A01C68518F57BE800EFE3A6 /* CCArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A01C67618F57BE800EFE3A6 /* CCArray.cpp */; }; 1A01C68518F57BE800EFE3A6 /* CCArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A01C67618F57BE800EFE3A6 /* CCArray.cpp */; };
1A01C68618F57BE800EFE3A6 /* CCArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A01C67718F57BE800EFE3A6 /* CCArray.h */; }; 1A01C68618F57BE800EFE3A6 /* CCArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A01C67718F57BE800EFE3A6 /* CCArray.h */; };
@ -1881,8 +1877,6 @@
06CAAABF186AD63B0012A414 /* TriggerMng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriggerMng.h; sourceTree = "<group>"; }; 06CAAABF186AD63B0012A414 /* TriggerMng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriggerMng.h; sourceTree = "<group>"; };
06CAAAC0186AD63B0012A414 /* TriggerObj.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TriggerObj.cpp; sourceTree = "<group>"; }; 06CAAAC0186AD63B0012A414 /* TriggerObj.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TriggerObj.cpp; sourceTree = "<group>"; };
06CAAAC1186AD63B0012A414 /* TriggerObj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriggerObj.h; sourceTree = "<group>"; }; 06CAAAC1186AD63B0012A414 /* TriggerObj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriggerObj.h; sourceTree = "<group>"; };
1540AF3F193EB3A000717D8E /* xxtea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xxtea.cpp; sourceTree = "<group>"; };
1540AF40193EB3A000717D8E /* xxtea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xxtea.h; sourceTree = "<group>"; };
1551A33F158F2AB200E66CFE /* libcocos2dx Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2dx Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 1551A33F158F2AB200E66CFE /* libcocos2dx Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2dx Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; };
1551A342158F2AB200E66CFE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1551A342158F2AB200E66CFE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
1A01C67618F57BE800EFE3A6 /* CCArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCArray.cpp; sourceTree = "<group>"; }; 1A01C67618F57BE800EFE3A6 /* CCArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCArray.cpp; sourceTree = "<group>"; };
@ -2912,15 +2906,6 @@
/* End PBXFrameworksBuildPhase section */ /* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */ /* Begin PBXGroup section */
1540AF3E193EB3A000717D8E /* xxtea */ = {
isa = PBXGroup;
children = (
1540AF3F193EB3A000717D8E /* xxtea.cpp */,
1540AF40193EB3A000717D8E /* xxtea.h */,
);
path = xxtea;
sourceTree = "<group>";
};
1551A334158F2AB200E66CFE = { 1551A334158F2AB200E66CFE = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
@ -4082,7 +4067,6 @@
children = ( children = (
46A167D21807AF4D005B8026 /* cocos-ext.h */, 46A167D21807AF4D005B8026 /* cocos-ext.h */,
46A168321807AF4E005B8026 /* ExtensionMacros.h */, 46A168321807AF4E005B8026 /* ExtensionMacros.h */,
1540AF3E193EB3A000717D8E /* xxtea */,
1AAF5350180E305F000584C8 /* assets-manager */, 1AAF5350180E305F000584C8 /* assets-manager */,
46A168331807AF4E005B8026 /* GUI */, 46A168331807AF4E005B8026 /* GUI */,
1AD71EEB180E27CF00808F54 /* physics-nodes */, 1AD71EEB180E27CF00808F54 /* physics-nodes */,
@ -5336,7 +5320,6 @@
460E479318080902000CDD6D /* CCInvocation.h in Headers */, 460E479318080902000CDD6D /* CCInvocation.h in Headers */,
460E478018080902000CDD6D /* CCControlButton.h in Headers */, 460E478018080902000CDD6D /* CCControlButton.h in Headers */,
460E478D18080902000CDD6D /* CCControlStepper.h in Headers */, 460E478D18080902000CDD6D /* CCControlStepper.h in Headers */,
1540AF43193EB3A000717D8E /* xxtea.h in Headers */,
460E47D218080913000CDD6D /* CCTableViewCell.h in Headers */, 460E47D218080913000CDD6D /* CCTableViewCell.h in Headers */,
1AD71EF2180E27CF00808F54 /* CCPhysicsDebugNode.h in Headers */, 1AD71EF2180E27CF00808F54 /* CCPhysicsDebugNode.h in Headers */,
1AD71EF6180E27CF00808F54 /* CCPhysicsSprite.h in Headers */, 1AD71EF6180E27CF00808F54 /* CCPhysicsSprite.h in Headers */,
@ -5731,7 +5714,6 @@
460E47AC18080904000CDD6D /* CCInvocation.h in Headers */, 460E47AC18080904000CDD6D /* CCInvocation.h in Headers */,
460E47A018080904000CDD6D /* CCControlPotentiometer.h in Headers */, 460E47A018080904000CDD6D /* CCControlPotentiometer.h in Headers */,
460E47BE1808090D000CDD6D /* CCEditBox.h in Headers */, 460E47BE1808090D000CDD6D /* CCEditBox.h in Headers */,
1540AF44193EB3A000717D8E /* xxtea.h in Headers */,
460E47C21808090D000CDD6D /* CCEditBoxImplIOS.h in Headers */, 460E47C21808090D000CDD6D /* CCEditBoxImplIOS.h in Headers */,
1AD71EF3180E27CF00808F54 /* CCPhysicsDebugNode.h in Headers */, 1AD71EF3180E27CF00808F54 /* CCPhysicsDebugNode.h in Headers */,
1AD71EF7180E27CF00808F54 /* CCPhysicsSprite.h in Headers */, 1AD71EF7180E27CF00808F54 /* CCPhysicsSprite.h in Headers */,
@ -6474,7 +6456,6 @@
460E478418080902000CDD6D /* CCControlHuePicker.cpp in Sources */, 460E478418080902000CDD6D /* CCControlHuePicker.cpp in Sources */,
460E478A18080902000CDD6D /* CCControlSlider.cpp in Sources */, 460E478A18080902000CDD6D /* CCControlSlider.cpp in Sources */,
460E478818080902000CDD6D /* CCControlSaturationBrightnessPicker.cpp in Sources */, 460E478818080902000CDD6D /* CCControlSaturationBrightnessPicker.cpp in Sources */,
1540AF41193EB3A000717D8E /* xxtea.cpp in Sources */,
460E47B51808090B000CDD6D /* CCEditBoxImplIOS.mm in Sources */, 460E47B51808090B000CDD6D /* CCEditBoxImplIOS.mm in Sources */,
460E478E18080902000CDD6D /* CCControlSwitch.cpp in Sources */, 460E478E18080902000CDD6D /* CCControlSwitch.cpp in Sources */,
460E479218080902000CDD6D /* CCInvocation.cpp in Sources */, 460E479218080902000CDD6D /* CCInvocation.cpp in Sources */,
@ -6814,7 +6795,6 @@
460E479F18080904000CDD6D /* CCControlPotentiometer.cpp in Sources */, 460E479F18080904000CDD6D /* CCControlPotentiometer.cpp in Sources */,
460E479818080904000CDD6D /* CCControlButton.cpp in Sources */, 460E479818080904000CDD6D /* CCControlButton.cpp in Sources */,
460E47C51808090D000CDD6D /* CCEditBoxImplMac.mm in Sources */, 460E47C51808090D000CDD6D /* CCEditBoxImplMac.mm in Sources */,
1540AF42193EB3A000717D8E /* xxtea.cpp in Sources */,
460E479D18080904000CDD6D /* CCControlHuePicker.cpp in Sources */, 460E479D18080904000CDD6D /* CCControlHuePicker.cpp in Sources */,
460E47A318080904000CDD6D /* CCControlSlider.cpp in Sources */, 460E47A318080904000CDD6D /* CCControlSlider.cpp in Sources */,
460E47AB18080904000CDD6D /* CCInvocation.cpp in Sources */, 460E47AB18080904000CDD6D /* CCInvocation.cpp in Sources */,

2
cocos/2d/cocos2d.vcxproj
View File

@ -220,7 +220,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="..\base\etc1.cpp" /> <ClCompile Include="..\base\etc1.cpp" />
<ClCompile Include="..\base\s3tc.cpp" /> <ClCompile Include="..\base\s3tc.cpp" />
<ClCompile Include="..\base\TGAlib.cpp" /> <ClCompile Include="..\base\TGAlib.cpp" />
<ClCompile Include="..\base\xxtea.cpp" />
<ClCompile Include="..\base\ZipUtils.cpp" /> <ClCompile Include="..\base\ZipUtils.cpp" />
<ClCompile Include="..\cocos2d.cpp" /> <ClCompile Include="..\cocos2d.cpp" />
<ClCompile Include="..\deprecated\CCArray.cpp" /> <ClCompile Include="..\deprecated\CCArray.cpp" />
@ -404,7 +403,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="..\base\TGAlib.h" /> <ClInclude Include="..\base\TGAlib.h" />
<ClInclude Include="..\base\uthash.h" /> <ClInclude Include="..\base\uthash.h" />
<ClInclude Include="..\base\utlist.h" /> <ClInclude Include="..\base\utlist.h" />
<ClInclude Include="..\base\xxtea.h" />
<ClInclude Include="..\base\ZipUtils.h" /> <ClInclude Include="..\base\ZipUtils.h" />
<ClInclude Include="..\cocos2d.h" /> <ClInclude Include="..\cocos2d.h" />
<ClInclude Include="..\deprecated\CCArray.h" /> <ClInclude Include="..\deprecated\CCArray.h" />

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

@ -565,9 +565,6 @@
<ClCompile Include="..\3d\CCSprite3DDataCache.cpp"> <ClCompile Include="..\3d\CCSprite3DDataCache.cpp">
<Filter>3d</Filter> <Filter>3d</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\base\xxtea.cpp">
<Filter>base</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\physics\CCPhysicsBody.h"> <ClInclude Include="..\physics\CCPhysicsBody.h">
@ -1147,9 +1144,6 @@
<ClInclude Include="..\3d\CCSprite3DDataCache.h"> <ClInclude Include="..\3d\CCSprite3DDataCache.h">
<Filter>3d</Filter> <Filter>3d</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\base\xxtea.h">
<Filter>base</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\math\Mat4.inl"> <None Include="..\math\Mat4.inl">

1
cocos/Android.mk
View File

@ -132,7 +132,6 @@ base/ccUTF8.cpp \
base/ccUtils.cpp \ base/ccUtils.cpp \
base/etc1.cpp \ base/etc1.cpp \
base/s3tc.cpp \ base/s3tc.cpp \
base/xxtea.cpp \
renderer/CCBatchCommand.cpp \ renderer/CCBatchCommand.cpp \
renderer/CCCustomCommand.cpp \ renderer/CCCustomCommand.cpp \
renderer/CCGLProgram.cpp \ renderer/CCGLProgram.cpp \

1
cocos/base/CMakeLists.txt
View File

@ -41,5 +41,4 @@ set(COCOS_BASE_SRC
base/ccUtils.cpp base/ccUtils.cpp
base/etc1.cpp base/etc1.cpp
base/s3tc.cpp base/s3tc.cpp
base/xxtea.cpp
) )

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

@ -54,7 +54,8 @@ LOCAL_SRC_FILES := manual/CCLuaBridge.cpp \
../../../external/lua/luasocket/timeout.c \ ../../../external/lua/luasocket/timeout.c \
../../../external/lua/luasocket/udp.c \ ../../../external/lua/luasocket/udp.c \
../../../external/lua/luasocket/unix.c \ ../../../external/lua/luasocket/unix.c \
../../../external/lua/luasocket/usocket.c ../../../external/lua/luasocket/usocket.c \
../../../external/xxtea/xxtea.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../external/lua/tolua \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../external/lua/tolua \
@ -68,7 +69,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../external/lua/tolua \
$(LOCAL_PATH)/auto \ $(LOCAL_PATH)/auto \
$(LOCAL_PATH)/manual \ $(LOCAL_PATH)/manual \
$(LOCAL_PATH)/manual/platform/android \ $(LOCAL_PATH)/manual/platform/android \
$(LOCAL_PATH)/manual/platform/android/jni $(LOCAL_PATH)/manual/platform/android/jni \
$(LOCAL_PATH)/../../../external/xxtea
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../external/lua/tolua \ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../external/lua/tolua \

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

@ -35,6 +35,7 @@ include_directories(
../../ui ../../ui
../../../external/lua/lua ../../../external/lua/lua
../../../external/lua/tolua ../../../external/lua/tolua
../../../external/xxtea
) )
@ -46,6 +47,7 @@ target_link_libraries(luabinding
tolua tolua
lua lua
spine spine
xxtea
) )
set_target_properties(luabinding set_target_properties(luabinding

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

@ -25,7 +25,7 @@
#include "CCLuaStack.h" #include "CCLuaStack.h"
#include "tolua_fix.h" #include "tolua_fix.h"
#include "extensions/xxtea/xxtea.h" #include "external/xxtea/xxtea.h"
extern "C" { extern "C" {
#include "lua.h" #include "lua.h"
#include "tolua++.h" #include "tolua++.h"

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

@ -15,6 +15,10 @@
1503FAA618DA8A1C00F6518C /* io.c in Sources */ = {isa = PBXBuildFile; fileRef = 1503FA9F18DA8A1C00F6518C /* io.c */; }; 1503FAA618DA8A1C00F6518C /* io.c in Sources */ = {isa = PBXBuildFile; fileRef = 1503FA9F18DA8A1C00F6518C /* io.c */; };
1503FAA718DA8A1C00F6518C /* io.h in Headers */ = {isa = PBXBuildFile; fileRef = 1503FAA018DA8A1C00F6518C /* io.h */; }; 1503FAA718DA8A1C00F6518C /* io.h in Headers */ = {isa = PBXBuildFile; fileRef = 1503FAA018DA8A1C00F6518C /* io.h */; };
1503FAA818DA8A1C00F6518C /* io.h in Headers */ = {isa = PBXBuildFile; fileRef = 1503FAA018DA8A1C00F6518C /* io.h */; }; 1503FAA818DA8A1C00F6518C /* io.h in Headers */ = {isa = PBXBuildFile; fileRef = 1503FAA018DA8A1C00F6518C /* io.h */; };
1540AF57193EC30500717D8E /* xxtea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1540AF55193EC30500717D8E /* xxtea.cpp */; };
1540AF58193EC30500717D8E /* xxtea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1540AF55193EC30500717D8E /* xxtea.cpp */; };
1540AF59193EC30500717D8E /* xxtea.h in Headers */ = {isa = PBXBuildFile; fileRef = 1540AF56193EC30500717D8E /* xxtea.h */; };
1540AF5A193EC30500717D8E /* xxtea.h in Headers */ = {isa = PBXBuildFile; fileRef = 1540AF56193EC30500717D8E /* xxtea.h */; };
1A262AB818BEEF5900D2DB92 /* tolua_fix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A262AB718BEEF5900D2DB92 /* tolua_fix.cpp */; }; 1A262AB818BEEF5900D2DB92 /* tolua_fix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A262AB718BEEF5900D2DB92 /* tolua_fix.cpp */; };
1A262AB918BEEF5900D2DB92 /* tolua_fix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A262AB718BEEF5900D2DB92 /* tolua_fix.cpp */; }; 1A262AB918BEEF5900D2DB92 /* tolua_fix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A262AB718BEEF5900D2DB92 /* tolua_fix.cpp */; };
1AACE7B518BC45C200215002 /* lua_cocos2dx_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE74918BC45C200215002 /* lua_cocos2dx_auto.cpp */; }; 1AACE7B518BC45C200215002 /* lua_cocos2dx_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE74918BC45C200215002 /* lua_cocos2dx_auto.cpp */; };
@ -214,6 +218,8 @@
1503FA9E18DA8A1C00F6518C /* buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = buffer.h; sourceTree = "<group>"; }; 1503FA9E18DA8A1C00F6518C /* buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = buffer.h; sourceTree = "<group>"; };
1503FA9F18DA8A1C00F6518C /* io.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = io.c; sourceTree = "<group>"; }; 1503FA9F18DA8A1C00F6518C /* io.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = io.c; sourceTree = "<group>"; };
1503FAA018DA8A1C00F6518C /* io.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = io.h; sourceTree = "<group>"; }; 1503FAA018DA8A1C00F6518C /* io.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = io.h; sourceTree = "<group>"; };
1540AF55193EC30500717D8E /* xxtea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xxtea.cpp; sourceTree = "<group>"; };
1540AF56193EC30500717D8E /* xxtea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xxtea.h; sourceTree = "<group>"; };
1A262AB718BEEF5900D2DB92 /* tolua_fix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tolua_fix.cpp; sourceTree = "<group>"; }; 1A262AB718BEEF5900D2DB92 /* tolua_fix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tolua_fix.cpp; sourceTree = "<group>"; };
1AACE74618BC45A000215002 /* libluabindings Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluabindings Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 1AACE74618BC45A000215002 /* libluabindings Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluabindings Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; };
1AACE74718BC45A000215002 /* libluabindings iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluabindings iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 1AACE74718BC45A000215002 /* libluabindings iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluabindings iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@ -335,6 +341,16 @@
/* End PBXFrameworksBuildPhase section */ /* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */ /* Begin PBXGroup section */
1540AF54193EC30500717D8E /* xxtea */ = {
isa = PBXGroup;
children = (
1540AF55193EC30500717D8E /* xxtea.cpp */,
1540AF56193EC30500717D8E /* xxtea.h */,
);
name = xxtea;
path = ../../../../external/xxtea;
sourceTree = "<group>";
};
1551A334158F2AB200E66CFE = { 1551A334158F2AB200E66CFE = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
@ -439,6 +455,7 @@
1ABCA1E218CD8F230087CE3A /* external */ = { 1ABCA1E218CD8F230087CE3A /* external */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
1540AF54193EC30500717D8E /* xxtea */,
1ABCA1E318CD8F2D0087CE3A /* luajit */, 1ABCA1E318CD8F2D0087CE3A /* luajit */,
1ABCA20E18CD8F7D0087CE3A /* luasocket */, 1ABCA20E18CD8F7D0087CE3A /* luasocket */,
1ABCA1E418CD8F330087CE3A /* tolua */, 1ABCA1E418CD8F330087CE3A /* tolua */,
@ -548,6 +565,7 @@
1503FAA818DA8A1C00F6518C /* io.h in Headers */, 1503FAA818DA8A1C00F6518C /* io.h in Headers */,
1ABCA26C18CD8F7D0087CE3A /* unix.h in Headers */, 1ABCA26C18CD8F7D0087CE3A /* unix.h in Headers */,
1AACE7E018BC45C200215002 /* CCLuaBridge.h in Headers */, 1AACE7E018BC45C200215002 /* CCLuaBridge.h in Headers */,
1540AF5A193EC30500717D8E /* xxtea.h in Headers */,
C0FEF4D918BE0E70001F446C /* lua_debugger.h in Headers */, C0FEF4D918BE0E70001F446C /* lua_debugger.h in Headers */,
1AACE7B818BC45C200215002 /* lua_cocos2dx_auto.hpp in Headers */, 1AACE7B818BC45C200215002 /* lua_cocos2dx_auto.hpp in Headers */,
1AACE7E418BC45C200215002 /* CCLuaEngine.h in Headers */, 1AACE7E418BC45C200215002 /* CCLuaEngine.h in Headers */,
@ -605,6 +623,7 @@
1503FAA718DA8A1C00F6518C /* io.h in Headers */, 1503FAA718DA8A1C00F6518C /* io.h in Headers */,
1ABCA26B18CD8F7D0087CE3A /* unix.h in Headers */, 1ABCA26B18CD8F7D0087CE3A /* unix.h in Headers */,
1AACE7DF18BC45C200215002 /* CCLuaBridge.h in Headers */, 1AACE7DF18BC45C200215002 /* CCLuaBridge.h in Headers */,
1540AF59193EC30500717D8E /* xxtea.h in Headers */,
C0FEF4D818BE0E70001F446C /* lua_debugger.h in Headers */, C0FEF4D818BE0E70001F446C /* lua_debugger.h in Headers */,
1AACE7B718BC45C200215002 /* lua_cocos2dx_auto.hpp in Headers */, 1AACE7B718BC45C200215002 /* lua_cocos2dx_auto.hpp in Headers */,
1AACE7E318BC45C200215002 /* CCLuaEngine.h in Headers */, 1AACE7E318BC45C200215002 /* CCLuaEngine.h in Headers */,
@ -736,6 +755,7 @@
1ABCA23E18CD8F7D0087CE3A /* luasocket.c in Sources */, 1ABCA23E18CD8F7D0087CE3A /* luasocket.c in Sources */,
1ABCA25218CD8F7D0087CE3A /* select.c in Sources */, 1ABCA25218CD8F7D0087CE3A /* select.c in Sources */,
1ABCA24A18CD8F7D0087CE3A /* mime.c in Sources */, 1ABCA24A18CD8F7D0087CE3A /* mime.c in Sources */,
1540AF58193EC30500717D8E /* xxtea.cpp in Sources */,
1ABCA26218CD8F7D0087CE3A /* timeout.c in Sources */, 1ABCA26218CD8F7D0087CE3A /* timeout.c in Sources */,
1503FAA618DA8A1C00F6518C /* io.c in Sources */, 1503FAA618DA8A1C00F6518C /* io.c in Sources */,
1ABCA26618CD8F7D0087CE3A /* udp.c in Sources */, 1ABCA26618CD8F7D0087CE3A /* udp.c in Sources */,
@ -792,6 +812,7 @@
1ABCA23D18CD8F7D0087CE3A /* luasocket.c in Sources */, 1ABCA23D18CD8F7D0087CE3A /* luasocket.c in Sources */,
1ABCA25118CD8F7D0087CE3A /* select.c in Sources */, 1ABCA25118CD8F7D0087CE3A /* select.c in Sources */,
1ABCA24918CD8F7D0087CE3A /* mime.c in Sources */, 1ABCA24918CD8F7D0087CE3A /* mime.c in Sources */,
1540AF57193EC30500717D8E /* xxtea.cpp in Sources */,
1ABCA26118CD8F7D0087CE3A /* timeout.c in Sources */, 1ABCA26118CD8F7D0087CE3A /* timeout.c in Sources */,
1503FAA518DA8A1C00F6518C /* io.c in Sources */, 1503FAA518DA8A1C00F6518C /* io.c in Sources */,
1ABCA26518CD8F7D0087CE3A /* udp.c in Sources */, 1ABCA26518CD8F7D0087CE3A /* udp.c in Sources */,

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

@ -29,6 +29,7 @@
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_map.c" /> <ClCompile Include="..\..\..\..\external\lua\tolua\tolua_map.c" />
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_push.c" /> <ClCompile Include="..\..\..\..\external\lua\tolua\tolua_push.c" />
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_to.c" /> <ClCompile Include="..\..\..\..\external\lua\tolua\tolua_to.c" />
<ClCompile Include="..\..\..\..\external\xxtea\xxtea.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_auto.cpp" /> <ClCompile Include="..\auto\lua_cocos2dx_auto.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_extension_auto.cpp" /> <ClCompile Include="..\auto\lua_cocos2dx_extension_auto.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_physics_auto.cpp" /> <ClCompile Include="..\auto\lua_cocos2dx_physics_auto.cpp" />
@ -79,6 +80,7 @@
<ClInclude Include="..\..\..\..\external\lua\luasocket\wsocket.h" /> <ClInclude Include="..\..\..\..\external\lua\luasocket\wsocket.h" />
<ClInclude Include="..\..\..\..\external\lua\tolua\tolua++.h" /> <ClInclude Include="..\..\..\..\external\lua\tolua\tolua++.h" />
<ClInclude Include="..\..\..\..\external\lua\tolua\tolua_event.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_auto.hpp" />
<ClInclude Include="..\auto\lua_cocos2dx_extension_auto.hpp" /> <ClInclude Include="..\auto\lua_cocos2dx_extension_auto.hpp" />
<ClInclude Include="..\auto\lua_cocos2dx_physics_auto.hpp" /> <ClInclude Include="..\auto\lua_cocos2dx_physics_auto.hpp" />
@ -140,8 +142,8 @@
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset> <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</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)' == '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'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset> <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
@ -149,8 +151,8 @@
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset> <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</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)' == '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'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset> <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">

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

@ -19,6 +19,9 @@
<Filter Include="luajit"> <Filter Include="luajit">
<UniqueIdentifier>{cc863463-a948-487a-aacd-dc233c3e5200}</UniqueIdentifier> <UniqueIdentifier>{cc863463-a948-487a-aacd-dc233c3e5200}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="xxtea">
<UniqueIdentifier>{1fa7ff75-c142-4928-8aef-e6a2eb2b465f}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\auto\lua_cocos2dx_auto.cpp"> <ClCompile Include="..\auto\lua_cocos2dx_auto.cpp">
@ -159,6 +162,9 @@
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_to.c"> <ClCompile Include="..\..\..\..\external\lua\tolua\tolua_to.c">
<Filter>tolua</Filter> <Filter>tolua</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\external\xxtea\xxtea.cpp">
<Filter>xxtea</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\auto\lua_cocos2dx_auto.hpp"> <ClInclude Include="..\auto\lua_cocos2dx_auto.hpp">
@ -305,6 +311,9 @@
<ClInclude Include="..\..\..\..\external\lua\luajit\include\lualib.h"> <ClInclude Include="..\..\..\..\external\lua\luajit\include\lualib.h">
<Filter>luajit</Filter> <Filter>luajit</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\..\external\xxtea\xxtea.h">
<Filter>xxtea</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\script\Cocos2dConstants.lua"> <None Include="..\script\Cocos2dConstants.lua">

14
external/xxtea/CMakeLists.txt vendored Normal file
View File

@ -0,0 +1,14 @@
set(XXTEA
xxtea.c
)
add_library(xxtea STATIC
${XXTEA}
)
set_target_properties(xxtea
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)

0
extensions/xxtea/xxtea.cpp → external/xxtea/xxtea.cpp vendored
View File

0
extensions/xxtea/xxtea.h → external/xxtea/xxtea.h vendored
View File

6
templates/cocos2dx_files.json
View File

@ -351,8 +351,6 @@
"cocos/base/s3tc.h", "cocos/base/s3tc.h",
"cocos/base/uthash.h", "cocos/base/uthash.h",
"cocos/base/utlist.h", "cocos/base/utlist.h",
"cocos/base/xxtea.cpp",
"cocos/base/xxtea.h",
"cocos/cocos2d-prefix.pch", "cocos/cocos2d-prefix.pch",
"cocos/cocos2d.cpp", "cocos/cocos2d.cpp",
"cocos/cocos2d.h", "cocos/cocos2d.h",
@ -4252,7 +4250,9 @@
"external/lua/tolua/tolua_is.c", "external/lua/tolua/tolua_is.c",
"external/lua/tolua/tolua_map.c", "external/lua/tolua/tolua_map.c",
"external/lua/tolua/tolua_push.c", "external/lua/tolua/tolua_push.c",
"external/lua/tolua/tolua_to.c", "external/lua/tolua/tolua_to.c",
"external/xxtea/xxtea.cpp",
"external/xxtea/xxtea.h",
"tools/bindings-generator/AUTHORS", "tools/bindings-generator/AUTHORS",
"tools/bindings-generator/README.md", "tools/bindings-generator/README.md",
"tools/bindings-generator/backup/clang-llvm-3.3-pybinding/__init__.py", "tools/bindings-generator/backup/clang-llvm-3.3-pybinding/__init__.py",

5
templates/lua-template-default/frameworks/CMakeLists.txt
View File

@ -75,6 +75,7 @@ include_directories(
${COCOS2D_ROOT}/external/freetype2/include/linux ${COCOS2D_ROOT}/external/freetype2/include/linux
${COCOS2D_ROOT}/external/linux-specific/fmod/include/${ARCH_DIR} ${COCOS2D_ROOT}/external/linux-specific/fmod/include/${ARCH_DIR}
${COCOS2D_ROOT}/external/xxhash ${COCOS2D_ROOT}/external/xxhash
${COCOS2D_ROOT}/external/xxtea
) )
link_directories( link_directories(
@ -111,6 +112,9 @@ add_subdirectory(${COCOS2D_ROOT}/cocos)
# extensions # extensions
add_subdirectory(${COCOS2D_ROOT}/extensions) add_subdirectory(${COCOS2D_ROOT}/extensions)
# xxtea library
add_subdirectory(${COCOS2D_ROOT}/external/xxtea)
## Editor Support ## Editor Support
# spine # spine
@ -151,6 +155,7 @@ target_link_libraries(${APP_NAME}
extensions extensions
audio audio
cocos2d cocos2d
xxtea
) )
set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin") set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin")