From dba28a70f0f995e8ad2a12e83c0ad492237ccf18 Mon Sep 17 00:00:00 2001
From: n-a-c-h <>
Date: Mon, 11 Jul 2005 17:45:41 +0000
Subject: [PATCH] Make sure MSVC knows it's running on Windows. Have MSVC clean
 up it's worthless object files after itself.

---
 zsnes/src/makefile.ms  |  1 +
 zsnes/src/parsegen.cpp | 17 +++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/zsnes/src/makefile.ms b/zsnes/src/makefile.ms
index 39589f1c..8d5222ae 100644
--- a/zsnes/src/makefile.ms
+++ b/zsnes/src/makefile.ms
@@ -377,6 +377,7 @@ endif
 ${PSR}: $<
 ifeq (${ENV},msvc)
 	cl /EHsc /Fe$@ parsegen.cpp
+	${DELETECOMMAND} parsegen.obj
 else
 ifeq (${ENV},dos)
 	gpp -O3 -o $@ parsegen.cpp
diff --git a/zsnes/src/parsegen.cpp b/zsnes/src/parsegen.cpp
index 6add6d18..a89db8ce 100644
--- a/zsnes/src/parsegen.cpp
+++ b/zsnes/src/parsegen.cpp
@@ -36,17 +36,18 @@ using namespace std;
 
 #include <errno.h>
 
+#ifdef _MSC_VER //MSVC
+typedef int ssize_t;
+#define strcasecmp stricmp
+#define __WIN32__
+#endif
+
 #if defined(__MSDOS__) || defined(__WIN32__)
 #define SLASH_STR "\\"
 #else
 #define SLASH_STR "/"
 #endif
 
-#ifdef _MSC_VER //MSVC
-typedef int ssize_t;
-#define strcasecmp stricmp
-#endif
-
 #define LINE_LENGTH 2048*10
 char line[LINE_LENGTH];
 
@@ -263,12 +264,12 @@ ssize_t enhanced_atoi(const char *str)
     system("gcc -o eatio.exe eatio.c -s");
 #endif
 
-    //Older MSVCs too stupid to concatinate on their own
-    system((string(".")+string(SLASH_STR)+"eatio.exe").c_str());
+    system("."SLASH_STR"eatio.exe");
 
     remove("eatio.c");
     remove("eatio.exe");
-
+    remove("eatio.obj"); //Needed for stupid MSVCs which leave object files lying around
+    
     ifstream in_stream("eatio.res");
     if (in_stream)
     {