Only build the threaded builds by default.

For msvcrt static builds, allow to link against libraries where the 'x' is missing (generated by Makefile.in)

1 files changed, 48 insertions, 21 deletions

diff --git a/win/buildall.vc.bat b/win/buildall.vc.bat
index 58360b9..1400dbb 100755
--- a/win/buildall.vc.bat
+++ b/win/buildall.vc.bat
@@ -23,18 +23,27 @@ goto OPTIONS_DONE
 :: reset errorlevel
 cd > nul
 
+:: You might have installed your developer studio to add itself to the
+:: path or have already run vcvars32.bat.  Testing these envars proves
+:: cl.exe and friends are in your path.
+::
+if defined VCINSTALLDIR  (goto :startBuilding)
+if defined MSDEVDIR      (goto :startBuilding)
+if defined MSVCDIR       (goto :startBuilding)
+if defined MSSDK         (goto :startBuilding)
+if defined WINDOWSSDKDIR (goto :startBuilding)
+
 :: We need to run the development environment batch script that comes
-:: with developer studio (v4,5,6,7,etc...)  All have it.  These paths
-:: might not be correct.  You may need to edit these.
+:: with developer studio (v4,5,6,7,etc...)  All have it.  This path
+:: might not be correct.  You should call it yourself prior to running
+:: this batchfile.
 ::
-if not defined MSDevDir (
-    call "C:\Program Files\Microsoft Developer Studio\vc98\bin\vcvars32.bat"
-    ::call "C:\Program Files\Microsoft Developer Studio\vc\bin\vcvars32.bat"
-    ::call c:\dev\devstudio60\vc98\bin\vcvars32.bat
-    if errorlevel 1 goto no_vcvars
-)
+call "C:\Program Files\Microsoft Developer Studio\vc98\bin\vcvars32.bat"
+if errorlevel 1 (goto no_vcvars)
 
+:startBuilding
 
+echo.
 echo Sit back and have a cup of coffee while this grinds through ;)
 echo You asked for *everything*, remember?
 echo.
@@ -54,6 +63,7 @@ if "%TCLDIR%" == "" set TCLDIR=..\..\tcl
 
 :: Build the normal stuff along with the help file.
 ::
+<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
 set OPTS=none
 if not %SYMBOLS%.==. set OPTS=symbols
 nmake -nologo -f makefile.vc release htmlhelp OPTS=%OPTS% %1
@@ -75,26 +85,43 @@ if errorlevel 1 goto error
 
 :: Build the core and shell for thread support.
 ::
-set OPTS=threads
-if not %SYMBOLS%.==. set OPTS=symbols,threads
+======= COMMON ANCESTOR content follows ============================
+set OPTS=none
+if not %SYMBOLS%.==. set OPTS=symbols
+nmake -nologo -f makefile.vc release winhelp 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 a static, thread support core library (no shell).
+:: Build the special static libraries that use the dynamic runtime.
 ::
-set OPTS=static,threads
-if not %SYMBOLS%.==. set OPTS=symbols,static,threads
+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 special static libraries the use the dynamic runtime,
-:: but now with thread support.
+:: Build the core and shell for thread support.
+::
+======= MERGED IN content follows ==================================
+>>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+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 core OPTS=%OPTS% %1
+nmake -nologo -f makefile.vc shell OPTS=%OPTS% %1
 if errorlevel 1 goto error
 
+set OPTS=
 set SYMBOLS=
 goto end
 
@@ -103,16 +130,16 @@ echo *** BOOM! ***
 goto end
 
 :no_vcvars
-echo vcvars32.bat not found.  You'll need to edit this batch script.
+echo vcvars32.bat was not run prior to this batchfile, nor are the MS tools in your path.
 goto out
 
 :help
 title buildall.vc.bat help message
 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                 : 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.
 goto out