ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Test for libs not OS 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1417 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-12-07 00:22:10 +00:00
parent e7dacb5655
commit a9b2738a36
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
View File

@ -90,7 +90,7 @@ inline unsigned long timeGetTime()
#undef I_NEED_OS2_H #undef I_NEED_OS2_H
#undef BOOL #undef BOOL
#if !defined(__APPLE__) #if defined(HAVE_X11) && HAVE_X11
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/keysym.h> #include <X11/keysym.h>

13
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
View File

@ -21,7 +21,7 @@
#include "OS/Win32.h" #include "OS/Win32.h"
#endif #endif
#if defined(__APPLE__) && !defined(OSX64) #if defined(USE_SDL) && USE_SDL
#include <SDL.h> #include <SDL.h>
#endif #endif
@ -48,7 +48,7 @@
#include "TextureConverter.h" #include "TextureConverter.h"
#include "VideoState.h" #include "VideoState.h"
#if !defined(OSX64) #if HAVE_WX
#include "Debugger/Debugger.h" // for the CDebugger class #include "Debugger/Debugger.h" // for the CDebugger class
#endif #endif
SVideoInitialize g_VideoInitialize; SVideoInitialize g_VideoInitialize;
@ -59,10 +59,8 @@ SVideoInitialize g_VideoInitialize;
clsoe the window if it has auto started, and then restart it after the dll has loaded clsoe the window if it has auto started, and then restart it after the dll has loaded
for the purpose of the game. At that point there is no need to use the same dll instance for the purpose of the game. At that point there is no need to use the same dll instance
as the one that is rendering the game. However, that could be done. */ as the one that is rendering the game. However, that could be done. */
#if defined(OSX64)
void DllDebugger(HWND _hParent) { } #if HAVE_WX
void DoDllDebugger() { }
#else
CDebugger* m_frame; CDebugger* m_frame;
void DllDebugger(HWND _hParent, bool Show) void DllDebugger(HWND _hParent, bool Show)
{ {
@ -86,6 +84,9 @@ void DoDllDebugger()
//m_frame = new CDebugger(NULL); //m_frame = new CDebugger(NULL);
//m_frame->Show(); //m_frame->Show();
} }
#else
void DllDebugger(HWND _hParent) { }
void DoDllDebugger() { }
#endif #endif