Skip to content

Commit 9b1c9e3

Browse files
committed
fixed:build problem
1 parent 707c89b commit 9b1c9e3

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

XEngine.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@ Global
264264
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Debug|x64.Build.0 = Debug|x64
265265
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Debug|x86.ActiveCfg = Debug|Win32
266266
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Debug|x86.Build.0 = Debug|Win32
267-
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Release|ARM64.ActiveCfg = ARM64|x64
268-
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Release|ARM64.Build.0 = ARM64|x64
267+
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Release|ARM64.ActiveCfg = Release|ARM64
268+
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Release|ARM64.Build.0 = Release|ARM64
269269
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Release|x64.ActiveCfg = Release|x64
270270
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Release|x64.Build.0 = Release|x64
271271
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Release|x86.ActiveCfg = Release|Win32

XEngine_Module/XEngine_PluginExtension/Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
CC = g++ -Wall -std=c++20 -fPIC
22
PLATFORM = linux
3+
MACRO_LUA_SUPPORT=0
34
PLATVER =
45
FILEEXT =
56
LIBFLAG =
@@ -34,8 +35,14 @@ endif
3435
ifeq ($(PLATFORM),linux)
3536
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
3637
PLATVER = -D __CENTOS__
38+
ifeq ($(MACRO_LUA_SUPPORT),1)
39+
LIB += -llua
40+
endif
3741
else
3842
PLATVER = -D __UBUNTU__
43+
ifeq ($(MACRO_LUA_SUPPORT),1)
44+
LIB += -llua5.4
45+
endif
3946
endif
4047
FILEEXT = so
4148
LIBFLAG = -shared
@@ -48,6 +55,9 @@ else ifeq ($(PLATFORM),mac)
4855
LIBFLAG = -dynamiclib
4956
LOADHDR += -I /opt/homebrew/opt/lua/include/lua
5057
LOADSO += -L /opt/homebrew/opt/lua/lib
58+
ifeq ($(MACRO_LUA_SUPPORT),1)
59+
LIB += -llua
60+
endif
5161
LIBEX = -lpthread -ldl
5262
LOADBIN = -Wl,-rpath,@loader_path/./
5363
else ifeq ($(PLATFORM), android)

0 commit comments

Comments
 (0)