File tree Expand file tree Collapse file tree 5 files changed +15
-9
lines changed
cocos/scripting/lua-bindings/manual
templates/lua-template-default/frameworks/runtime-src/proj.win32
lua-empty-test/project/proj.win32
lua-tests/project/proj.win32 Expand file tree Collapse file tree 5 files changed +15
-9
lines changed Original file line number Diff line number Diff line change 37
37
#include " base/CCDirector.h"
38
38
#include " base/CCEventCustom.h"
39
39
40
- #pragma comment(lib,"lua51.lib")
41
-
42
40
NS_CC_BEGIN
43
41
44
42
LuaEngine* LuaEngine::_defaultEngine = nullptr ;
Original file line number Diff line number Diff line change 27
27
#define __TOLUA_FIX_H_
28
28
29
29
#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
+
31
39
#define TOLUA_REFID_PTR_MAPPING "toluafix_refid_ptr_mapping"
32
40
#define TOLUA_REFID_TYPE_MAPPING "toluafix_refid_type_mapping"
33
41
#define TOLUA_REFID_FUNCTION_MAPPING "toluafix_refid_function_mapping"
Original file line number Diff line number Diff line change 91
91
<TargetMachine >MachineX86</TargetMachine >
92
92
<GenerateDebugInformation >true</GenerateDebugInformation >
93
93
<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 >
95
95
<IgnoreSpecificDefaultLibraries >libcmt.lib</IgnoreSpecificDefaultLibraries >
96
96
<ProgramDatabaseFile >$(ProjectDir)../../../simulator/win32/$(TargetName).pdb</ProgramDatabaseFile >
97
97
<OutputFile >$(ProjectDir)../../../simulator/win32/$(TargetName)$(TargetExt)</OutputFile >
@@ -157,7 +157,7 @@ xcopy "$(ProjectDir)..\..\..\src" "$(LocalDebuggerWorkingDirectory)\Resources\sr
157
157
<SubSystem >Windows</SubSystem >
158
158
<TargetMachine >MachineX86</TargetMachine >
159
159
<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 >
161
161
<IgnoreSpecificDefaultLibraries >libcmt.lib</IgnoreSpecificDefaultLibraries >
162
162
<GenerateDebugInformation >true</GenerateDebugInformation >
163
163
<OutputFile >$(ProjectDir)../../../publish/win32/$(TargetName)$(TargetExt)</OutputFile >
Original file line number Diff line number Diff line change 104
104
<AdditionalIncludeDirectories >$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories >
105
105
</ResourceCompile >
106
106
<Link >
107
- <AdditionalDependencies >%(AdditionalDependencies)</AdditionalDependencies >
107
+ <AdditionalDependencies >lua51.lib; %(AdditionalDependencies)</AdditionalDependencies >
108
108
<AdditionalLibraryDirectories >$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories >
109
109
<GenerateDebugInformation >true</GenerateDebugInformation >
110
110
<SubSystem >Windows</SubSystem >
@@ -155,7 +155,7 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y</Command>
155
155
<AdditionalIncludeDirectories >$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories >
156
156
</ResourceCompile >
157
157
<Link >
158
- <AdditionalDependencies >%(AdditionalDependencies)</AdditionalDependencies >
158
+ <AdditionalDependencies >lua51.lib; %(AdditionalDependencies)</AdditionalDependencies >
159
159
<AdditionalLibraryDirectories >$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories >
160
160
<SubSystem >Windows</SubSystem >
161
161
<TargetMachine >MachineX86</TargetMachine >
Original file line number Diff line number Diff line change 91
91
<TargetMachine >MachineX86</TargetMachine >
92
92
<GenerateDebugInformation >true</GenerateDebugInformation >
93
93
<AdditionalLibraryDirectories >$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories >
94
- <AdditionalDependencies >%(AdditionalDependencies)</AdditionalDependencies >
94
+ <AdditionalDependencies >lua51.lib; %(AdditionalDependencies)</AdditionalDependencies >
95
95
<IgnoreSpecificDefaultLibraries >libcmt.lib</IgnoreSpecificDefaultLibraries >
96
96
</Link >
97
97
<ResourceCompile >
@@ -143,7 +143,7 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y</Command>
143
143
<SubSystem >Windows</SubSystem >
144
144
<TargetMachine >MachineX86</TargetMachine >
145
145
<AdditionalLibraryDirectories >$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories >
146
- <AdditionalDependencies >%(AdditionalDependencies)</AdditionalDependencies >
146
+ <AdditionalDependencies >lua51.lib; %(AdditionalDependencies)</AdditionalDependencies >
147
147
<GenerateDebugInformation >true</GenerateDebugInformation >
148
148
<IgnoreSpecificDefaultLibraries >libcmt.lib</IgnoreSpecificDefaultLibraries >
149
149
</Link >
You can’t perform that action at this time.
0 commit comments