From 93a5344c71055265f2aaa8b60e7607e4a7840cfd Mon Sep 17 00:00:00 2001
From: meep-eep <meep-eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Tue, 15 Jun 2004 17:58:19 +0000
Subject: [PATCH] Renamed debug.c and debug.h to uqmdebug.c and uqmdebug.h to
 help the crippled MS dev studio cope.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1383 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/msvc++/UrQuanMasters.dsp               | 6 ++----
 sc2/src/sc2code/Makeinfo                       | 2 +-
 sc2/src/sc2code/libs/graphics/sdl/sdl_common.c | 2 +-
 sc2/src/sc2code/planets/pstarmap.c             | 2 +-
 sc2/src/sc2code/planets/solarsys.c             | 2 +-
 sc2/src/sc2code/{debug.c => uqmdebug.c}        | 9 ++++++++-
 sc2/src/sc2code/{debug.h => uqmdebug.h}        | 0
 7 files changed, 14 insertions(+), 9 deletions(-)
 rename sc2/src/sc2code/{debug.c => uqmdebug.c} (98%)
 rename sc2/src/sc2code/{debug.h => uqmdebug.h} (100%)

diff --git a/sc2/src/msvc++/UrQuanMasters.dsp b/sc2/src/msvc++/UrQuanMasters.dsp
index 3faa7be34..ae5015186 100644
--- a/sc2/src/msvc++/UrQuanMasters.dsp
+++ b/sc2/src/msvc++/UrQuanMasters.dsp
@@ -3265,16 +3265,14 @@ SOURCE=..\sc2code\credits.h
 
 SOURCE=..\sc2code\cyborg.c
 # End Source File
-!IF  "$(CFG)" == "UrQuanMasters - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\sc2code\debug.c
+SOURCE=..\sc2code\uqmdebug.c
 # End Source File
 # End Source File
-!ENDIF
 # Begin Source File
 
-SOURCE=..\sc2code\debug.h
+SOURCE=..\sc2code\uqmdebug.h
 # Begin Source File
 
 SOURCE=..\sc2code\demo.c
diff --git a/sc2/src/sc2code/Makeinfo b/sc2/src/sc2code/Makeinfo
index 0fb1df0aa..531cd7dce 100644
--- a/sc2/src/sc2code/Makeinfo
+++ b/sc2/src/sc2code/Makeinfo
@@ -11,6 +11,6 @@ uqm_CFILES="battle.c border.c build.c cleanup.c clock.c collide.c comm.c
 		trans.c util.c velocity.c weapon.c"
 
 if [ "$DEBUG" = 1 ]; then
-	uqm_CFILES="$uqm_CFILES debug.c"
+	uqm_CFILES="$uqm_CFILES uqmdebug.c"
 fi
 
diff --git a/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c b/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c
index 72ae48d0d..07a50dac3 100644
--- a/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c
+++ b/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c
@@ -31,7 +31,7 @@
 #include "bbox.h"
 #include "port.h"
 #include "libs/uio.h"
-#include "debug.h"
+#include "uqmdebug.h"
 
 SDL_Surface *SDL_Video;
 SDL_Surface *SDL_Screen;
diff --git a/sc2/src/sc2code/planets/pstarmap.c b/sc2/src/sc2code/planets/pstarmap.c
index 1be9a076f..dc568b4a5 100644
--- a/sc2/src/sc2code/planets/pstarmap.c
+++ b/sc2/src/sc2code/planets/pstarmap.c
@@ -21,7 +21,7 @@
 #include "options.h"
 #include "controls.h"
 #include "libs/inplib.h"
-#include "debug.h"
+#include "uqmdebug.h"
 
 //Added by Chris
 
diff --git a/sc2/src/sc2code/planets/solarsys.c b/sc2/src/sc2code/planets/solarsys.c
index 0190b4a18..b51c67ee4 100644
--- a/sc2/src/sc2code/planets/solarsys.c
+++ b/sc2/src/sc2code/planets/solarsys.c
@@ -19,7 +19,7 @@
 #include "starcon.h"
 #include "libs/graphics/gfx_common.h"
 #include "controls.h"
-#include "debug.h"
+#include "uqmdebug.h"
 
 //#define DEBUG_SOLARSYS
 
diff --git a/sc2/src/sc2code/debug.c b/sc2/src/sc2code/uqmdebug.c
similarity index 98%
rename from sc2/src/sc2code/debug.c
rename to sc2/src/sc2code/uqmdebug.c
index 58ccffb20..7fb6b11fe 100644
--- a/sc2/src/sc2code/debug.c
+++ b/sc2/src/sc2code/uqmdebug.c
@@ -14,10 +14,15 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef DEBUG
+		/* This file is not even looked at in the unix debug build,
+		 * but MSVC will compile and link it.
+		 */
+
 #include <stdio.h>
 
 #include "starcon.h"
-#include "debug.h"
+#include "uqmdebug.h"
 
 static void dumpEventCallback (EVENTPTR eventPtr, void *arg);
 static void dumpStarCallback(STAR_DESC *star, void *arg);
@@ -548,4 +553,6 @@ dumpPlanet(FILE *out, const PLANET_DESC *planet, UWORD flags)
 	(void) flags;
 }
 
+#endif  /* DEBUG */
+
 
diff --git a/sc2/src/sc2code/debug.h b/sc2/src/sc2code/uqmdebug.h
similarity index 100%
rename from sc2/src/sc2code/debug.h
rename to sc2/src/sc2code/uqmdebug.h