diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2011-01-31 01:53:57 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2011-01-31 01:53:57 +0000 |
| commit | 18bb65b3002fb3ad3ba277f5207da8741b8fd089 (patch) | |
| tree | dc693d492e12fdf9be2cd4acf42f6b5ce6d201db /Source/Plugins/Plugin_VideoSoftware/Src/SConscript | |
| parent | fbaf9659958cd6d8c0df6b0c217f6e60f57f9d77 (diff) | |
Fix OS X build.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6997 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_VideoSoftware/Src/SConscript')
| -rw-r--r-- | Source/Plugins/Plugin_VideoSoftware/Src/SConscript | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript index 9a9c0b995c..0124ddc5b5 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript @@ -37,21 +37,4 @@ if env['HAVE_WX']: if sys.platform == 'win32': files += [ 'Win32.cpp' ] -#env['LIBS'] += ['videocommon'] -# -#if env['HAVE_WX']: -# env['LIBS'] += [ 'videouicommon' ] -# XXX partially converted to libvideocommon, but there are still conflicts -files += [ - '../../../Core/VideoCommon/Src/ImageWrite.cpp', - '../../../Core/VideoCommon/Src/IndexGenerator.cpp', - '../../../Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp', - '../../../Core/VideoCommon/Src/TextureDecoder.cpp', - '../../../Core/VideoCommon/Src/VertexLoader_Color.cpp', - '../../../Core/VideoCommon/Src/VertexLoader_Normal.cpp', - '../../../Core/VideoCommon/Src/VertexLoader_Position.cpp', - '../../../Core/VideoCommon/Src/VertexLoader_TextCoord.cpp', - '../../../Core/VideoCommon/Src/VertexManagerBase.cpp', - ] - -env['libvideo'] = env.StaticLibrary(env['local_libs'] + 'video', files) +env.StaticLibrary(env['local_libs'] + 'plugin_videosoftware', files) |