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

Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug 

Conflicts:
	cocos/scripting/lua/bindings/CCLuaStack.cpp
This commit is contained in:
samuele3hu 2014-01-26 11:59:54 +08:00
parent 9b514927f5 500a87c9f8
commit 48498f726e
5 changed files with 132 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/scripting/lua/bindings/CCLuaStack.cpp
View File

@ -31,7 +31,7 @@ extern "C" {
#include "lualib.h" #include "lualib.h"
#include "lauxlib.h" #include "lauxlib.h"
#include "tolua_fix.h" #include "tolua_fix.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) #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" #include "lua_extensions.h"
#endif #endif
} }
@ -149,7 +149,7 @@ bool LuaStack::init(void)
{NULL, NULL} {NULL, NULL}
}; };
luaL_register(_state, "_G", global_functions); luaL_register(_state, "_G", global_functions);
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_PLATFORM_MAC == CC_TARGET_PLATFORM) #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); luaopen_lua_extensions(_state);
#endif #endif
g_luaType.clear(); g_luaType.clear();

33
cocos/scripting/lua/bindings/liblua.vcxproj
View File

@ -96,7 +96,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$
<ClCompile> <ClCompile>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\..\..;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\cocosbuilder;$(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)cocos\scripting\auto-generated\lua-bindings;$(EngineRoot)cocos\gui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\..\..;$(EngineRoot);$(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)cocos\scripting\auto-generated\lua-bindings;$(EngineRoot)cocos\gui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
@ -152,8 +152,23 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$
<ClCompile Include="lua_cocos2dx_manual.cpp" /> <ClCompile Include="lua_cocos2dx_manual.cpp" />
<ClCompile Include="lua_cocos2dx_physics_manual.cpp" /> <ClCompile Include="lua_cocos2dx_physics_manual.cpp" />
<ClCompile Include="lua_cocos2dx_spine_manual.cpp" /> <ClCompile Include="lua_cocos2dx_spine_manual.cpp" />
<ClCompile Include="lua_extensions.c" />
<ClCompile Include="Lua_web_socket.cpp" /> <ClCompile Include="Lua_web_socket.cpp" />
<ClCompile Include="lua_xml_http_request.cpp" /> <ClCompile Include="lua_xml_http_request.cpp" />
<ClCompile Include="socket\auxiliar.c" />
<ClCompile Include="socket\except.c" />
<ClCompile Include="socket\inet.c" />
<ClCompile Include="socket\luasocket.c" />
<ClCompile Include="socket\luasocket_buffer.c" />
<ClCompile Include="socket\luasocket_io.c" />
<ClCompile Include="socket\mime.c" />
<ClCompile Include="socket\options.c" />
<ClCompile Include="socket\select.c" />
<ClCompile Include="socket\socket_scripts.c" />
<ClCompile Include="socket\tcp.c" />
<ClCompile Include="socket\timeout.c" />
<ClCompile Include="socket\udp.c" />
<ClCompile Include="socket\wsocket.c" />
<ClCompile Include="tolua_fix.c" /> <ClCompile Include="tolua_fix.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -186,8 +201,24 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$
<ClInclude Include="lua_cocos2dx_manual.hpp" /> <ClInclude Include="lua_cocos2dx_manual.hpp" />
<ClInclude Include="lua_cocos2dx_physics_manual.hpp" /> <ClInclude Include="lua_cocos2dx_physics_manual.hpp" />
<ClInclude Include="lua_cocos2dx_spine_manual.hpp" /> <ClInclude Include="lua_cocos2dx_spine_manual.hpp" />
<ClInclude Include="lua_extensions.h" />
<ClInclude Include="Lua_web_socket.h" /> <ClInclude Include="Lua_web_socket.h" />
<ClInclude Include="lua_xml_http_request.h" /> <ClInclude Include="lua_xml_http_request.h" />
<ClInclude Include="socket\auxiliar.h" />
<ClInclude Include="socket\except.h" />
<ClInclude Include="socket\inet.h" />
<ClInclude Include="socket\luasocket.h" />
<ClInclude Include="socket\luasocket_buffer.h" />
<ClInclude Include="socket\luasocket_io.h" />
<ClInclude Include="socket\mime.h" />
<ClInclude Include="socket\options.h" />
<ClInclude Include="socket\select.h" />
<ClInclude Include="socket\socket.h" />
<ClInclude Include="socket\socket_scripts.h" />
<ClInclude Include="socket\tcp.h" />
<ClInclude Include="socket\timeout.h" />
<ClInclude Include="socket\udp.h" />
<ClInclude Include="socket\wsocket.h" />
<ClInclude Include="tolua_fix.h" /> <ClInclude Include="tolua_fix.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

96
cocos/scripting/lua/bindings/liblua.vcxproj.filters
View File

@ -16,6 +16,9 @@
<Filter Include="cocos2dx_support\generated"> <Filter Include="cocos2dx_support\generated">
<UniqueIdentifier>{19f563f0-e0ff-4500-890b-1755841d4ddb}</UniqueIdentifier> <UniqueIdentifier>{19f563f0-e0ff-4500-890b-1755841d4ddb}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="cocos2dx_support\socket">
<UniqueIdentifier>{8815bb6e-fc9c-4cbf-b190-8b47169ed71f}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\auto-generated\lua-bindings\lua_cocos2dx_auto.cpp"> <ClCompile Include="..\..\auto-generated\lua-bindings\lua_cocos2dx_auto.cpp">
@ -111,6 +114,51 @@
<ClCompile Include="..\..\auto-generated\lua-bindings\lua_cocos2dx_physics_auto.cpp"> <ClCompile Include="..\..\auto-generated\lua-bindings\lua_cocos2dx_physics_auto.cpp">
<Filter>cocos2dx_support\generated</Filter> <Filter>cocos2dx_support\generated</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="socket\auxiliar.c">
<Filter>cocos2dx_support\socket</Filter>
</ClCompile>
<ClCompile Include="socket\except.c">
<Filter>cocos2dx_support\socket</Filter>
</ClCompile>
<ClCompile Include="socket\inet.c">
<Filter>cocos2dx_support\socket</Filter>
</ClCompile>
<ClCompile Include="socket\luasocket.c">
<Filter>cocos2dx_support\socket</Filter>
</ClCompile>
<ClCompile Include="socket\luasocket_buffer.c">
<Filter>cocos2dx_support\socket</Filter>
</ClCompile>
<ClCompile Include="socket\luasocket_io.c">
<Filter>cocos2dx_support\socket</Filter>
</ClCompile>
<ClCompile Include="socket\mime.c">
<Filter>cocos2dx_support\socket</Filter>
</ClCompile>
<ClCompile Include="socket\options.c">
<Filter>cocos2dx_support\socket</Filter>
</ClCompile>
<ClCompile Include="socket\select.c">
<Filter>cocos2dx_support\socket</Filter>
</ClCompile>
<ClCompile Include="socket\socket_scripts.c">
<Filter>cocos2dx_support\socket</Filter>
</ClCompile>
<ClCompile Include="socket\tcp.c">
<Filter>cocos2dx_support\socket</Filter>
</ClCompile>
<ClCompile Include="socket\timeout.c">
<Filter>cocos2dx_support\socket</Filter>
</ClCompile>
<ClCompile Include="socket\udp.c">
<Filter>cocos2dx_support\socket</Filter>
</ClCompile>
<ClCompile Include="socket\wsocket.c">
<Filter>cocos2dx_support\socket</Filter>
</ClCompile>
<ClCompile Include="lua_extensions.c">
<Filter>cocos2dx_support</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\auto-generated\lua-bindings\lua_cocos2dx_auto.hpp"> <ClInclude Include="..\..\auto-generated\lua-bindings\lua_cocos2dx_auto.hpp">
@ -209,6 +257,54 @@
<ClInclude Include="..\..\auto-generated\lua-bindings\lua_cocos2dx_physics_auto.hpp"> <ClInclude Include="..\..\auto-generated\lua-bindings\lua_cocos2dx_physics_auto.hpp">
<Filter>cocos2dx_support\generated</Filter> <Filter>cocos2dx_support\generated</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="socket\auxiliar.h">
<Filter>cocos2dx_support\socket</Filter>
</ClInclude>
<ClInclude Include="socket\except.h">
<Filter>cocos2dx_support\socket</Filter>
</ClInclude>
<ClInclude Include="socket\inet.h">
<Filter>cocos2dx_support\socket</Filter>
</ClInclude>
<ClInclude Include="socket\luasocket.h">
<Filter>cocos2dx_support\socket</Filter>
</ClInclude>
<ClInclude Include="socket\luasocket_buffer.h">
<Filter>cocos2dx_support\socket</Filter>
</ClInclude>
<ClInclude Include="socket\luasocket_io.h">
<Filter>cocos2dx_support\socket</Filter>
</ClInclude>
<ClInclude Include="socket\mime.h">
<Filter>cocos2dx_support\socket</Filter>
</ClInclude>
<ClInclude Include="socket\options.h">
<Filter>cocos2dx_support\socket</Filter>
</ClInclude>
<ClInclude Include="socket\select.h">
<Filter>cocos2dx_support\socket</Filter>
</ClInclude>
<ClInclude Include="socket\socket.h">
<Filter>cocos2dx_support\socket</Filter>
</ClInclude>
<ClInclude Include="socket\socket_scripts.h">
<Filter>cocos2dx_support\socket</Filter>
</ClInclude>
<ClInclude Include="socket\tcp.h">
<Filter>cocos2dx_support\socket</Filter>
</ClInclude>
<ClInclude Include="socket\timeout.h">
<Filter>cocos2dx_support\socket</Filter>
</ClInclude>
<ClInclude Include="socket\udp.h">
<Filter>cocos2dx_support\socket</Filter>
</ClInclude>
<ClInclude Include="socket\wsocket.h">
<Filter>cocos2dx_support\socket</Filter>
</ClInclude>
<ClInclude Include="lua_extensions.h">
<Filter>cocos2dx_support</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\..\auto-generated\lua-bindings\lua_cocos2dx_auto_api.js"> <None Include="..\..\auto-generated\lua-bindings\lua_cocos2dx_auto_api.js">

2
samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
View File

@ -140,7 +140,7 @@
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<AdditionalDependencies>lua51.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libcurl_imp.lib;lua51.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>

2
tools/project-creator/module/cocos_files.json.REMOVED.git-id
View File

@ -1 +1 @@
f2d904a11c3d04415a453ab06821282d09dd88f2 44ac62648cf47a69716600ec684d653c4705f990