Fix scons build.

OS X real wiimote support not yet tested post-merge.


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

Source/Core/Common/Src/SConscript

@@ -30,7 +30,6 @@ files = [
 	"OpenCL.cpp",
 	"Plugin.cpp",
 	"PluginDSP.cpp",
-	"PluginWiimote.cpp",
 	"PluginVideo.cpp",
 	"SDCardUtil.cpp",
 	"StringUtil.cpp",

Source/Core/Core/Src/HW/DVDInterface.cpp

@@ -215,7 +215,6 @@ Common::CriticalSection dvdread_section;
 
 static int ejectDisc;
 static int insertDisc;
-static int executeDVD;
 
 void EjectDiscCallback(u64 userdata, int cyclesLate);
 void InsertDiscCallback(u64 userdata, int cyclesLate);

Source/Core/Core/Src/SConscript

@@ -136,6 +136,13 @@ files = [
 	"PowerPC/Jit64/Jit64_Tables.cpp",
 	]
 
+libs = [
+	'bdisasm',
+	'inputcommon',
+	'lua',
+	'sfml-network',
+	]
+
 if sys.platform == 'win32':
 	files += [ "HW/BBA-TAP/TAP_Win32.cpp", "stdafx.cpp" ]
 elif sys.platform == 'darwin':
@@ -145,13 +152,5 @@ else:
 
 if env['HAVE_WIIUSE']:
 	files += [ 'HW/WiimoteReal/WiimoteReal.cpp' ]
-	libs += [ 'wiiuse' ]
-	
-libs = [
-	'bdisasm',
-	'inputcommon',
-	'lua',
-	'sfml-network',
-	]
 
 env.StaticLibrary(env['local_libs'] + 'core', files, LIBS = libs)

Source/Core/DolphinWX/Src/SConscript

@@ -104,6 +104,9 @@ else:
 	env.InstallAs(env['data_dir'] + '/sys', '#Data/Sys')
 	env.InstallAs(env['data_dir'] + '/user', '#Data/User')
 
+if env['HAVE_WIIUSE']:
+	libs += [ 'wiiuse' ]   
+
 if env['HAVE_WX']:
 	env.StaticLibrary(env['local_libs'] + 'memcard', memcardfiles)
 	env.Program(exeGUI, files, LIBS = wxlibs + libs + env['LIBS'])