Skip to content

Commit a60d4d5

Browse files
committed
Restore luajit compile flags
Signed-off-by: Anuraag Agrawal <anuraaga@gmail.com>
1 parent 95bb385 commit a60d4d5

1 file changed

Lines changed: 21 additions & 2 deletions

File tree

bazel/foreign_cc/luajit_win.patch

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
diff --git a/luajit_build_win.sh b/luajit_build_win.sh
22
new file mode 100755
3-
index 00000000..a493e7e0
3+
index 00000000..c6267893
44
--- /dev/null
55
+++ b/luajit_build_win.sh
66
@@ -0,0 +1,38 @@
@@ -35,10 +35,29 @@ index 00000000..a493e7e0
3535
+./msvcbuild.bat static
3636
+
3737
+mkdir -p "$PREFIX/lib"
38-
+cp lua51.lib vc140.pdb "$PREFIX/lib"
38+
+cp lua51.lib "$PREFIX/lib"
3939
+mkdir -p "$PREFIX/include/luajit-2.1"
4040
+for header in lauxlib.h luaconf.h lua.h lua.hpp luajit.h lualib.h; do
4141
+ cp "$header" "$PREFIX/include/luajit-2.1"
4242
+done
4343
+mkdir -p "$PREFIX/bin"
4444
+cp luajit.exe "$PREFIX/bin"
45+
diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
46+
index d6aed170..42604601 100644
47+
--- a/src/msvcbuild.bat
48+
+++ b/src/msvcbuild.bat
49+
@@ -18,9 +18,11 @@
50+
@rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_ASSERT
51+
@set DEBUGCFLAGS=
52+
@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline
53+
-@set LJDYNBUILD=/DLUA_BUILD_AS_DLL /MD
54+
-@set LJDYNBUILD_DEBUG=/DLUA_BUILD_AS_DLL /MDd
55+
-@set LJCOMPILETARGET=/Zi
56+
+@rem Use MT to match flags set by bazel for static build
57+
+@set LJDYNBUILD=/DLUA_BUILD_AS_DLL /MT
58+
+@set LJDYNBUILD_DEBUG=/DLUA_BUILD_AS_DLL /MTd
59+
+@rem Avoid incremental link which doesn't work with bazel's deletion of intermediate files
60+
+@set LJCOMPILETARGET=/Z7
61+
@set LJLINKTYPE=/DEBUG /RELEASE
62+
@set LJLINKTYPE_DEBUG=/DEBUG
63+
@set LJLINKTARGET=/OPT:REF /OPT:ICF /INCREMENTAL:NO

0 commit comments

Comments
 (0)