From f7930c7a6a05926c6e6b9763504e65d5fb844a04 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 19 Mar 2005 01:32:26 +0000
Subject: [PATCH] fix compile on systems without SUPPORT_OPENGL don't include
 global.h in headers

---
 stepmania/src/arch/arch.cpp |  2 ++
 stepmania/src/arch/arch.h   | 23 ++++++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/stepmania/src/arch/arch.cpp b/stepmania/src/arch/arch.cpp
index e93543b164..b87026b505 100644
--- a/stepmania/src/arch/arch.cpp
+++ b/stepmania/src/arch/arch.cpp
@@ -188,11 +188,13 @@ LoadingWindow *MakeLoadingWindow()
 	return ret;
 }
 
+#if defined(SUPPORT_OPENGL)
 #include "LowLevelWindow/Selector_LowLevelWindow.h"
 LowLevelWindow *MakeLowLevelWindow()
 {
 	return new ARCH_LOW_LEVEL_WINDOW;
 }
+#endif
 
 #include "MemoryCard/MemoryCardDriver_Null.h"
 #include "MemoryCard/Selector_MemoryCardDriver.h"
diff --git a/stepmania/src/arch/arch.h b/stepmania/src/arch/arch.h
index 6684503c8c..10d3a58e64 100644
--- a/stepmania/src/arch/arch.h
+++ b/stepmania/src/arch/arch.h
@@ -1,9 +1,18 @@
 #ifndef ARCH_H
 #define ARCH_H
 
-#include "global.h"
 #include "RageTextureID.h"
 
+// Put renderers switch here, makes things cleaner
+#if defined(_WINDOWS)
+#define SUPPORT_OPENGL
+#define SUPPORT_D3D
+#elif defined(_XBOX)
+#define SUPPORT_D3D
+#else
+#define SUPPORT_OPENGL
+#endif
+
 /* Include this file if you need to create an instance of a driver object.  */
 class ArchHooks;
 ArchHooks *MakeArchHooks();
@@ -20,8 +29,10 @@ LightsDriver *MakeLightsDriver(CString driver);
 class LoadingWindow;
 LoadingWindow *MakeLoadingWindow();
 
+#if defined(SUPPORT_OPENGL)
 class LowLevelWindow;
 LowLevelWindow *MakeLowLevelWindow();
+#endif
 
 class MemoryCardDriver;
 MemoryCardDriver *MakeMemoryCardDriver();
@@ -32,16 +43,6 @@ RageMovieTexture *MakeRageMovieTexture(RageTextureID ID);
 class RageSoundDriver;
 RageSoundDriver *MakeRageSoundDriver(CString drivers);
 
-// Put renderers switch here, makes things cleaner
-#if defined(_WINDOWS)
-#define SUPPORT_OPENGL
-#define SUPPORT_D3D
-#elif defined(_XBOX)
-#define SUPPORT_D3D
-#else
-#define SUPPORT_OPENGL
-#endif
-
 #endif
 
 /*