actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix compile on systems without SUPPORT_OPENGL

Browse Source 
don't include global.h in headers
This commit is contained in:
Glenn Maynard
2005-03-19 01:32:26 +00:00
parent 7ff0cb03d9
commit f7930c7a6a
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/arch.cpp
+2
View File
@@ -188,11 +188,13 @@ LoadingWindow *MakeLoadingWindow()
return ret; return ret;
} }
#if defined(SUPPORT_OPENGL)
#include "LowLevelWindow/Selector_LowLevelWindow.h" #include "LowLevelWindow/Selector_LowLevelWindow.h"
LowLevelWindow *MakeLowLevelWindow() LowLevelWindow *MakeLowLevelWindow()
{ {
return new ARCH_LOW_LEVEL_WINDOW; return new ARCH_LOW_LEVEL_WINDOW;
} }
#endif
#include "MemoryCard/MemoryCardDriver_Null.h" #include "MemoryCard/MemoryCardDriver_Null.h"
#include "MemoryCard/Selector_MemoryCardDriver.h" #include "MemoryCard/Selector_MemoryCardDriver.h"
stepmania/src/arch/arch.h
+12 -11
View File
@@ -1,9 +1,18 @@
#ifndef ARCH_H #ifndef ARCH_H
#define ARCH_H #define ARCH_H
#include "global.h"
#include "RageTextureID.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. */ /* Include this file if you need to create an instance of a driver object. */
class ArchHooks; class ArchHooks;
ArchHooks *MakeArchHooks(); ArchHooks *MakeArchHooks();
@@ -20,8 +29,10 @@ LightsDriver *MakeLightsDriver(CString driver);
class LoadingWindow; class LoadingWindow;
LoadingWindow *MakeLoadingWindow(); LoadingWindow *MakeLoadingWindow();
#if defined(SUPPORT_OPENGL)
class LowLevelWindow; class LowLevelWindow;
LowLevelWindow *MakeLowLevelWindow(); LowLevelWindow *MakeLowLevelWindow();
#endif
class MemoryCardDriver; class MemoryCardDriver;
MemoryCardDriver *MakeMemoryCardDriver(); MemoryCardDriver *MakeMemoryCardDriver();
@@ -32,16 +43,6 @@ RageMovieTexture *MakeRageMovieTexture(RageTextureID ID);
class RageSoundDriver; class RageSoundDriver;
RageSoundDriver *MakeRageSoundDriver(CString drivers); 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 #endif
/* /*