diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-07-17 23:36:03 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-07-17 23:36:03 +0000 |
| commit | 4b1a3152b6d0de5baf59771c3ad32ebf6c818864 (patch) | |
| tree | 649b7ba35a6374b5362472e40af71811dc6d8cd9 /Source/Plugins/Plugin_VideoSoftware/Src/SConscript | |
| parent | 4e7682f50761cfaed2bc59067d96d3d978e2214b (diff) | |
Plugin_VideoOGL has been using an old duplicate of VertexLoaderManager.cpp.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5895 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_VideoSoftware/Src/SConscript')
| -rw-r--r-- | Source/Plugins/Plugin_VideoSoftware/Src/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript index 6a5b762b42..7ee899e44d 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript @@ -39,8 +39,8 @@ libs = [ gfxenv = env.Clone() -if sys.platform == 'darwin': - files += [ 'cocoaGL.m', ] +if sys.platform == 'darwin' and not gfxenv['HAVE_WX']: + files += [ 'cocoaGL.m' ] if sys.platform == 'win32': files += [ 'Win32.cpp' ] |