make renderer type available to StepMania.cpp

stepmania/src/arch/arch.h

@@ -17,6 +17,10 @@ LowLevelWindow *MakeLowLevelWindow();
 void MakeInputHandlers(vector<InputHandler *> &Add);
 RageSoundDriver *MakeRageSoundDriver(CString drivers);
 
+/* These definitions are in here, instead of in arch_*.h, because they
+ * need to be available to other modules.  It'd be overkill to create separate
+ * "config" and "driver" headers for each arch. */
+
 /* Define the default list of sound drivers for each arch.  It's
  * OK to list drivers that may not be available. */
 #if defined(LINUX)
@@ -31,6 +35,15 @@ RageSoundDriver *MakeRageSoundDriver(CString drivers);
 	#define DEFAULT_SOUND_DRIVER_LIST "Null"
 #endif
 
+/* Choose your renderers. */
+#if defined(_WINDOWS)
+#define SUPPORT_OPENGL
+#define SUPPORT_D3D
+#elif defined(_XBOX)
+#define SUPPORT_D3D
+#else
+#define SUPPORT_OPENGL
+#endif
 
 /* Hack for Xbox: All paths must be absolute. */
 #if defined(_XBOX)

stepmania/src/arch/arch_Win32.h

@@ -14,7 +14,6 @@
 #include "Sound/RageSoundDriver_DSound_Software.h"
 #include "Sound/RageSoundDriver_WaveOut.h"
 
-#define SUPPORT_D3D
 #undef SUPPORT_SDL_INPUT
 
 #endif

stepmania/src/arch/arch_default.h

@@ -14,12 +14,10 @@
  * For Xbox, let's leave this file alone, and special case stuff in arch_xbox.h.
  *
  * For LowLevelWindow, just undefine SUPPORT_OPENGL and don't link any LLW at
- * all.  (We'll still include the header here, but it'll never be used.)  We
- * can remove LowLevelWindow_Null, but I'll wait for you to confirm that there
- * aren't any strange problems with this before doing that.
+ * all.
 
  * For InputHandler, undef SUPPORT_SDL_INPUT and we won't create the SDL input
- * handler.
+ * handler.  (We'll still include the header here, but it'll never be used.)
  */
 
 /* We can have any number of input drivers.  By default, use SDL for keyboards
@@ -36,9 +34,10 @@
 #include "ErrorDialog/ErrorDialog_null.h"
 #include "ArchHooks/ArchHooks_none.h"
 #include "Sound/RageSoundDriver_Null.h"
-#include "LowLevelWindow/LowLevelWindow_SDL.h"
 
-#define SUPPORT_OPENGL
+#if defined(SUPPORT_OPENGL)
+#include "LowLevelWindow/LowLevelWindow_SDL.h"
+#endif
 
 #endif
 

stepmania/src/arch/arch_xbox.h

@@ -11,8 +11,6 @@
 
 #include "Sound/RageSoundDriver_DSound.h"
 
-#define SUPPORT_D3D
-#undef SUPPORT_OPENGL
 /* Undef this if you need no SDL input. */
 // #undef SUPPORT_SDL_INPUT