Skip to content

Commit 99dcaba

Browse files
committed
v210.5.9+04dca79
1 parent b8bb93a commit 99dcaba

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

.cargo/config .cargo/config.toml

File renamed without changes.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "luajit-src"
3-
version = "210.5.8+5790d25"
3+
version = "210.5.9+04dca79"
44
authors = ["Aleksandr Orlenko <[email protected]>"]
55
edition = "2021"
66
repository = "https://github.com/khvzak/luajit-src-rs"

extras/msvcbuild.bat

+14-8
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,15 @@
1414
@if not defined INCLUDE goto :FAIL
1515

1616
@setlocal
17-
@rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_APICHECK
17+
@rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_ASSERT
1818
@set DEBUGCFLAGS=
1919
@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline
20+
@set LJDYNBUILD=/DLUA_BUILD_AS_DLL /MD
21+
@set LJDYNBUILD_DEBUG=/DLUA_BUILD_AS_DLL /MDd
22+
@set LJCOMPILETARGET=/Zi
23+
@set LJLINKTYPE=/DEBUG /RELEASE
24+
@set LJLINKTYPE_DEBUG=/DEBUG
25+
@set LJLINKTARGET=/OPT:REF /OPT:ICF /INCREMENTAL:NO
2026
@set LJLINK=link /nologo
2127
@set LJMT=mt /nologo
2228
@set LJLIB=lib /nologo /nodefaultlib
@@ -25,7 +31,6 @@
2531
@set DASC=vm_x64.dasc
2632
@set LJDLLNAME=lua51.dll
2733
@set LJLIBNAME=lua51.lib
28-
@set BUILDTYPE=release
2934
@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
3035

3136
@setlocal
@@ -97,14 +102,15 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
97102

98103
@if "%1" neq "debug" goto :NODEBUG
99104
@shift
100-
@set BUILDTYPE=debug
101-
@set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS%
102-
@set LJLINK=%LJLINK% /opt:ref /opt:icf /incremental:no
105+
@set LJCOMPILE=%LJCOMPILE% %DEBUGCFLAGS%
106+
@set LJDYNBUILD=%LJDYNBUILD_DEBUG%
107+
@set LJLINKTYPE=%LJLINKTYPE_DEBUG%
103108
:NODEBUG
104-
@set LJLINK=%LJLINK% /%BUILDTYPE%
109+
@set LJCOMPILE=%LJCOMPILE% %LJCOMPILETARGET%
110+
@set LJLINK=%LJLINK% %LJLINKTYPE% %LJLINKTARGET%
105111
@if "%1"=="amalg" goto :AMALGDLL
106112
@if "%1"=="static" goto :STATIC
107-
%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
113+
%LJCOMPILE% %LJDYNBUILD% lj_*.c lib_*.c
108114
@if errorlevel 1 goto :BAD
109115
%LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj
110116
@if errorlevel 1 goto :BAD
@@ -116,7 +122,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
116122
@if errorlevel 1 goto :BAD
117123
@goto :MTDLL
118124
:AMALGDLL
119-
%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL ljamalg.c
125+
%LJCOMPILE% %LJDYNBUILD% ljamalg.c
120126
@if errorlevel 1 goto :BAD
121127
%LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj
122128
@if errorlevel 1 goto :BAD

0 commit comments

Comments
 (0)