Fix OS X build.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6997 8ced0084-cf51-0410-be5f-012b33b47a6e

SConstruct

@@ -331,14 +331,6 @@ dirs = [
     'Externals/SFML/src',
     #'Externals/wxWidgets',
     'Externals/zlib',
-    ]
-
-if sys.platform == 'darwin':
-    dirs += ['Source/Plugins/Plugin_VideoOGL/Src']
-else:
-    dirs += ['Source/Plugins/Plugin_VideoSoftware/Src']
-
-dirs += [
     'Source/Core/AudioCommon/Src',
     'Source/Core/Common/Src',
     'Source/Core/Core/Src',
@@ -350,6 +342,8 @@ dirs += [
     'Source/Core/VideoCommon/Src',
     'Source/Core/VideoUICommon/Src',
     'Source/DSPTool/Src',
+    'Source/Plugins/Plugin_VideoOGL/Src',
+    #'Source/Plugins/Plugin_VideoSoftware/Src',
     'Source/UnitTests',
     ]
 

Source/Core/Common/CMakeLists.txt

@@ -4,7 +4,6 @@ set(SRCS	Src/ABI.cpp
 			Src/ColorUtil.cpp
 			Src/ConsoleListener.cpp
 			Src/CPUDetect.cpp
-			Src/DynamicLibrary.cpp
 			Src/FileSearch.cpp
 			Src/FileUtil.cpp
 			Src/Hash.cpp
@@ -17,8 +16,6 @@ set(SRCS	Src/ABI.cpp
 			Src/MsgHandler.cpp
 			Src/NandPaths.cpp
 			Src/OpenCL.cpp
-			Src/Plugin.cpp
-			Src/PluginVideo.cpp
 			Src/SDCardUtil.cpp
 			Src/StringUtil.cpp
 			Src/SymbolDB.cpp
@@ -27,6 +24,7 @@ set(SRCS	Src/ABI.cpp
 			Src/Thunk.cpp
 			Src/Timer.cpp
 			Src/Version.cpp
+			Src/VideoBackendBase.cpp
 			Src/x64Analyzer.cpp
 			Src/x64Emitter.cpp
 			Src/Crypto/aes_cbc.cpp

Source/Core/Common/Src/SConscript

@@ -18,7 +18,6 @@ files = [
 	"ColorUtil.cpp",
 	"ConsoleListener.cpp",
 	"CPUDetect.cpp",
-	"DynamicLibrary.cpp",
 	"FileSearch.cpp",
 	"FileUtil.cpp",
 	"Hash.cpp",
@@ -31,8 +30,6 @@ files = [
 	"MsgHandler.cpp",
 	"NandPaths.cpp",
 	"OpenCL.cpp",
-	"Plugin.cpp",
-	"PluginVideo.cpp",
 	"SDCardUtil.cpp",
 	"StringUtil.cpp",
 	"SymbolDB.cpp",
@@ -41,6 +38,7 @@ files = [
 	"Thunk.cpp",
 	"Timer.cpp",
 	"Version.cpp",
+	"VideoBackendBase.cpp",
 	"x64Emitter.cpp",
 	"x64Analyzer.cpp",
 	"Crypto/aes_cbc.cpp",

Source/Core/Core/CMakeLists.txt

@@ -12,7 +12,6 @@ set(SRCS	Src/ActionReplay.cpp
 			Src/MemTools.cpp
 			Src/OnFrame.cpp
 			Src/PatchEngine.cpp
-			Src/PluginManager.cpp
 			Src/PluginDSP.cpp
 			Src/State.cpp
 			Src/stdafx.cpp

Source/Core/Core/Src/SConscript

@@ -15,7 +15,6 @@ files = [
 	"OnFrame.cpp",
 	"MemTools.cpp",
 	"PatchEngine.cpp",
-	"PluginManager.cpp",
 	"PluginDSP.cpp",
 	"LuaInterface.cpp",
 	"State.cpp",

Source/Core/DolphinWX/Src/ConfigMain.cpp

@@ -252,10 +252,8 @@ void CConfigMain::UpdateGUI()
 		PathsPage->Disable();
 
 
-#if defined _WIN32 || defined __linux__
 		// Disable stuff on PluginsPage
 		GraphicSelection->Disable();
-#endif
 	}
 }
 
@@ -876,7 +874,6 @@ void CConfigMain::CreateGUIControls()
 	PathsPage->SetSizer(sPathsPage);
 
 	
-#if defined _WIN32 || defined __linux__
 	// Plugins page
 	//sbGraphicsPlugin = new wxStaticBoxSizer(wxHORIZONTAL, PluginsPage, _("Graphics"));
 	//GraphicSelection = new wxChoice(PluginsPage, ID_GRAPHIC_CB, wxDefaultPosition, wxDefaultSize, 0, NULL, 0, wxDefaultValidator);
@@ -891,7 +888,6 @@ void CConfigMain::CreateGUIControls()
 	//sPluginsPage->Add(sbGraphicsPlugin, 0, wxEXPAND|wxALL, 5);
 
 	//PluginsPage->SetSizer(sPluginsPage);
-#endif
 
 
 	m_Ok = new wxButton(this, wxID_OK);

Source/Core/DolphinWX/Src/SConscript

@@ -7,9 +7,10 @@ from SconsTests import utils
 
 files = ['BootManager.cpp']
 
+# 'plugin_videosoftware',
 libs = [
-	'core',
-	'audiocommon', 'common', 'discio', 'inputcommon',
+	'core', 'discio', 'plugin_videoogl', 
+	'audiocommon', 'common', 'inputcommon', 'videocommon',
 	'GLEW', 'SOIL', 'bdisasm', 'lua', 'lzo2', 'sfml-network', 'z',
 	]
 
@@ -55,12 +56,11 @@ else:
 
 	env.StaticLibrary(env['local_libs'] + "dolphinwx", libfiles)
 
-	wxlibs += ['debwx', 'debugger_ui_util', 'dolphinwx']
+	wxlibs += ['debwx', 'debugger_ui_util', 'dolphinwx', 'videouicommon']
 
 if sys.platform == 'win32':
 	files += [ "stdafx.cpp" ]
 elif sys.platform == 'darwin':
-	ldflags += [ '-Wl,-force_load,' + env['libvideo'][0].path ]
 	ldflags += [ '-Xarch_i386', '-Wl,-framework,QuickTime' ]
 	ldflags += [ '-weak_framework', 'OpenCL' ]
 
@@ -126,8 +126,6 @@ elif sys.platform == 'darwin':
 else:
 	files += [ 'X11Utils.cpp' ]
 	libs += [ 'SDL', 'clrun' ]
-	ldflags += [ '-Wl,--whole-archive,' + env['libvideo'][0].path ]
-	ldflags += [ '-Wl,--no-whole-archive' ]
 	if env['HAVE_WX']:
 		exe = env['binary_dir'] + '/dolphin-emu'
 	else:
@@ -138,5 +136,4 @@ else:
 libs = wxlibs + libs + env['LIBS']
 linkflags = ldflags + env['LINKFLAGS']
 
-env.Depends(exe, env['libvideo'])
 env.Program(exe, files, LIBS = libs, LINKFLAGS = linkflags)

Source/Core/VideoCommon/Src/NativeVertexFormat.h

@@ -54,7 +54,12 @@ enum {
 	VB_HAS_UVTEXMTXSHIFT=13,
 };
 
+#ifdef WIN32
 #define LOADERDECL __cdecl
+#else
+#define LOADERDECL
+#endif
+
 typedef void (LOADERDECL *TPipelineFunction)();
 
 enum VarType

Source/Plugins/Plugin_VideoOGL/Src/SConscript

@@ -19,9 +19,4 @@ files = [
 	'GLUtil.cpp'
 	]
 
-env['LIBS'] += ['videocommon']
-
-if env['HAVE_WX']:
-	env['LIBS'] += [ 'videouicommon' ]
-
-env['libvideo'] = env.StaticLibrary(env['local_libs'] + 'video', files)
+env.StaticLibrary(env['local_libs'] + 'plugin_videoogl', files)

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)

Source/Plugins/Plugin_VideoSoftware/Src/main.cpp

@@ -189,4 +189,4 @@ void VideoBackend::Video_AbortFrame(void)
 
 }
 
-}
+}