diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2011-01-29 04:52:19 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2011-01-29 04:52:19 +0000 |
| commit | 1bcad428eacd4931d62374f0f4ad349b2a6eff48 (patch) | |
| tree | 053c7e7b5f3c89bba2871bc8698339d5b0def145 /Source/Plugins/Plugin_VideoSoftware/Src/SConscript | |
| parent | 4c58c7ea031d518f3bbb936fc8f97fa2aad878a3 (diff) | |
Link the video plugin statically into the main binary on OS X.
This makes the OS X build more robust and should help pave the
way for the integration of the video plugins as well as LTO.
There are now no more global class level namespace conflicts left,
as evidenced by the fact that Dolphin can be linked with -all_load,
not that you would want to.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6958 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_VideoSoftware/Src/SConscript')
| -rw-r--r-- | Source/Plugins/Plugin_VideoSoftware/Src/SConscript | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript index a26209a771..169ece38f2 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript @@ -4,8 +4,6 @@ Import('env') import os import sys -name = os.sep + "Plugin_VideoSoftware" - files = [ 'BPMemLoader.cpp', 'Clipper.cpp', @@ -40,6 +38,21 @@ if env['HAVE_WX']: if sys.platform == 'win32': files += [ 'Win32.cpp' ] -libs = [ 'videocommon', 'GLEW', 'SOIL', 'common' ] +#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.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) +env['libvideo'] = env.StaticLibrary(env['local_libs'] + 'video', files) |