From c331a14ce127675aa7e15277ea3204e5399d3bf5 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Sat, 17 Oct 2009 21:46:08 +0000
Subject: [PATCH] Fixed bug #852

 Jesse Anders      2009-10-17 14:17:25 PDT

In VC++, the build script that creates SDL_config.h and SDL_revision.h fails
when the project directory path includes spaces. For example, if the project
directory path is:

c:\Documents and Settings\Jesse\My Documents\Visual Studio 2008\Projects\SDL
1.3\VisualC\SDL\

The following error is generated:

'and' is not recognized as an internal or external command

Placing all paths in quotes fixes this.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404106
---
 VisualC/SDL/SDL.vcproj                | 4 ++--
 VisualC/SDL/SDL_VS2008.vcproj         | 4 ++--
 VisualC/SDLmain/SDLmain.vcproj        | 6 +++---
 VisualC/SDLmain/SDLmain_VS2008.vcproj | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/VisualC/SDL/SDL.vcproj b/VisualC/SDL/SDL.vcproj
index 26fa4ea5..5c2e4e7e 100644
--- a/VisualC/SDL/SDL.vcproj
+++ b/VisualC/SDL/SDL.vcproj
@@ -26,7 +26,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Making sure basic SDL headers are in place..."
-				CommandLine="if exist $(ProjectDir)\..\..\include\SDL_config.h goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy $(ProjectDir)\..\..\include\SDL_config_win32.h $(ProjectDir)\..\..\include\SDL_config.h&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist $(ProjectDir)\..\..\include\SDL_revision.h goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;$(ProjectDir)\..\..\include\SDL_revision.h&#x0D;&#x0A;:SDLREVISIONOKAY"
+				CommandLine="if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy "$(ProjectDir)\..\..\include\SDL_config_win32.h" "$(ProjectDir)\..\..\include\SDL_config.h"&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"&#x0D;&#x0A;:SDLREVISIONOKAY"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -125,7 +125,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Making sure basic SDL headers are in place..."
-				CommandLine="if exist $(ProjectDir)\..\..\include\SDL_config.h goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy $(ProjectDir)\..\..\include\SDL_config_win32.h $(ProjectDir)\..\..\include\SDL_config.h&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist $(ProjectDir)\..\..\include\SDL_revision.h goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;$(ProjectDir)\..\..\include\SDL_revision.h&#x0D;&#x0A;:SDLREVISIONOKAY"
+				CommandLine="if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy "$(ProjectDir)\..\..\include\SDL_config_win32.h" "$(ProjectDir)\..\..\include\SDL_config.h"&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"&#x0D;&#x0A;:SDLREVISIONOKAY"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/VisualC/SDL/SDL_VS2008.vcproj b/VisualC/SDL/SDL_VS2008.vcproj
index 0b88e0c4..fa2f859e 100644
--- a/VisualC/SDL/SDL_VS2008.vcproj
+++ b/VisualC/SDL/SDL_VS2008.vcproj
@@ -30,7 +30,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Making sure basic SDL headers are in place..."
-				CommandLine="if exist $(ProjectDir)\..\..\include\SDL_config.h goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy $(ProjectDir)\..\..\include\SDL_config_win32.h $(ProjectDir)\..\..\include\SDL_config.h&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist $(ProjectDir)\..\..\include\SDL_revision.h goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;$(ProjectDir)\..\..\include\SDL_revision.h&#x0D;&#x0A;:SDLREVISIONOKAY"
+				CommandLine="if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy "$(ProjectDir)\..\..\include\SDL_config_win32.h" "$(ProjectDir)\..\..\include\SDL_config.h"&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"&#x0D;&#x0A;:SDLREVISIONOKAY"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -201,7 +201,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Making sure basic SDL headers are in place..."
-				CommandLine="if exist $(ProjectDir)\..\..\include\SDL_config.h goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy $(ProjectDir)\..\..\include\SDL_config_win32.h $(ProjectDir)\..\..\include\SDL_config.h&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist $(ProjectDir)\..\..\include\SDL_revision.h goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;$(ProjectDir)\..\..\include\SDL_revision.h&#x0D;&#x0A;:SDLREVISIONOKAY"
+				CommandLine="if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy "$(ProjectDir)\..\..\include\SDL_config_win32.h" "$(ProjectDir)\..\..\include\SDL_config.h"&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"&#x0D;&#x0A;:SDLREVISIONOKAY"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/VisualC/SDLmain/SDLmain.vcproj b/VisualC/SDLmain/SDLmain.vcproj
index f93b73d9..5c209975 100644
--- a/VisualC/SDLmain/SDLmain.vcproj
+++ b/VisualC/SDLmain/SDLmain.vcproj
@@ -25,7 +25,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Making sure basic SDL headers are in place..."
-				CommandLine="if exist $(ProjectDir)\..\..\include\SDL_config.h goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy $(ProjectDir)\..\..\include\SDL_config_win32.h $(ProjectDir)\..\..\include\SDL_config.h&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist $(ProjectDir)\..\..\include\SDL_revision.h goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;$(ProjectDir)\..\..\include\SDL_revision.h&#x0D;&#x0A;:SDLREVISIONOKAY"
+				CommandLine="if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy "$(ProjectDir)\..\..\include\SDL_config_win32.h" "$(ProjectDir)\..\..\include\SDL_config.h"&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"&#x0D;&#x0A;:SDLREVISIONOKAY"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -98,7 +98,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Making sure basic SDL headers are in place..."
-				CommandLine="if exist $(ProjectDir)\..\..\include\SDL_config.h goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy $(ProjectDir)\..\..\include\SDL_config_win32.h $(ProjectDir)\..\..\include\SDL_config.h&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist $(ProjectDir)\..\..\include\SDL_revision.h goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;$(ProjectDir)\..\..\include\SDL_revision.h&#x0D;&#x0A;:SDLREVISIONOKAY"
+				CommandLine="if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy "$(ProjectDir)\..\..\include\SDL_config_win32.h" "$(ProjectDir)\..\..\include\SDL_config.h"&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"&#x0D;&#x0A;:SDLREVISIONOKAY"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -171,7 +171,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Making sure basic SDL headers are in place..."
-				CommandLine="if exist $(ProjectDir)\..\..\include\SDL_config.h goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy $(ProjectDir)\..\..\include\SDL_config_win32.h $(ProjectDir)\..\..\include\SDL_config.h&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist $(ProjectDir)\..\..\include\SDL_revision.h goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;$(ProjectDir)\..\..\include\SDL_revision.h&#x0D;&#x0A;:SDLREVISIONOKAY"
+				CommandLine="if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy "$(ProjectDir)\..\..\include\SDL_config_win32.h" "$(ProjectDir)\..\..\include\SDL_config.h"&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"&#x0D;&#x0A;:SDLREVISIONOKAY"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/VisualC/SDLmain/SDLmain_VS2008.vcproj b/VisualC/SDLmain/SDLmain_VS2008.vcproj
index 65c34bf3..b7186463 100644
--- a/VisualC/SDLmain/SDLmain_VS2008.vcproj
+++ b/VisualC/SDLmain/SDLmain_VS2008.vcproj
@@ -29,7 +29,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Making sure basic SDL headers are in place..."
-				CommandLine="if exist $(ProjectDir)\..\..\include\SDL_config.h goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy $(ProjectDir)\..\..\include\SDL_config_win32.h $(ProjectDir)\..\..\include\SDL_config.h&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist $(ProjectDir)\..\..\include\SDL_revision.h goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;$(ProjectDir)\..\..\include\SDL_revision.h&#x0D;&#x0A;:SDLREVISIONOKAY"
+				CommandLine="if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy "$(ProjectDir)\..\..\include\SDL_config_win32.h" "$(ProjectDir)\..\..\include\SDL_config.h"&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"&#x0D;&#x0A;:SDLREVISIONOKAY"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -166,7 +166,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Making sure basic SDL headers are in place..."
-				CommandLine="if exist $(ProjectDir)\..\..\include\SDL_config.h goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy $(ProjectDir)\..\..\include\SDL_config_win32.h $(ProjectDir)\..\..\include\SDL_config.h&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist $(ProjectDir)\..\..\include\SDL_revision.h goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;$(ProjectDir)\..\..\include\SDL_revision.h&#x0D;&#x0A;:SDLREVISIONOKAY"
+				CommandLine="if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy "$(ProjectDir)\..\..\include\SDL_config_win32.h" "$(ProjectDir)\..\..\include\SDL_config.h"&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"&#x0D;&#x0A;:SDLREVISIONOKAY"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -303,7 +303,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Making sure basic SDL headers are in place..."
-				CommandLine="if exist $(ProjectDir)\..\..\include\SDL_config.h goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy $(ProjectDir)\..\..\include\SDL_config_win32.h $(ProjectDir)\..\..\include\SDL_config.h&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist $(ProjectDir)\..\..\include\SDL_revision.h goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;$(ProjectDir)\..\..\include\SDL_revision.h&#x0D;&#x0A;:SDLREVISIONOKAY"
+				CommandLine="if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy "$(ProjectDir)\..\..\include\SDL_config_win32.h" "$(ProjectDir)\..\..\include\SDL_config.h"&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"&#x0D;&#x0A;:SDLREVISIONOKAY"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
-- 
2.18.1