summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <jan.nijtmans@noemail.net>2012-08-28 15:11:30 (GMT)
committerjan.nijtmans <jan.nijtmans@noemail.net>2012-08-28 15:11:30 (GMT)
commit711856464a5277caa1f40e3af939739bd65e7dc4 (patch)
tree6fc28d7464a658b044262fa966d2605797fe26b4
parent4445ffae4e0df3b8573e785c2d100e0ac0f113f2 (diff)
downloadtk-711856464a5277caa1f40e3af939739bd65e7dc4.zip
tk-711856464a5277caa1f40e3af939739bd65e7dc4.tar.gz
tk-711856464a5277caa1f40e3af939739bd65e7dc4.tar.bz2
re-do [c42d04b1b4], but now correct ;-(
FossilOrigin-Name: e0024bbbbb2e60d41e8ff59d05ef353c8b3e2371
-rwxr-xr-xwin/buildall.vc.bat25
1 files changed, 2 insertions, 23 deletions
diff --git a/win/buildall.vc.bat b/win/buildall.vc.bat
index 3ebba7e..162490e 100755
--- a/win/buildall.vc.bat
+++ b/win/buildall.vc.bat
@@ -68,31 +68,10 @@ if not %SYMBOLS%.==. set OPTS=symbols
nmake -nologo -f makefile.vc release htmlhelp OPTS=%OPTS% %1
if errorlevel 1 goto error
-:: Build the static core, dlls and shell.
-::
-set OPTS=static
-if not %SYMBOLS%.==. set OPTS=symbols,static
-nmake -nologo -f makefile.vc release OPTS=%OPTS% %1
-if errorlevel 1 goto error
-
-:: Build the special static libraries that use the dynamic runtime.
+:: Build the static core and shell.
::
set OPTS=static,msvcrt
if not %SYMBOLS%.==. set OPTS=symbols,static,msvcrt
-nmake -nologo -f makefile.vc core OPTS=%OPTS% %1
-if errorlevel 1 goto error
-
-:: Build the core and shell for thread support.
-::
-set OPTS=threads
-if not %SYMBOLS%.==. set OPTS=symbols,threads
-nmake -nologo -f makefile.vc release OPTS=%OPTS% %1
-if errorlevel 1 goto error
-
-:: Build the static core and shell.
-::
-set OPTS=static,msvcrt,threads
-if not %SYMBOLS%.==. set OPTS=symbols,static,msvcrt,threads
nmake -nologo -f makefile.vc shell OPTS=%OPTS% %1
if errorlevel 1 goto error
@@ -114,7 +93,7 @@ echo usage:
echo %0 : builds Tk for all build types (do this first)
echo %0 install : installs all the release builds (do this second)
echo %0 symbols : builds Tk for all debugging build types
-echo %0 symbols install : install all the debug builds
+echo %0 symbols install : install all the debug builds.
echo.
goto out