[AD] msvc spaces

[Elias Pschernig <elias@xxxxxxxxxx>]

I was in windows today and downloaded the free MSVC command line tools
to try and compile allegro with it (to eventually track down that race
condition bug AJ was having). The first problem I hit was, it installed
into a patch with spaces. The attached patch was a quick hack to fix
this (it may break other things though).

And I'm wondering, were we always forcing regular MSVC users to install
into a path with no spaces? There seems to be no more way in winXP to
find out that DOS-path without spaces name of a dir, as mentioned in the
error message - so hopefully this patch fixes that as well.

(And about compiling allegro with the free cl.exe.. after fixing the
spaces issue, it compiled some files until I discovered that it doesn't
come with windows.h, and it chokes on the windows.h in mingw, so no
success.)

-- 
Elias Pschernig

Index: makefile.vc
===================================================================
RCS file: /cvsroot/alleg/allegro/makefile.vc,v
retrieving revision 1.60
diff -u -r1.60 makefile.vc
--- makefile.vc	23 Nov 2004 16:24:47 -0000	1.60
+++ makefile.vc	26 Nov 2004 20:40:41 -0000
@@ -63,7 +63,7 @@
 
 # -------- check that environment path variables are set --------
 
-.PHONY: badwin badmsvc badspaces
+.PHONY: badwin badmsvc
 
 ifeq ($(OS),Windows_NT)
    WINSYSDIR = $(SYSTEMROOT)
@@ -87,13 +87,20 @@
 	@echo Your SYSTEMROOT or windir environment variable is not set!
 endif
 
+NULLSTRING :=
+SPACE := $(NULLSTRING) # special magic to get an isolated space character
+
+ifdef MSVCDir
+   ifndef MSVCDIR
+      MSVCDIR=$(MSVCDir)
+   endif
+endif
+
 ifdef MSVCDIR
    MSVCDIR_U = $(subst \,/,$(MSVCDIR))
    MSVCDIR_D = $(subst /,\,$(MSVCDIR))
-else
-ifdef MSVCDir
-   MSVCDIR_U = $(subst \,/,$(MSVCDir))
-   MSVCDIR_D = $(subst /,\,$(MSVCDir))
+   MSVCDIR_U := $(subst $(SPACE),\$(SPACE),$(MSVCDIR_U))
+   MSVCDIR_D := $(subst $(SPACE),\$(SPACE),$(MSVCDIR_D))
 else
 badmsvc:
 	@echo Your MSVCDIR environment variable is not set!
@@ -101,25 +108,6 @@
 endif
 endif
 
-NULLSTRING :=
-SPACE := $(NULLSTRING) # special magic to get an isolated space character
-
-ifneq ($(findstring $(SPACE),$(MSVCDIR)),)
-badspaces:
-	@echo There are spaces in your MSVCDIR environment variable:
-	@echo please change it to the 8.3 short filename version,
-	@echo or move your compiler to a different directory.
-endif
-
-ifneq ($(findstring $(SPACE),$(MSVCDir)),)
-badspaces:
-	@echo There are spaces in your MSVCDir environment variable:
-	@echo please change it to the 8.3 short filename version,
-	@echo or move your compiler to a different directory.
-endif
-
-
-
 # -------- give a sensible default target for make without any args --------
 
 .PHONY: _default
Index: makefile.all
===================================================================
RCS file: /cvsroot/alleg/allegro/makefile.all,v
retrieving revision 1.48
diff -u -r1.48 makefile.all
--- makefile.all	16 Oct 2004 21:05:33 -0000	1.48
+++ makefile.all	26 Nov 2004 20:40:42 -0000
@@ -280,9 +280,13 @@
 	$(MKDIRS)
 endif
 
+NULLSTRING :=
+SPACE := $(NULLSTRING) # special magic to get an isolated space character
 
 INSTALLDIR_U = $(subst \,/,$(INSTALLDIR))
+INSTALLDIR_U := $(subst $(SPACE),\$(SPACE),$(INSTALLDIR_U))
 INSTALLDIR_D = $(subst /,\,$(INSTALLDIR))
+INSTALLDIR_D := $(subst $(SPACE),\$(SPACE),$(INSTALLDIR_D))
 
 LIBDIR_U = $(subst \,/,$(LIBDIR))
 LIBDIR_D = $(subst /,\,$(LIBDIR))