From 18bb65b3002fb3ad3ba277f5207da8741b8fd089 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Mon, 31 Jan 2011 01:53:57 +0000 Subject: Fix OS X build. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6997 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_VideoSoftware/Src/SConscript | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'Source/Plugins/Plugin_VideoSoftware/Src/SConscript') 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) -- cgit v1.2.3