From a9b2738a3625b075aa96d08650a8eb1a81fcb903 Mon Sep 17 00:00:00 2001
From: nakeee <nakeee@gmail.com>
Date: Sun, 7 Dec 2008 00:22:10 +0000
Subject: [PATCH] Test for libs not OS

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1417 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h |  2 +-
 Source/Plugins/Plugin_VideoOGL/Src/main.cpp | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
index 11c2e2948c..e85859d2b7 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
@@ -90,7 +90,7 @@ inline unsigned long timeGetTime()
 #undef I_NEED_OS2_H
 #undef BOOL
 
-#if !defined(__APPLE__)
+#if defined(HAVE_X11) && HAVE_X11
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
index df9355d442..71cc63feed 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
@@ -21,7 +21,7 @@
 #include "OS/Win32.h"
 #endif
 
-#if defined(__APPLE__) && !defined(OSX64)
+#if defined(USE_SDL) && USE_SDL
 #include <SDL.h>
 #endif
 
@@ -48,7 +48,7 @@
 #include "TextureConverter.h"
 
 #include "VideoState.h"
-#if !defined(OSX64)
+#if HAVE_WX
 #include "Debugger/Debugger.h" // for the CDebugger class
 #endif
 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
    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. */
-#if defined(OSX64)
-void DllDebugger(HWND _hParent) { }
-void DoDllDebugger() { }
-#else
+
+#if HAVE_WX
 CDebugger* m_frame;
 void DllDebugger(HWND _hParent, bool Show)
 {
@@ -86,6 +84,9 @@ void DoDllDebugger()
 	//m_frame = new CDebugger(NULL);
 	//m_frame->Show();
 }
+#else
+void DllDebugger(HWND _hParent) { }
+void DoDllDebugger() { }
 #endif