dany/antd-lua-plugin
1
0
Fork 0
mirror of https://github.com/lxsang/antd-lua-plugin synced 2025-07-26 02:39:46 +02:00
Code Issues Projects Releases Wiki Activity

fix ld conflict

Browse Source
This commit is contained in:
lxsang
2020-01-01 21:17:46 +01:00
parent f7599cd935
commit 2f026c3273
5 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
3rd/Makefile.am
View File

@ -1,7 +1,7 @@
EXTRA_DIST = lua-5.3.4/*.c lua-5.3.4/*.h lua-5.3.4/Makefile
all:
cd lua-5.3.4 && make linux
cd $(top_srcdir)/3rd/lua-5.3.4 && make linux
clean-local:
cd lua-5.3.4 && make clean
cd $(top_srcdir)/3rd/lua-5.3.4 && make clean

9
3rd/lua-5.3.4/Makefile
View File

@ -27,7 +27,7 @@ MYOBJS=
# == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
LUA_SO = core.so
LUA_A= liblua.a
CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
@ -43,8 +43,8 @@ LUAC_T= luac
LUAC_O= luac.o
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
ALL_A= $(LUA_A)
ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
ALL_A= $(LUA_A) $(LUA_SO)
# Targets start here.
default: $(PLAT)
@ -59,6 +59,9 @@ $(LUA_A): $(BASE_O)
$(AR) $@ $(BASE_O)
$(RANLIB) $@
$(LUA_SO): $(BASE_O)
gcc -shared $(BASE_O) -o $@
$(LUA_T): $(LUA_O) $(LUA_A)
$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)