Skip to content

Commit a43861e

Browse files
halx99minggo
authored andcommitted
Make luabindings framework compat with lua52 & lua53. (#20157)
* Make luabindings framework compat with lua52 & lua53. * Remove link from static lib, let user can choose which lua version hi want. * Add lua51.lib dependencies for win32.
1 parent 068c0f0 commit a43861e

File tree

5 files changed

+15
-9
lines changed

5 files changed

+15
-9
lines changed

cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
#include "base/CCDirector.h"
3838
#include "base/CCEventCustom.h"
3939

40-
#pragma comment(lib,"lua51.lib")
41-
4240
NS_CC_BEGIN
4341

4442
LuaEngine* LuaEngine::_defaultEngine = nullptr;

cocos/scripting/lua-bindings/manual/tolua_fix.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,15 @@
2727
#define __TOLUA_FIX_H_
2828

2929
#include "tolua++.h"
30-
30+
31+
#if LUA_VERSION_NUM > 501
32+
#define lua_setfenv lua_setuservalue
33+
#define lua_open luaL_newstate
34+
#if !defined(LUA_COMPAT_5_1) && !defined(LUA_COMPAT_ALL)
35+
#define lua_objlen(L,i) lua_rawlen(L, (i))
36+
#endif
37+
#endif
38+
3139
#define TOLUA_REFID_PTR_MAPPING "toluafix_refid_ptr_mapping"
3240
#define TOLUA_REFID_TYPE_MAPPING "toluafix_refid_type_mapping"
3341
#define TOLUA_REFID_FUNCTION_MAPPING "toluafix_refid_function_mapping"

templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<TargetMachine>MachineX86</TargetMachine>
9292
<GenerateDebugInformation>true</GenerateDebugInformation>
9393
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories);$(_COCOS_LIB_PATH_WIN32_BEGIN);$(_COCOS_LIB_PATH_WIN32_END)</AdditionalLibraryDirectories>
94-
<AdditionalDependencies>libcurl.lib;%(AdditionalDependencies);$(_COCOS_LIB_WIN32_BEGIN);$(_COCOS_LIB_WIN32_END)</AdditionalDependencies>
94+
<AdditionalDependencies>lua51.lib;libcurl.lib;%(AdditionalDependencies);$(_COCOS_LIB_WIN32_BEGIN);$(_COCOS_LIB_WIN32_END)</AdditionalDependencies>
9595
<IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
9696
<ProgramDatabaseFile>$(ProjectDir)../../../simulator/win32/$(TargetName).pdb</ProgramDatabaseFile>
9797
<OutputFile>$(ProjectDir)../../../simulator/win32/$(TargetName)$(TargetExt)</OutputFile>
@@ -157,7 +157,7 @@ xcopy "$(ProjectDir)..\..\..\src" "$(LocalDebuggerWorkingDirectory)\Resources\sr
157157
<SubSystem>Windows</SubSystem>
158158
<TargetMachine>MachineX86</TargetMachine>
159159
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories);$(_COCOS_LIB_PATH_WIN32_BEGIN);$(_COCOS_LIB_PATH_WIN32_END)</AdditionalLibraryDirectories>
160-
<AdditionalDependencies>libcurl.lib;%(AdditionalDependencies);$(_COCOS_LIB_WIN32_BEGIN);$(_COCOS_LIB_WIN32_END)</AdditionalDependencies>
160+
<AdditionalDependencies>lua51.lib;libcurl.lib;%(AdditionalDependencies);$(_COCOS_LIB_WIN32_BEGIN);$(_COCOS_LIB_WIN32_END)</AdditionalDependencies>
161161
<IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
162162
<GenerateDebugInformation>true</GenerateDebugInformation>
163163
<OutputFile>$(ProjectDir)../../../publish/win32/$(TargetName)$(TargetExt)</OutputFile>

tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
105105
</ResourceCompile>
106106
<Link>
107-
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
107+
<AdditionalDependencies>lua51.lib;%(AdditionalDependencies)</AdditionalDependencies>
108108
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
109109
<GenerateDebugInformation>true</GenerateDebugInformation>
110110
<SubSystem>Windows</SubSystem>
@@ -155,7 +155,7 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y</Command>
155155
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
156156
</ResourceCompile>
157157
<Link>
158-
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
158+
<AdditionalDependencies>lua51.lib;%(AdditionalDependencies)</AdditionalDependencies>
159159
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
160160
<SubSystem>Windows</SubSystem>
161161
<TargetMachine>MachineX86</TargetMachine>

tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<TargetMachine>MachineX86</TargetMachine>
9292
<GenerateDebugInformation>true</GenerateDebugInformation>
9393
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
94-
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
94+
<AdditionalDependencies>lua51.lib;%(AdditionalDependencies)</AdditionalDependencies>
9595
<IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
9696
</Link>
9797
<ResourceCompile>
@@ -143,7 +143,7 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y</Command>
143143
<SubSystem>Windows</SubSystem>
144144
<TargetMachine>MachineX86</TargetMachine>
145145
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
146-
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
146+
<AdditionalDependencies>lua51.lib;%(AdditionalDependencies)</AdditionalDependencies>
147147
<GenerateDebugInformation>true</GenerateDebugInformation>
148148
<IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
149149
</Link>

0 commit comments

Comments
 (0)