From eb339956ee90792f1eb5200ee6cda1416de1cf9c Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Tue, 3 May 2011 10:20:50 +0000 Subject: [PATCH] - remove 7z.exe from svn and make of the build script for windows --- mk/windoze/CopyWindowsRuntimeDlls.bat | 2 +- mk/windoze/build-mg.bat | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mk/windoze/CopyWindowsRuntimeDlls.bat b/mk/windoze/CopyWindowsRuntimeDlls.bat index 7ff89fda..592f4418 100644 --- a/mk/windoze/CopyWindowsRuntimeDlls.bat +++ b/mk/windoze/CopyWindowsRuntimeDlls.bat @@ -3,4 +3,4 @@ rem if not exist ..\..\data\glest_game\dsound.dll copy dsound.dll ..\..\data\glest_game\ if not exist ..\..\data\glest_game\xerces-c_3_0.dll copy ..\..\source\win32_deps\bin\xerces-c_3_0.dll ..\..\data\glest_game\ -pause +if not "%1" == "nopause" pause diff --git a/mk/windoze/build-mg.bat b/mk/windoze/build-mg.bat index ac465a81..64eedfb2 100644 --- a/mk/windoze/build-mg.bat +++ b/mk/windoze/build-mg.bat @@ -5,6 +5,10 @@ ECHO -------------------------------- ECHO Changing to build folder [%~dp0] cd /d "%~dp0" +ECHO Checking for windows binary runtime tools... +if NOT EXIST "..\..\data\glest_game\7z.exe" cscript getTools.vbs +call CopyWindowsRuntimeDlls.bat nopause + rem setup the Visual Studio 2008 environment ECHO -------------------------------- ECHO Setting up Visual Studio 2008 environment vars...