diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-08-27 17:47:58 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-08-27 17:47:58 (GMT) |
| commit | bd27ced6025b5ce285080806ecd44c8b9bc1786a (patch) | |
| tree | 0d93a7825c9a4a4c08c720eab194f8b7788a2f10 | |
| parent | e4c7ef5bdf6375e1860418b1ec92c07f88660cc8 (diff) | |
| download | tk-bd27ced6025b5ce285080806ecd44c8b9bc1786a.zip tk-bd27ced6025b5ce285080806ecd44c8b9bc1786a.tar.gz tk-bd27ced6025b5ce285080806ecd44c8b9bc1786a.tar.bz2 | |
Remove accidental commit of merge conflict, resolved to original code.
| -rwxr-xr-x | win/buildall.vc.bat | 25 |
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 |