fixed makefile generator for windows platforms

ooc-lang · Sep 8, 2010 · acfcda4 · acfcda4
1 parent 2620576
commit acfcda4
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/source/rock/frontend/drivers/MakeDriver.ooc b/source/rock/frontend/drivers/MakeDriver.ooc
@@ -68,25 +68,31 @@ MakeDriver: class extends SequenceDriver {
         fW write("CC=%s\n" format(params compiler executablePath toCString()))
 
         fW write("# try to determine the OS and architecture\n")
-        fW write("OS := $(shell uname -s)\n")
+        fW write("MYOS := $(shell uname -s)\n")
         fW write("MACHINE := $(shell uname -m)\n")
-        fW write("ifeq ($(OS), Linux)\n")
+        fW write("ifeq ($(MYOS), Linux)\n")
         fW write("    ARCH=linux\n")
-        fW write("else ifeq ($(OS), Darwin)\n")
+        fW write("else ifeq ($(MYOS), Darwin)\n")
         fW write("    ARCH=osx\n")
-        fW write("else ifeq ($(OS), CYGWIN_NT-5.1)\n")
+        fW write("else ifeq ($(MYOS), CYGWIN_NT-5.1)\n")
         fW write("    ARCH=win\n")
-        fW write("else ifeq ($(OS), MINGW32_NT-5.1)\n")
+        fW write("else ifeq ($(MYOS), MINGW32_NT-5.1)\n")
         fW write("    ARCH=win\n")
-        fW write("else ifeq ($(OS), MINGW32_NT-6.1)\n")
+        fW write("else ifeq ($(MYOS), MINGW32_NT-6.1)\n")
         fW write("    ARCH=win\n")
-        fW write("else\n")
+        fW write("else ifeq ($(MYOS),)\n")
+        fW write("  ifeq (${OS}, Windows_NT)\n")
+        fW write("    ARCH=win\n")
+        fW write("  else\n")
         fW write("    $(error \"OS ${OS} doesn't have pre-built Boehm GC packages. Please compile and install your own and recompile with GC_PATH=-lgc\")\n")
+        fW write("  endif\n")
         fW write("endif\n")
 
         fW write("ifneq ($(ARCH), osx)\n")
         fW write("  ifeq ($(MACHINE), x86_64)\n")
         fW write("    ARCH:=${ARCH}64\n")
+        fW write("  else ifeq (${PROCESSOR_ARCHITECTURE}, AMD64)\n")
+        fW write("    ARCH:=${ARCH}64\n")
         fW write("  else\n")
         fW write("    ARCH:=${ARCH}32\n")
         fW write("  endif\n")