Temporarily re-enable SDL pad input on OS X.

Placeholder SConscript for VideoMerge plugin.


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

SConstruct

@@ -133,7 +133,7 @@ if sys.platform == 'darwin':
     env['FRAMEWORKS'] += ['AudioUnit', 'CoreAudio']
     env['FRAMEWORKS'] += ['IOBluetooth', 'IOKit', 'OpenGL']
     env['LIBPATH'] += ['/Developer/SDKs/MacOSX10.5.sdk/usr/lib']
-    env['LIBS'] = ['gcc_s.10.5', 'iconv']
+    env['LIBS'] = ['gcc_s.10.5', 'iconv', 'SDL']
     env['LINKFLAGS'] += ccld
     env['LINKFLAGS'] += ['-Wl,-search_paths_first', '-Wl,-Z']
     env['LINKFLAGS'] += [
@@ -371,6 +371,7 @@ dirs = [
     'Source/Plugins/Plugin_DSP_LLE/Src',
     #'Source/Plugins/Plugin_VideoDX11/Src',
     #'Source/Plugins/Plugin_VideoDX9/Src',
+    #'Source/Plugins/Plugin_VideoMerge/Src',
     'Source/Plugins/Plugin_VideoOGL/Src',
     'Source/Plugins/Plugin_VideoSoftware/Src',
     'Source/UnitTests',

Source/Core/Core/Src/SConscript

@@ -59,7 +59,7 @@ files = [
 	"HW/WiimoteEmu/Attachment/Turntable.cpp",
 	"HW/WiimoteEmu/EmuSubroutines.cpp",
 	"HW/WiimoteEmu/Encryption.cpp",
-	"HW/WiimoteEmu/Speaker.cpp",
+	#"HW/WiimoteEmu/Speaker.cpp",
 	"HW/GCPadEmu.cpp",
 	"HW/HW.cpp",
 	"HW/Memmap.cpp",

Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h

@@ -28,6 +28,7 @@
 #endif
 #if defined(__APPLE__)
 	#define CIFACE_USE_OSX
+	#define CIFACE_USE_SDL
 #endif
 
 // idk in case i wanted to change it to double or somethin, idk what's best

Source/Core/InputCommon/Src/SConscript

@@ -6,8 +6,8 @@ files = [
 	'ControllerEmu.cpp',
 	'InputConfig.cpp',
 	'ControllerInterface/ControllerInterface.cpp',
-	'UDPWiimote.cpp',
+	#'UDPWiimote.cpp',
-	'UDPWrapper.cpp',
+	#'UDPWrapper.cpp',
 	]
 
 if sys.platform == 'win32':
@@ -23,6 +23,7 @@ elif sys.platform == 'darwin':
 		'ControllerInterface/OSX/OSX.mm',
 		'ControllerInterface/OSX/OSXKeyboard.mm',
 		'ControllerInterface/OSX/OSXMouse.mm',
+		'ControllerInterface/SDL/SDL.cpp',
 		]
 elif env['HAVE_X11']:
 	files += [

Source/Plugins/Plugin_VideoMerge/Src/SConscript

@@ -0,0 +1,64 @@
+# -*- python -*-
+
+Import('env')
+import os
+import sys
+
+name = os.sep + "Plugin_VideoMerge"
+
+files = [
+	'BPFunctions.cpp',
+	'EmuWindow.cpp',
+	'FramebufferManager.cpp',
+	'Main.cpp',
+	'PixelShaderCache.cpp',
+	'Renderer.cpp',
+	'TextureCache.cpp',
+	'VertexManager.cpp',
+	'VertexShaderCache.cpp',
+	'VideoConfigDiag.cpp',
+	'OGL/OGL_FramebufferManager.cpp',
+	'OGL/OGL_GLUtil.cpp',
+	'OGL/OGL_NativeVertexFormat.cpp',
+	'OGL/OGL_PixelShaderCache.cpp',
+	'OGL/OGL_PostProcessing.cpp',
+	'OGL/OGL_RasterFont.cpp',
+	'OGL/OGL_Render.cpp',
+	'OGL/OGL_TextureCache.cpp',
+	'OGL/OGL_TextureConverter.cpp',
+	'OGL/OGL_VertexManager.cpp',
+	'OGL/OGL_VertexShaderCache.cpp',
+	'OGL/OGL_XFB.cpp',
+	]
+
+if sys.platform == 'win32': files += [
+	'DX11/DX11_D3DBase.cpp',
+	'DX11/DX11_D3DBlob.cpp',
+	'DX11/DX11_D3DShader.cpp',
+	'DX11/DX11_D3DTexture.cpp',
+	'DX11/DX11_D3DUtil.cpp',
+	'DX11/DX11_FramebufferManager.cpp',
+	'DX11/DX11_GfxState.cpp',
+	'DX11/DX11_NativeVertexFormat.cpp',
+	'DX11/DX11_PixelShaderCache.cpp',
+	'DX11/DX11_Render.cpp',
+	'DX11/DX11_TextureCache.cpp',
+	'DX11/DX11_VertexManager.cpp',
+	'DX11/DX11_VertexShaderCache.cpp',
+	'DX9/DX9_D3DBase.cpp',
+	'DX9/DX9_D3DShader.cpp',
+	'DX9/DX9_D3DTexture.cpp',
+	'DX9/DX9_D3DUtil.cpp',
+	'DX9/DX9_FramebufferManager.cpp',
+	'DX9/DX9_NativeVertexFormat.cpp',
+	'DX9/DX9_PixelShaderCache.cpp',
+	'DX9/DX9_Render.cpp',
+	'DX9/DX9_TextureCache.cpp',
+	'DX9/DX9_TextureConverter.cpp',
+	'DX9/DX9_VertexManager.cpp',
+	'DX9/DX9_VertexShaderCache.cpp',
+	]
+
+libs = [ 'videocommon', 'GLEW', 'SOIL', 'common' ]
+
+env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs)