- Changed the Makefiles that are used by both Linux and MinGW so that msys

detection occurs only if $OS is Windows_NT. Otherwise, spurious nul files
  are created when compiling on Linux.


SVN r878 (trunk)

docs/rh-log.txt

@@ -1,3 +1,8 @@
+April 3, 2008
+- Changed the Makefiles that are used by both Linux and MinGW so that msys
+  detection occurs only if $OS is Windows_NT. Otherwise, spurious nul files
+  are created when compiling on Linux.
+
 April 3, 2008 (Changes by Graf Zahl)
 - Fixed: The minimum parameter count for ACS_Execute and ACS_ExecuteAlways for
   DECORATE was wrong (2 instead of 1.)

snes_spc/Makefile

@@ -3,9 +3,9 @@
 CMD=0
 ifeq (Windows_NT,$(OS))
   CMD=1
-endif
-ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
-  CMD=0
+  ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
+    CMD=0
+  endif
 endif
 
 STATICLIB = libsnes_spc.a

src/sound/music_mus_midiout.cpp

@@ -50,10 +50,6 @@
 
 // EXTERNAL DATA DECLARATIONS ----------------------------------------------
 
-#ifdef _WIN32
-extern UINT mididevice;
-#endif
-
 // PRIVATE DATA DEFINITIONS ------------------------------------------------
 
 static const BYTE CtrlTranslate[15] =

tools/dehsupp/Makefile

@@ -1,10 +1,9 @@
 ifeq (Windows_NT,$(OS))
   WIN=1
   WINCMD=1
-endif
-ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
-  WIN=1
-  WINCMD=0
+  ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
+    WINCMD=0
+  endif
 endif
 
 ifeq (1,$(WIN))

tools/lemon/Makefile

@@ -1,10 +1,9 @@
 ifeq (Windows_NT,$(OS))
   WIN=1
   WINCMD=1
-endif
-ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
-  WIN=1
-  WINCMD=0
+  ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
+    WINCMD=0
+  endif
 endif
 
 ifeq (1,$(WIN))

tools/makewad/Makefile

@@ -1,10 +1,9 @@
 ifeq (Windows_NT,$(OS))
   WIN=1
   WINCMD=1
-endif
-ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
-  WIN=1
-  WINCMD=0
+  ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
+    WINCMD=0
+  endif
 endif
 
 ifeq (1,$(WIN))

tools/re2c/Makefile

@@ -1,10 +1,9 @@
 ifeq (Windows_NT,$(OS))
   WIN=1
   WINCMD=1
-endif
-ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
-  WIN=1
-  WINCMD=0
+  ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
+    WINCMD=0
+  endif
 endif
 
 ifeq (1,$(WIN))

tools/updaterevision/Makefile

@@ -1,10 +1,9 @@
 ifeq (Windows_NT,$(OS))
   WIN=1
   WINCMD=1
-endif
-ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
-  WIN=1
-  WINCMD=0
+  ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
+    WINCMD=0
+  endif
 endif
 
 CC = gcc