summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2012-08-27 17:50:17 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2012-08-27 17:50:17 (GMT)
commitef65c6ff80f269b8e94aa1ff98e76831b93c4550 (patch)
tree7b357cc0c8b6d12e5fb6e285bbba68208a87ef77 /win
parentcbc322379f8ec1ff728d196347312e8441a3a154 (diff)
parentbd27ced6025b5ce285080806ecd44c8b9bc1786a (diff)
downloadtk-ef65c6ff80f269b8e94aa1ff98e76831b93c4550.zip
tk-ef65c6ff80f269b8e94aa1ff98e76831b93c4550.tar.gz
tk-ef65c6ff80f269b8e94aa1ff98e76831b93c4550.tar.bz2
merge trunktk_errorcodes
Diffstat (limited to 'win')
-rwxr-xr-xwin/buildall.vc.bat25
1 files changed, 0 insertions, 25 deletions
diff --git a/win/buildall.vc.bat b/win/buildall.vc.bat
index 1400dbb..3ebba7e 100755
--- a/win/buildall.vc.bat
+++ b/win/buildall.vc.bat
@@ -63,7 +63,6 @@ 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
@@ -85,30 +84,6 @@ if errorlevel 1 goto error
:: Build the core and shell for thread support.
::
-======= 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 the special static libraries that use the dynamic runtime.
-::
-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.
-::
-======= 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