From cf53540438562aed56bb0e9f9877f0437512f897 Mon Sep 17 00:00:00 2001 From: Tom Reynolds Date: Sun, 16 Mar 2014 06:13:31 +0100 Subject: [PATCH] Windows: delete Release\*.tlog before building --- data/glest_game | 2 +- mk/windoze/build-mg-2010.bat | 6 ++++-- mk/windoze/build-mg-2012.bat | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/data/glest_game b/data/glest_game index 368b27fa..cfb41238 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit 368b27fa59f1b5804b4f166168f0f6645ce5fe8d +Subproject commit cfb41238ad446318b6dda34adba700194a5037c6 diff --git a/mk/windoze/build-mg-2010.bat b/mk/windoze/build-mg-2010.bat index 6598f76e..1ad686cb 100644 --- a/mk/windoze/build-mg-2010.bat +++ b/mk/windoze/build-mg-2010.bat @@ -93,16 +93,18 @@ copy /b ..\..\source\glest_game\facilities\game_util.cpp +,, rem Build Mega-Glest in release mode ECHO -------------------------------- -Echo Building Mega-Glest using Visual Studio 2010... +Echo Building MegaGlest using Visual Studio 2010... set CL= del ..\..\source\glest_game\facilities\gitversion.h if not "%GITVERSION_SHA1%" == "." set CL=/DGITVERSIONHEADER -if not "%GITVERSION_SHA1%" == "." echo building with CL [%CL%] +if not "%GITVERSION_SHA1%" == "." echo building with CL [%CL%] if not "%GITVERSION_SHA1%" == "." echo #define GITVERSION "%GITVERSION_REV%.%GITVERSION_SHA1%" > ..\..\source\glest_game\facilities\gitversion.h if not "%GITVERSION_SHA1%" == "." copy /b ..\..\source\glest_game\facilities\game_util.cpp +,, +del Release\*.tlog + set msBuildMaxCPU= SET BuildInParallel=false SET BuildInParallelCount= diff --git a/mk/windoze/build-mg-2012.bat b/mk/windoze/build-mg-2012.bat index 38508717..eec4d4f6 100644 --- a/mk/windoze/build-mg-2012.bat +++ b/mk/windoze/build-mg-2012.bat @@ -117,7 +117,7 @@ copy /b ..\..\source\glest_game\facilities\game_util.cpp +,, rem Build Mega-Glest in release mode ECHO -------------------------------- -Echo Building Mega-Glest using Visual Studio 2012... +Echo Building MegaGlest using Visual Studio 2012... set CL=/MP rem set INCLUDE=%ProgramFiles(x86)%\Microsoft SDKs\Windows\7.1A\Include;%INCLUDE% @@ -138,10 +138,12 @@ rem set PlatformToolset=V110 del ..\..\source\glest_game\facilities\gitversion.h if not "%GITVERSION_SHA1%" == "." set CL=/DGITVERSIONHEADER -if not "%GITVERSION_SHA1%" == "." echo building with CL [%CL%] +if not "%GITVERSION_SHA1%" == "." echo building with CL [%CL%] if not "%GITVERSION_SHA1%" == "." echo #define GITVERSION "%GITVERSION_REV%.%GITVERSION_SHA1%" > ..\..\source\glest_game\facilities\gitversion.h if not "%GITVERSION_SHA1%" == "." copy /b ..\..\source\glest_game\facilities\game_util.cpp +,, +del Release\*.tlog + rem set VisualStudioVersion=11.0 set msBuildMaxCPU= SET BuildInParallel=false