diff --git a/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp b/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp index 9be92d60d6a2..58a0e2065c12 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp +++ b/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp @@ -37,8 +37,6 @@ #include "base/CCDirector.h" #include "base/CCEventCustom.h" -#pragma comment(lib,"lua51.lib") - NS_CC_BEGIN LuaEngine* LuaEngine::_defaultEngine = nullptr; diff --git a/cocos/scripting/lua-bindings/manual/tolua_fix.h b/cocos/scripting/lua-bindings/manual/tolua_fix.h index 9490fd57b5ae..df9d5f6ba85d 100644 --- a/cocos/scripting/lua-bindings/manual/tolua_fix.h +++ b/cocos/scripting/lua-bindings/manual/tolua_fix.h @@ -27,7 +27,15 @@ #define __TOLUA_FIX_H_ #include "tolua++.h" - + +#if LUA_VERSION_NUM > 501 +#define lua_setfenv lua_setuservalue +#define lua_open luaL_newstate +#if !defined(LUA_COMPAT_5_1) && !defined(LUA_COMPAT_ALL) +#define lua_objlen(L,i) lua_rawlen(L, (i)) +#endif +#endif + #define TOLUA_REFID_PTR_MAPPING "toluafix_refid_ptr_mapping" #define TOLUA_REFID_TYPE_MAPPING "toluafix_refid_type_mapping" #define TOLUA_REFID_FUNCTION_MAPPING "toluafix_refid_function_mapping" diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj index 4b715d11cb5b..972b7721c5b0 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj @@ -91,7 +91,7 @@ MachineX86 true $(OutDir);%(AdditionalLibraryDirectories);$(_COCOS_LIB_PATH_WIN32_BEGIN);$(_COCOS_LIB_PATH_WIN32_END) - libcurl.lib;%(AdditionalDependencies);$(_COCOS_LIB_WIN32_BEGIN);$(_COCOS_LIB_WIN32_END) + lua51.lib;libcurl.lib;%(AdditionalDependencies);$(_COCOS_LIB_WIN32_BEGIN);$(_COCOS_LIB_WIN32_END) libcmt.lib $(ProjectDir)../../../simulator/win32/$(TargetName).pdb $(ProjectDir)../../../simulator/win32/$(TargetName)$(TargetExt) @@ -157,7 +157,7 @@ xcopy "$(ProjectDir)..\..\..\src" "$(LocalDebuggerWorkingDirectory)\Resources\sr Windows MachineX86 $(OutDir);%(AdditionalLibraryDirectories);$(_COCOS_LIB_PATH_WIN32_BEGIN);$(_COCOS_LIB_PATH_WIN32_END) - libcurl.lib;%(AdditionalDependencies);$(_COCOS_LIB_WIN32_BEGIN);$(_COCOS_LIB_WIN32_END) + lua51.lib;libcurl.lib;%(AdditionalDependencies);$(_COCOS_LIB_WIN32_BEGIN);$(_COCOS_LIB_WIN32_END) libcmt.lib true $(ProjectDir)../../../publish/win32/$(TargetName)$(TargetExt) diff --git a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj index f3b58d34297e..2c467b5d5488 100644 --- a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj +++ b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj @@ -104,7 +104,7 @@ $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) - %(AdditionalDependencies) + lua51.lib;%(AdditionalDependencies) $(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories) true Windows @@ -155,7 +155,7 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) - %(AdditionalDependencies) + lua51.lib;%(AdditionalDependencies) $(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories) Windows MachineX86 diff --git a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj index 39aadd707377..84ffd915ab7b 100644 --- a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj +++ b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj @@ -91,7 +91,7 @@ MachineX86 true $(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories) - %(AdditionalDependencies) + lua51.lib;%(AdditionalDependencies) libcmt.lib @@ -143,7 +143,7 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y Windows MachineX86 $(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories) - %(AdditionalDependencies) + lua51.lib;%(AdditionalDependencies) true libcmt.lib