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

fix compile on non-Windows

Browse Source 
remove header dependency
This commit is contained in:
Chris Danford
2005-11-10 20:39:55 +00:00
parent 20b5c41f76
commit db7a6af95c
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ void *LowLevelWindow_SDL::GetProcAddress(CString s)
return SDL_GL_GetProcAddress(s); return SDL_GL_GetProcAddress(s);
} }
CString LowLevelWindow_SDL::TryVideoMode( RageDisplay::VideoModeParams p, bool &bNewDeviceOut ) CString LowLevelWindow_SDL::TryVideoMode( VideoModeParams p, bool &bNewDeviceOut )
{ {
bool wasWindowed = CurrentParams.windowed; bool wasWindowed = CurrentParams.windowed;
stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.h
+3 -3
View File
@@ -9,14 +9,14 @@ public:
LowLevelWindow_SDL(); LowLevelWindow_SDL();
~LowLevelWindow_SDL(); ~LowLevelWindow_SDL();
void *GetProcAddress(CString s); void *GetProcAddress(CString s);
CString TryVideoMode( RageDisplay::VideoModeParams p, bool &bNewDeviceOut ); CString TryVideoMode( VideoModeParams p, bool &bNewDeviceOut );
void SwapBuffers(); void SwapBuffers();
void Update(); void Update();
RageDisplay::VideoModeParams GetVideoModeParams() const { return CurrentParams; } VideoModeParams GetVideoModeParams() const { return CurrentParams; }
private: private:
RageDisplay::VideoModeParams CurrentParams; VideoModeParams CurrentParams;
}; };
#ifdef ARCH_LOW_LEVEL_WINDOW #ifdef ARCH_LOW_LEVEL_WINDOW
stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp
+1 -1
View File
@@ -39,7 +39,7 @@ void *LowLevelWindow_X11::GetProcAddress( CString s )
return (void*) glXGetProcAddressARB( (const GLubyte*) s.c_str() ); return (void*) glXGetProcAddressARB( (const GLubyte*) s.c_str() );
} }
CString LowLevelWindow_X11::TryVideoMode( RageDisplay::VideoModeParams p, bool &bNewDeviceOut ) CString LowLevelWindow_X11::TryVideoMode( VideoModeParams p, bool &bNewDeviceOut )
{ {
#if defined(LINUX) #if defined(LINUX)
/* nVidia cards: /* nVidia cards:
stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.h
+3 -3
View File
@@ -12,14 +12,14 @@ public:
~LowLevelWindow_X11(); ~LowLevelWindow_X11();
void *GetProcAddress(CString s); void *GetProcAddress(CString s);
CString TryVideoMode(RageDisplay::VideoModeParams p, bool &bNewDeviceOut); CString TryVideoMode(VideoModeParams p, bool &bNewDeviceOut);
void SwapBuffers(); void SwapBuffers();
RageDisplay::VideoModeParams GetVideoModeParams() const { return CurrentParams; } VideoModeParams GetVideoModeParams() const { return CurrentParams; }
private: private:
bool m_bWindowIsOpen; bool m_bWindowIsOpen;
RageDisplay::VideoModeParams CurrentParams; VideoModeParams CurrentParams;
}; };
#ifdef ARCH_LOW_LEVEL_WINDOW #ifdef ARCH_LOW_LEVEL_WINDOW
stepmania/src/archutils/Xbox/GraphicsWindow.cpp
+7 -7
View File
@@ -7,18 +7,18 @@
static const CString g_sClassName = CString(PRODUCT_NAME) + " LowLevelWindow_Win32"; static const CString g_sClassName = CString(PRODUCT_NAME) + " LowLevelWindow_Win32";
static RageDisplay::VideoModeParams g_CurrentParams; static VideoModeParams g_CurrentParams;
static bool g_bResolutionChanged = false; static bool g_bResolutionChanged = false;
static bool g_bHasFocus = true; static bool g_bHasFocus = true;
static bool g_bLastHasFocus = true; static bool g_bLastHasFocus = true;
static bool m_bWideWindowClass; static bool m_bWideWindowClass;
void GraphicsWindow::SetVideoModeParams( const RageDisplay::VideoModeParams &p ) void GraphicsWindow::SetVideoModeParams( const VideoModeParams &p )
{ {
g_CurrentParams = p; g_CurrentParams = p;
} }
RageDisplay::VideoModeParams GraphicsWindow::GetParams() VideoModeParams GraphicsWindow::GetParams()
{ {
return g_CurrentParams; return g_CurrentParams;
} }
@@ -35,11 +35,11 @@ void GraphicsWindow::Update()
void GraphicsWindow::Initialize() { } void GraphicsWindow::Initialize() { }
void GraphicsWindow::Shutdown() { } void GraphicsWindow::Shutdown() { }
CString GraphicsWindow::SetScreenMode( const RageDisplay::VideoModeParams &p ) { return ""; } CString GraphicsWindow::SetScreenMode( const VideoModeParams &p ) { return ""; }
void GraphicsWindow::CreateGraphicsWindow( const RageDisplay::VideoModeParams &p ) { } void GraphicsWindow::CreateGraphicsWindow( const VideoModeParams &p ) { }
void GraphicsWindow::RecreateGraphicsWindow( const RageDisplay::VideoModeParams &p ) { } void GraphicsWindow::RecreateGraphicsWindow( const VideoModeParams &p ) { }
void GraphicsWindow::DestroyGraphicsWindow() { } void GraphicsWindow::DestroyGraphicsWindow() { }
void GraphicsWindow::ConfigureGraphicsWindow( const RageDisplay::VideoModeParams &p ) { } void GraphicsWindow::ConfigureGraphicsWindow( const VideoModeParams &p ) { }
/* /*
* (c) 2004 Glenn Maynard * (c) 2004 Glenn Maynard
stepmania/src/archutils/Xbox/GraphicsWindow.h
+7 -7
View File
@@ -4,19 +4,19 @@
#pragma once #pragma once
#include "RageDisplay.h" // for RageDisplay::VideoModeParams struct "RageDisplay.h"
namespace GraphicsWindow namespace GraphicsWindow
{ {
void Initialize(); void Initialize();
void Shutdown(); void Shutdown();
void SetVideoModeParams( const RageDisplay::VideoModeParams &p ); void SetVideoModeParams( const VideoModeParams &p );
CString SetScreenMode( const RageDisplay::VideoModeParams &p ); CString SetScreenMode( const VideoModeParams &p );
void CreateGraphicsWindow( const RageDisplay::VideoModeParams &p ); void CreateGraphicsWindow( const VideoModeParams &p );
void RecreateGraphicsWindow( const RageDisplay::VideoModeParams &p ); void RecreateGraphicsWindow( const VideoModeParams &p );
void DestroyGraphicsWindow(); void DestroyGraphicsWindow();
void ConfigureGraphicsWindow( const RageDisplay::VideoModeParams &p ); void ConfigureGraphicsWindow( const VideoModeParams &p );
RageDisplay::VideoModeParams GetParams(); VideoModeParams GetParams();
void Update(); void Update();
}; };