diff options
| author | Mike Pall <mike> | 2013-11-21 13:47:19 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-11-21 13:47:19 +0100 |
| commit | 94bfa7cfa6eef3b9911d4f6efae6f19a4f447dd3 (patch) | |
| tree | c2497e75c5b165afecda5b1cb623bd1433d25ef4 /src | |
| parent | 9f77a31e89df037342a91cdcfeb7ccab9648eb36 (diff) | |
| parent | 751eacec7b1927c4554de94a7771503736e97e46 (diff) | |
| download | luajit-94bfa7cfa6eef3b9911d4f6efae6f19a4f447dd3.tar.gz luajit-94bfa7cfa6eef3b9911d4f6efae6f19a4f447dd3.tar.bz2 luajit-94bfa7cfa6eef3b9911d4f6efae6f19a4f447dd3.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/msvcbuild.bat | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat index 4a3c8e84..7cce8913 100644 --- a/src/msvcbuild.bat +++ b/src/msvcbuild.bat | |||
| @@ -14,10 +14,10 @@ | |||
| 14 | @if not defined INCLUDE goto :FAIL | 14 | @if not defined INCLUDE goto :FAIL |
| 15 | 15 | ||
| 16 | @setlocal | 16 | @setlocal |
| 17 | @set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE | 17 | @set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE |
| 18 | @set LJLINK=link /nologo | 18 | @set LJLINK=link /nologo |
| 19 | @set LJMT=mt /nologo | 19 | @set LJMT=mt /nologo |
| 20 | @set LJLIB=lib /nologo | 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 LJDLLNAME=lua51.dll | 23 | @set LJDLLNAME=lua51.dll |
| @@ -71,19 +71,19 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c | |||
| 71 | :NODEBUG | 71 | :NODEBUG |
| 72 | @if "%1"=="amalg" goto :AMALGDLL | 72 | @if "%1"=="amalg" goto :AMALGDLL |
| 73 | @if "%1"=="static" goto :STATIC | 73 | @if "%1"=="static" goto :STATIC |
| 74 | %LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c | 74 | %LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c |
| 75 | @if errorlevel 1 goto :BAD | 75 | @if errorlevel 1 goto :BAD |
| 76 | %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj | 76 | %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj |
| 77 | @if errorlevel 1 goto :BAD | 77 | @if errorlevel 1 goto :BAD |
| 78 | @goto :MTDLL | 78 | @goto :MTDLL |
| 79 | :STATIC | 79 | :STATIC |
| 80 | %LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c | 80 | %LJCOMPILE% lj_*.c lib_*.c |
| 81 | @if errorlevel 1 goto :BAD | 81 | @if errorlevel 1 goto :BAD |
| 82 | %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj | 82 | %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj |
| 83 | @if errorlevel 1 goto :BAD | 83 | @if errorlevel 1 goto :BAD |
| 84 | @goto :MTDLL | 84 | @goto :MTDLL |
| 85 | :AMALGDLL | 85 | :AMALGDLL |
| 86 | %LJCOMPILE% /DLUA_BUILD_AS_DLL ljamalg.c | 86 | %LJCOMPILE% /MD /DLUA_BUILD_AS_DLL ljamalg.c |
| 87 | @if errorlevel 1 goto :BAD | 87 | @if errorlevel 1 goto :BAD |
| 88 | %LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj | 88 | %LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj |
| 89 | @if errorlevel 1 goto :BAD | 89 | @if errorlevel 1 goto :BAD |