Skip to content

Commit 4dc0b75

Browse files
committed
fixed:linux build error
1 parent 059e568 commit 4dc0b75

File tree

7 files changed

+13
-10
lines changed

7 files changed

+13
-10
lines changed

XEngine_Source/XEngine_ModulePlugin/Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ RELEASE = 0
55
UNICODE = 0
66
INCLUDE = -I ./
77
LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib
8-
LIB = -lXEngine_BaseLib
8+
LIB = -lXEngine_BaseLib -llua5.3
99
LIBEX = -ldl -lpthread
1010
LOADSO = -Wl,-rpath=./,--disable-new-dtags
11-
LIBINCLUDE = ModulePlugin_Core.o ModulePlugin_Loader.o pch.o
11+
LIBINCLUDE = ModulePlugin_LibCore.o ModulePlugin_LuaCore.o ModulePlugin_Loader.o pch.o
1212

1313
ifeq ($(shell uname),Darwin)
1414
SHAREDLL = dylib
@@ -37,8 +37,10 @@ endif
3737
all:$(LIBINCLUDE)
3838
$(CC) $(DEBUG) $(LIBINCLUDE) -o libXEngine_ModulePlugin.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
3939

40-
ModulePlugin_Core.o:./ModulePlugin_Core/ModulePlugin_Core.cpp
41-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./ModulePlugin_Core/ModulePlugin_Core.cpp
40+
ModulePlugin_LibCore.o:./ModulePlugin_LibCore/ModulePlugin_LibCore.cpp
41+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./ModulePlugin_LibCore/ModulePlugin_LibCore.cpp
42+
ModulePlugin_LuaCore.o:./ModulePlugin_LuaCore/ModulePlugin_LuaCore.cpp
43+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./ModulePlugin_LuaCore/ModulePlugin_LuaCore.cpp
4244
ModulePlugin_Loader.o:./ModulePlugin_Loader/ModulePlugin_Loader.cpp
4345
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./ModulePlugin_Loader/ModulePlugin_Loader.cpp
4446

XEngine_Source/XEngine_ModulePlugin/pch.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@
1111
// 添加要在此处预编译的标头
1212
#include "framework.h"
1313
#include <tchar.h>
14+
#include <lua.hpp>
1415
#else
1516
#include <dlfcn.h>
17+
#include <lua5.3/lua.hpp>
1618
#endif
1719
#endif //PCH_H
1820
#include <stdio.h>
1921
#include <stdlib.h>
2022
#include <string.h>
2123
#include <errno.h>
22-
#include <lua.hpp>
2324
#include <list>
2425
#include <thread>
2526
#include <memory>

XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pch.o:./pch.cpp
4646

4747
InstallAll:InstallSo
4848
InstallSo:./libModulePlugin_BMIndex.$(SHAREDLL)
49-
cp ./libModulePlugin_BMIndex.$(SHAREDLL) ../../../XEngine_Release/XEngine_Plugin/libModulePlugin_BMIndex.$(SHAREDLL)
49+
cp ./libModulePlugin_BMIndex.$(SHAREDLL) ../../../XEngine_Release/XEngine_LibPlugin/libModulePlugin_BMIndex.$(SHAREDLL)
5050

5151
CleanAll:CleanObj CleanMk
5252
CleanObj:

XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pch.o:./pch.cpp
4646

4747
InstallAll:InstallSo
4848
InstallSo:./libModulePlugin_Meter.$(SHAREDLL)
49-
cp ./libModulePlugin_Meter.$(SHAREDLL) ../../../XEngine_Release/XEngine_Plugin/libModulePlugin_Meter.$(SHAREDLL)
49+
cp ./libModulePlugin_Meter.$(SHAREDLL) ../../../XEngine_Release/XEngine_LibPlugin/libModulePlugin_Meter.$(SHAREDLL)
5050

5151
CleanAll:CleanObj CleanMk
5252
CleanObj:

XEngine_Source/XEngine_PluginModule/ModulePlugin_Password/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pch.o:./pch.cpp
4646

4747
InstallAll:InstallSo
4848
InstallSo:./libModulePlugin_Password.$(SHAREDLL)
49-
cp ./libModulePlugin_Password.$(SHAREDLL) ../../../XEngine_Release/XEngine_Plugin/libModulePlugin_Password.$(SHAREDLL)
49+
cp ./libModulePlugin_Password.$(SHAREDLL) ../../../XEngine_Release/XEngine_LibPlugin/libModulePlugin_Password.$(SHAREDLL)
5050

5151
CleanAll:CleanObj CleanMk
5252
CleanObj:

XEngine_Source/XEngine_PluginModule/ModulePlugin_Timezone/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pch.o:./pch.cpp
4646

4747
InstallAll:InstallSo
4848
InstallSo:./libModulePlugin_Timezone.$(SHAREDLL)
49-
cp ./libModulePlugin_Timezone.$(SHAREDLL) ../../../XEngine_Release/XEngine_Plugin/libModulePlugin_Timezone.$(SHAREDLL)
49+
cp ./libModulePlugin_Timezone.$(SHAREDLL) ../../../XEngine_Release/XEngine_LibPlugin/libModulePlugin_Timezone.$(SHAREDLL)
5050

5151
CleanAll:CleanObj CleanMk
5252
CleanObj:

XEngine_Source/XEngine_PluginModule/ModulePlugin_Zodiac/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pch.o:./pch.cpp
4646

4747
InstallAll:InstallSo
4848
InstallSo:./libModulePlugin_Zodiac.$(SHAREDLL)
49-
cp ./libModulePlugin_Zodiac.$(SHAREDLL) ../../../XEngine_Release/XEngine_Plugin/libModulePlugin_Zodiac.$(SHAREDLL)
49+
cp ./libModulePlugin_Zodiac.$(SHAREDLL) ../../../XEngine_Release/XEngine_LibPlugin/libModulePlugin_Zodiac.$(SHAREDLL)
5050

5151
CleanAll:CleanObj CleanMk
5252
CleanObj:

0 commit comments

Comments
 (0)