Linux build fix.

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

Source/Core/Common/CMakeLists.txt

@@ -18,7 +18,6 @@ set(SRCS	Src/ABI.cpp
 			Src/NandPaths.cpp
 			Src/OpenCL.cpp
 			Src/Plugin.cpp
-			Src/PluginDSP.cpp
 			Src/PluginVideo.cpp
 			Src/SDCardUtil.cpp
 			Src/StringUtil.cpp

Source/Core/Core/CMakeLists.txt

@@ -33,11 +33,6 @@ set(SRCS	Src/ActionReplay.cpp
 			Src/HW/AudioInterface.cpp
 			Src/HW/CPU.cpp
 			Src/HW/DSP.cpp
-			Src/DSPHandler.cpp
-			Src/MailHandler.cpp
-			Src/HLEMixer.cpp
-			Src/main.cpp
-			Src/Config.cpp
 			Src/HW/DSPHLE/UCodes/UCode_AX.cpp
 			Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp
 			Src/HW/DSPHLE/UCodes/UCode_CARD.cpp
@@ -48,8 +43,7 @@ set(SRCS	Src/ActionReplay.cpp
 			Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp
 			Src/HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp
 			Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
-			Src/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp)
-			Src/HW/DSPHLE/DSPHandler.cpp
+			Src/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp
 			Src/HW/DSPHLE/HLEMixer.cpp
 			Src/HW/DSPHLE/MailHandler.cpp
 			Src/HW/DSPHLE/DSPHLE.cpp
@@ -160,7 +154,7 @@ set(SRCS	Src/ActionReplay.cpp
 			Src/PowerPC/JitCommon/JitCache.cpp
 			Src/PowerPC/JitCommon/Jit_Util.cpp)
 
-set(LIBS bdisasm inputcommon lua sfml-network)
+set(LIBS bdisasm inputcommon dspcore lua sfml-network)
 
 if(WIN32)
 	set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Win32.cpp Src/stdafx.cpp

Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp

@@ -22,7 +22,6 @@
 #include "ChunkFile.h"
 #include "IniFile.h"
 #include "HLEMixer.h"
-#include "Config.h"
 #include "Setup.h"
 #include "StringUtil.h"
 #include "LogManager.h"

Source/Core/Core/Src/HW/DSPHLE/HLEMixer.cpp

@@ -15,7 +15,6 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "Config.h" // Local
 #include "DSPHLEGlobals.h"
 #include "DSPHLE.h"
 #include "HLEMixer.h"

Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp

@@ -30,7 +30,6 @@
 #include "DSPHWInterface.h"
 #include "disassemble.h"
 #include "DSPSymbols.h"
-#include "Config.h"
 
 #include "AudioCommon.h"
 #include "Mixer.h"

Source/Core/DSPCore/CMakeLists.txt

@@ -29,6 +29,7 @@ set(SRCS	Src/assemble.cpp
 			Src/Jit/DSPJitMisc.cpp)
 
 add_library(dspcore STATIC ${SRCS})
+target_link_libraries(dspcore core)
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	add_definitions(-fPIC)
 endif()

Source/Core/DebuggerWX/Src/DSPDebugWindow.cpp

@@ -27,7 +27,7 @@
 #include "DSPRegisterView.h"
 #include "CodeView.h"
 #include "MemoryView.h"
-#include "HW\DSPLLE\DSPSymbols.h"
+#include "HW/DSPLLE/DSPSymbols.h"
 
 // Define these here to avoid undefined symbols while still saving functionality
 void Host_NotifyMapLoaded() {}

Source/Core/DolphinWX/CMakeLists.txt

@@ -6,6 +6,7 @@ set(LIBS	core
 			bdisasm
 			inputcommon
 			common
+			audiocommon
 			lua
 			z
 			sfml-network
@@ -20,6 +21,8 @@ if(wxWidgets_FOUND)
 				Src/ARCodeAddEdit.cpp
 				Src/CheatsWindow.cpp
 				Src/ConfigMain.cpp
+				Src/DSPHLEConfigDlg.cpp
+				Src/DSPLLEConfigDlg.cpp
 				Src/Frame.cpp
 				Src/FrameAui.cpp
 				Src/FrameTools.cpp