aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2013-11-21 13:47:07 +0100
committerMike Pall <mike>2013-11-21 13:47:07 +0100
commit751eacec7b1927c4554de94a7771503736e97e46 (patch)
treef2b96b4ad96edadaeb83d6064f3d70ecf58b2851
parentdb64b2b1edbb07055d450df168c360fedb5598a7 (diff)
downloadluajit-751eacec7b1927c4554de94a7771503736e97e46.tar.gz
luajit-751eacec7b1927c4554de94a7771503736e97e46.tar.bz2
luajit-751eacec7b1927c4554de94a7771503736e97e46.zip
Improve msvcbuild.bat static linking.
-rw-r--r--src/msvcbuild.bat10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
index cdb42a8d..9290c53e 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
@@ -70,19 +70,19 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
70:NODEBUG 70:NODEBUG
71@if "%1"=="amalg" goto :AMALGDLL 71@if "%1"=="amalg" goto :AMALGDLL
72@if "%1"=="static" goto :STATIC 72@if "%1"=="static" goto :STATIC
73%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c 73%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
74@if errorlevel 1 goto :BAD 74@if errorlevel 1 goto :BAD
75%LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj 75%LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj
76@if errorlevel 1 goto :BAD 76@if errorlevel 1 goto :BAD
77@goto :MTDLL 77@goto :MTDLL
78:STATIC 78:STATIC
79%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c 79%LJCOMPILE% lj_*.c lib_*.c
80@if errorlevel 1 goto :BAD 80@if errorlevel 1 goto :BAD
81%LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj 81%LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj
82@if errorlevel 1 goto :BAD 82@if errorlevel 1 goto :BAD
83@goto :MTDLL 83@goto :MTDLL
84:AMALGDLL 84:AMALGDLL
85%LJCOMPILE% /DLUA_BUILD_AS_DLL ljamalg.c 85%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL ljamalg.c
86@if errorlevel 1 goto :BAD 86@if errorlevel 1 goto :BAD
87%LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj 87%LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj
88@if errorlevel 1 goto :BAD 88@if errorlevel 1 goto :BAD