300324d453
Manually rebase @mingwandroid's patches against this version, plus my own patch to link the import library rather than the DLL, for LLD support.
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
--- lua-5.4.2/src/Makefile.orig 2021-03-14 15:42:23.960106400 -0700
|
|
+++ lua-5.4.2/src/Makefile 2021-03-14 15:45:16.163223400 -0700
|
|
@@ -23,6 +23,7 @@
|
|
PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
|
|
|
|
LUA_A= liblua5.1.a
|
|
+LUA_LA= liblua5.1.a
|
|
CORE_O= lapi.o lcode.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 ltm.o \
|
|
lundump.o lvm.o lzio.o iscygpty.o
|
|
@@ -52,10 +53,10 @@
|
|
$(RANLIB) $@
|
|
|
|
$(LUA_T): $(LUA_O) $(LUA_A)
|
|
- $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
|
|
+ $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_LA) $(LIBS)
|
|
|
|
$(LUAC_T): $(LUAC_O) $(LUA_A)
|
|
- $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
|
|
+ $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_LA) $(LIBS)
|
|
|
|
clean:
|
|
$(RM) $(ALL_T) $(ALL_O)
|
|
@@ -104,7 +105,7 @@
|
|
# $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
|
|
|
|
mingw:
|
|
- $(MAKE) "LUA_A=lua51.dll" "LUA_T=lua5.1.exe" \
|
|
+ $(MAKE) "LUA_A=lua51.dll" "LUA_LA=liblua5.1.dll.a" "LUA_T=lua5.1.exe" \
|
|
"AR=$(CC) -shared -Wl,--out-implib,liblua5.1.dll.a -o" "RANLIB=strip --strip-unneeded" \
|
|
"MYCFLAGS=-DLUA_BUILD_AS_DLL" "MYLIBS=" "MYLDFLAGS=-s" lua5.1.exe
|
|
$(MAKE) "LUAC_T=luac5.1.exe" luac5.1.exe
|