diff options
author | Mike Pall <mike> | 2017-01-17 12:21:12 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2017-01-17 12:21:12 +0100 |
commit | c94b921f924c1b37fea52e34f4e01ba8b37d77d0 (patch) | |
tree | b02593a07489fe04092ecc03a1e7d30c2a36af90 /src | |
parent | c1981676907cedde9ffe2bbdfb28d2f786ff69d9 (diff) | |
download | luajit-c94b921f924c1b37fea52e34f4e01ba8b37d77d0.tar.gz luajit-c94b921f924c1b37fea52e34f4e01ba8b37d77d0.tar.bz2 luajit-c94b921f924c1b37fea52e34f4e01ba8b37d77d0.zip |
LJ_GC64: Add build options and install instructions.
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile | 3 | ||||
-rw-r--r-- | src/msvcbuild.bat | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index 4e479ae5..21e16a22 100644 --- a/src/Makefile +++ b/src/Makefile | |||
@@ -110,6 +110,9 @@ XCFLAGS= | |||
110 | #XCFLAGS+= -DLUAJIT_NUMMODE=1 | 110 | #XCFLAGS+= -DLUAJIT_NUMMODE=1 |
111 | #XCFLAGS+= -DLUAJIT_NUMMODE=2 | 111 | #XCFLAGS+= -DLUAJIT_NUMMODE=2 |
112 | # | 112 | # |
113 | # Enable GC64 mode for x64. | ||
114 | #XCFLAGS+= -DLUAJIT_ENABLE_GC64 | ||
115 | # | ||
113 | ############################################################################## | 116 | ############################################################################## |
114 | 117 | ||
115 | ############################################################################## | 118 | ############################################################################## |
diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat index 4334bbde..f7a1addc 100644 --- a/src/msvcbuild.bat +++ b/src/msvcbuild.bat | |||
@@ -20,6 +20,7 @@ | |||
20 | @set LJLIB=lib /nologo /nodefaultlib | 20 | @set LJLIB=lib /nologo /nodefaultlib |
21 | @set DASMDIR=..\dynasm | 21 | @set DASMDIR=..\dynasm |
22 | @set DASM=%DASMDIR%\dynasm.lua | 22 | @set DASM=%DASMDIR%\dynasm.lua |
23 | @set DASC=vm_x86.dasc | ||
23 | @set LJDLLNAME=lua51.dll | 24 | @set LJDLLNAME=lua51.dll |
24 | @set LJLIBNAME=lua51.lib | 25 | @set LJLIBNAME=lua51.lib |
25 | @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 | 26 | @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 |
@@ -39,7 +40,12 @@ if exist minilua.exe.manifest^ | |||
39 | @set LJARCH=x86 | 40 | @set LJARCH=x86 |
40 | @set LJCOMPILE=%LJCOMPILE% /arch:SSE2 | 41 | @set LJCOMPILE=%LJCOMPILE% /arch:SSE2 |
41 | :X64 | 42 | :X64 |
42 | minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x86.dasc | 43 | @if "%1" neq "gc64" goto :NOGC64 |
44 | @shift | ||
45 | @set DASC=vm_x64.dasc | ||
46 | @set LJCOMPILE=%LJCOMPILE% /DLUAJIT_ENABLE_GC64 | ||
47 | :NOGC64 | ||
48 | minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC% | ||
43 | @if errorlevel 1 goto :BAD | 49 | @if errorlevel 1 goto :BAD |
44 | 50 | ||
45 | %LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c | 51 | %LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c |