From 35fdbdc3604c1177f96612fbb68aaea82bca837e Mon Sep 17 00:00:00 2001
From: tmator <tmator@gmail.com>
Date: Mon, 25 Aug 2008 19:44:11 +0000
Subject: [PATCH] Remove MACOSX define, now use __APPLE__

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@311 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp     | 2 +-
 Source/Plugins/Plugin_VideoOGL/Src/Globals.h      | 2 +-
 Source/Plugins/Plugin_VideoOGL/Src/SConscript     | 2 +-
 Source/Plugins/Plugin_VideoOGL/Src/main.cpp       | 2 +-
 Source/Plugins/Plugin_VideoOGL/Src/rasterfont.cpp | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp
index 35e5f1f33f..ee3c00d862 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp
@@ -23,7 +23,7 @@
 #endif
 #include "GLInit.h"
 
-#ifdef MACOSX
+#if defined(__APPLE__)
 #include "SDL.h"
 #endif
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Globals.h b/Source/Plugins/Plugin_VideoOGL/Src/Globals.h
index a5f517c3b2..923a790145 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Globals.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Globals.h
@@ -40,7 +40,7 @@
 //#include <GL/glew.h>
 #include <GL/glxew.h>
 
-#ifdef MACOSX
+#if defined(__APPLE__) 
 
 #include <OpenGL/gl.h>
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
index e4ed3cd32a..5a481c57e9 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript
+++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
@@ -25,7 +25,7 @@ files = ["BPStructs.cpp",
 		 "GUI/ConfigDlg.cpp",
 		 ]
 if sys.platform == 'darwin':         
-	gfxenv=env.Copy(CXXFLAGS = " -DMACOSX=1 `sdl-config --cflags` `wx-config --cppflags` -I/opt/local/include ", LINKFLAGS = " -framework OpenGL -framework Cg `sdl-config --libs` `wx-config --libs` -L/opt/local/lib ")
+	gfxenv=env.Copy(CXXFLAGS = " `sdl-config --cflags` `wx-config --cppflags` -I/opt/local/include ", LINKFLAGS = " -framework OpenGL -framework Cg `sdl-config --libs` `wx-config --libs` -L/opt/local/lib ")
 	gfxenv.SharedLibrary("../../../../Binary/mac/Plugins/zeroogl.so", files, LIBS=["videocommon", "common", "GLEW", "jpeg"])
 else:
 	gfxenv=env.Copy(CXXFLAGS = " `wx-config --cppflags` `pkg-config --cflags xxf86vm` ", LINKFLAGS = "`wx-config --libs` `pkg-config --libs xxf86vm` ")
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
index 6192a69f6f..905bd4155d 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
 
-#ifdef MACOSX
+#if defined(__APPLE__) 
 #include "SDL.h"
 #endif
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/rasterfont.cpp b/Source/Plugins/Plugin_VideoOGL/Src/rasterfont.cpp
index cc44ae6258..5004ae3fe4 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/rasterfont.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/rasterfont.cpp
@@ -21,7 +21,7 @@
 #include <windows.h>
 #endif
 
-#ifdef MACOSX
+#if defined(__APPLE__)
 
 #include <OpenGL/gl.h>