fix compile on systems without SUPPORT_OPENGL
don't include global.h in headers
This commit is contained in:
@@ -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"
|
||||
|
||||
+12
-11
@@ -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
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user