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

Remove MACOSX define, now use __APPLE__ 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@311 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
tmator 2008-08-25 19:44:11 +00:00
parent 1a2e350158
commit 35fdbdc360
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp
View File

@ -23,7 +23,7 @@
#endif #endif
#include "GLInit.h" #include "GLInit.h"
#ifdef MACOSX #if defined(__APPLE__)
#include "SDL.h" #include "SDL.h"
#endif #endif

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

@ -40,7 +40,7 @@
//#include <GL/glew.h> //#include <GL/glew.h>
#include <GL/glxew.h> #include <GL/glxew.h>
#ifdef MACOSX #if defined(__APPLE__)
#include <OpenGL/gl.h> #include <OpenGL/gl.h>

2
Source/Plugins/Plugin_VideoOGL/Src/SConscript
View File

@ -25,7 +25,7 @@ files = ["BPStructs.cpp",
"GUI/ConfigDlg.cpp", "GUI/ConfigDlg.cpp",
] ]
if sys.platform == 'darwin': 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"]) gfxenv.SharedLibrary("../../../../Binary/mac/Plugins/zeroogl.so", files, LIBS=["videocommon", "common", "GLEW", "jpeg"])
else: else:
gfxenv=env.Copy(CXXFLAGS = " `wx-config --cppflags` `pkg-config --cflags xxf86vm` ", LINKFLAGS = "`wx-config --libs` `pkg-config --libs xxf86vm` ") gfxenv=env.Copy(CXXFLAGS = " `wx-config --cppflags` `pkg-config --cflags xxf86vm` ", LINKFLAGS = "`wx-config --libs` `pkg-config --libs xxf86vm` ")

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

@ -21,7 +21,7 @@
#include "OS\Win32.h" #include "OS\Win32.h"
#endif #endif
#ifdef MACOSX #if defined(__APPLE__)
#include "SDL.h" #include "SDL.h"
#endif #endif

2
Source/Plugins/Plugin_VideoOGL/Src/rasterfont.cpp
View File

@ -21,7 +21,7 @@
#include <windows.h> #include <windows.h>
#endif #endif
#ifdef MACOSX #if defined(__APPLE__)
#include <OpenGL/gl.h> #include <OpenGL/gl.h>