gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-04-19 21:43:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Apply msys2 patches

Browse Source
This commit is contained in:
Stephen Just 2023-02-19 22:08:47 -08:00
parent d0e88930dd
commit 1b11e65813
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/luajit.pc
View File

@ -21,5 +21,5 @@ URL: https://luajit.org
Version: ${version} Version: ${version}
Requires: Requires:
Libs: -L${libdir} -l${libname} Libs: -L${libdir} -l${libname}
Libs.private: -Wl,-E -lm -ldl Libs.private: -lm -liconv
Cflags: -I${includedir} Cflags: -I${includedir}

10
src/Makefile
View File

@ -24,7 +24,7 @@ NODOTABIVER= 51
# removing the '#' in front of them. Make sure you force a full recompile # removing the '#' in front of them. Make sure you force a full recompile
# with "make clean", followed by "make" if you change any options. # with "make clean", followed by "make" if you change any options.
# #
DEFAULT_CC = gcc DEFAULT_CC = cc
# #
# LuaJIT builds as a native 32 or 64 bit binary by default. # LuaJIT builds as a native 32 or 64 bit binary by default.
CC= $(DEFAULT_CC) CC= $(DEFAULT_CC)
@ -527,6 +527,7 @@ ALL_RM= $(ALL_T) $(ALL_GEN) *.o host/*.o $(WIN_RM)
# Mixed mode defaults. # Mixed mode defaults.
TARGET_O= $(LUAJIT_A) TARGET_O= $(LUAJIT_A)
TARGET_LO= $(TARGET_O)
TARGET_T= $(LUAJIT_T) $(LUAJIT_SO) TARGET_T= $(LUAJIT_T) $(LUAJIT_SO)
TARGET_DEP= $(LIB_VMDEF) $(LUAJIT_SO) TARGET_DEP= $(LIB_VMDEF) $(LUAJIT_SO)
@ -583,6 +584,11 @@ ifeq (dynamic,$(BUILDMODE))
TARGET_DYNCC= @: TARGET_DYNCC= @:
LJVMCORE_DYNO= $(LJVMCORE_O) LJVMCORE_DYNO= $(LJVMCORE_O)
TARGET_O= $(LUAJIT_SO) TARGET_O= $(LUAJIT_SO)
ifeq (Windows,$(TARGET_SYS))
TARGET_LO= libluajit-${ABIVER}.dll.a
else
TARGET_LO= $(TARGET_O)
endif
TARGET_XLDFLAGS+= $(TARGET_DYNXLDOPTS) TARGET_XLDFLAGS+= $(TARGET_DYNXLDOPTS)
else else
ifeq (Darwin,$(TARGET_SYS)) ifeq (Darwin,$(TARGET_SYS))
@ -719,7 +725,7 @@ $(LUAJIT_SO): $(LJVMCORE_O)
$(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP) $(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP)
$(E) "LINK $@" $(E) "LINK $@"
$(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) $(TARGET_O) $(TARGET_ALIBS) $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) $(TARGET_LO) $(TARGET_ALIBS)
$(Q)$(TARGET_STRIP) $@ $(Q)$(TARGET_STRIP) $@
$(E) "OK Successfully built LuaJIT" $(E) "OK Successfully built LuaJIT"

16
src/luaconf.h
View File

@ -18,12 +18,20 @@
** In Windows, any exclamation mark ('!') in the path is replaced by the ** In Windows, any exclamation mark ('!') in the path is replaced by the
** path of the directory of the executable file of the current process. ** path of the directory of the executable file of the current process.
*/ */
#define LUA_LDIR "!\\lua\\"
#define LUA_CDIR "!\\" /* Paths for modules expecting non-jit lua5.1 */
#define LUA_LDIR "!\\..\\share\\lua\\5.1\\"
#define LUA_CDIR "!\\..\\lib\\lua\\5.1\\"
#define LUAJIT_LDIR "!\\lua\\"
#define LUAJIT_CDIR "!\\"
#define LUA_PATH_DEFAULT \ #define LUA_PATH_DEFAULT \
".\\?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;" ".\\?.lua;" LUAJIT_LDIR"?.lua;" LUAJIT_LDIR"?\\init.lua;" \
LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;" \
LUA_CDIR"?.lua;" LUA_CDIR"?\\init.lua"
#define LUA_CPATH_DEFAULT \ #define LUA_CPATH_DEFAULT \
".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" ".\\?.dll;" LUAJIT_CDIR"?.dll;" LUA_CDIR"?.dll;" LUAJIT_CDIR"loadall.dll"
#else #else
/* /*
** Note to distribution maintainers: do NOT patch the following lines! ** Note to distribution maintainers: do NOT patch the following lines!