Skip to content

Commit 64ec174

Browse files
committed
modify:plugin lua support test
1 parent 9b1c9e3 commit 64ec174

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

.github/workflows/msbuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ jobs:
6666
uses: microsoft/setup-msbuild@v2
6767

6868
- name: Build Solution
69-
run: msbuild XEngine.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}
69+
run: msbuild XEngine.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }} /p:PreprocessorDefinitions="_XENGINE_BUILD_SWITCH_LUA;%(PreprocessorDefinitions)"

XEngine_Module/XEngine_PluginExtension/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CC = g++ -Wall -std=c++20 -fPIC
22
PLATFORM = linux
3-
MACRO_LUA_SUPPORT=0
3+
_XENGINE_BUILD_SWITCH_LUA=0
44
PLATVER =
55
FILEEXT =
66
LIBFLAG =
@@ -35,12 +35,12 @@ endif
3535
ifeq ($(PLATFORM),linux)
3636
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
3737
PLATVER = -D __CENTOS__
38-
ifeq ($(MACRO_LUA_SUPPORT),1)
38+
ifeq ($(_XENGINE_BUILD_SWITCH_LUA),1)
3939
LIB += -llua
4040
endif
4141
else
4242
PLATVER = -D __UBUNTU__
43-
ifeq ($(MACRO_LUA_SUPPORT),1)
43+
ifeq ($(_XENGINE_BUILD_SWITCH_LUA),1)
4444
LIB += -llua5.4
4545
endif
4646
endif
@@ -55,7 +55,7 @@ else ifeq ($(PLATFORM),mac)
5555
LIBFLAG = -dynamiclib
5656
LOADHDR += -I /opt/homebrew/opt/lua/include/lua
5757
LOADSO += -L /opt/homebrew/opt/lua/lib
58-
ifeq ($(MACRO_LUA_SUPPORT),1)
58+
ifeq ($(_XENGINE_BUILD_SWITCH_LUA),1)
5959
LIB += -llua
6060
endif
6161
LIBEX = -lpthread -ldl

XEngine_Module/XEngine_PluginExtension/PluginExtension_LuaCore/PluginExtension_LuaCore.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ bool CPluginExtension_LuaCore::PluginExtension_LuaCore_Exec(XNETHANDLE xhModule,
134134
st_csStl.unlock_shared();
135135
return false;
136136
}
137-
#if (1 == _XENGINE_BUILD_SWITCH_LUA)
137+
#ifdef _XENGINE_BUILD_SWITCH_LUA
138138
if (0 == lua_getglobal(stl_MapIterator->second.pSt_LuaState, "PluginCore_Call"))
139139
{
140140
PluginExtension_IsErrorOccur = true;
@@ -247,7 +247,7 @@ bool CPluginExtension_LuaCore::PluginExtension_LuaCore_Destroy()
247247
{
248248
PluginExtension_IsErrorOccur = false;
249249

250-
#if (1 == _XENGINE_BUILD_SWITCH_LUA)
250+
#ifdef _XENGINE_BUILD_SWITCH_LUA
251251
//清理STL元素空间
252252
st_csStl.lock();
253253
unordered_map<XNETHANDLE, PLUGINCORE_LUAFRAMEWORK>::iterator stl_MapIterator = stl_MapFrameWork.begin();
@@ -299,7 +299,7 @@ bool CPluginExtension_LuaCore::PluginExtension_LuaCore_Add(XNETHANDLE xhNet, LPC
299299
PluginExtension_dwErrorCode = ERROR_XENGINE_THIRDPART_PLUGIN_PARAMENT;
300300
return false;
301301
}
302-
#if (1 == _XENGINE_BUILD_SWITCH_LUA)
302+
#ifdef _XENGINE_BUILD_SWITCH_LUA
303303
PLUGINCORE_LUAFRAMEWORK st_LuaCore;
304304
memset(&st_LuaCore, '\0', sizeof(PLUGINCORE_LUAFRAMEWORK));
305305

XEngine_Module/XEngine_PluginExtension/PluginExtension_LuaCore/PluginExtension_LuaCore.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ typedef struct
1717
XCHAR tszModuleAuthor[128];
1818
XCHAR tszModuleDesc[128];
1919
XCHAR tszModuleVer[64];
20-
#if (1 == _XENGINE_BUILD_SWITCH_LUA)
20+
#ifdef _XENGINE_BUILD_SWITCH_LUA
2121
lua_State* pSt_LuaState;
2222
#endif
2323
}PLUGINCORE_LUAFRAMEWORK;

XEngine_Module/XEngine_PluginExtension/pch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <dlfcn.h>
1717
#endif
1818
#endif //PCH_H
19-
#if (1 == _XENGINE_BUILD_SWITCH_LUA)
19+
#ifdef _XENGINE_BUILD_SWITCH_LUA
2020
#include <lua.hpp>
2121
#endif
2222
#include <stdio.h>

0 commit comments

Comments
 (0)