diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
index 49ee511ad3..6887d73fcd 100644
--- a/Source/Core/DolphinWX/CMakeLists.txt
+++ b/Source/Core/DolphinWX/CMakeLists.txt
@@ -13,57 +13,54 @@ set(LIBS core
${X11_LIBRARIES})
if(wxWidgets_FOUND)
- set(SRCS ${SRCS}
+ set(SRCS Src/ARCodeAddEdit.cpp
Src/AboutDolphin.cpp
- Src/ARCodeAddEdit.cpp
Src/CheatsWindow.cpp
Src/ConfigMain.cpp
+ Src/Debugger/BreakpointDlg.cpp
+ Src/Debugger/BreakpointView.cpp
+ Src/Debugger/BreakpointWindow.cpp
+ Src/Debugger/CodeView.cpp
+ Src/Debugger/CodeWindow.cpp
+ Src/Debugger/CodeWindowFunctions.cpp
+ Src/Debugger/DSPDebugWindow.cpp
+ Src/Debugger/DSPRegisterView.cpp
+ Src/Debugger/DebuggerPanel.cpp
+ Src/Debugger/DebuggerUIUtil.cpp
+ Src/Debugger/JitWindow.cpp
+ Src/Debugger/MemoryCheckDlg.cpp
+ Src/Debugger/MemoryView.cpp
+ Src/Debugger/MemoryWindow.cpp
+ Src/Debugger/RegisterView.cpp
+ Src/Debugger/RegisterWindow.cpp
Src/Frame.cpp
Src/FrameAui.cpp
Src/FrameTools.cpp
Src/GameListCtrl.cpp
Src/GeckoCodeDiag.cpp
Src/HotkeyDlg.cpp
- Src/InputConfigDiag.cpp
- Src/InputConfigDiagBitmaps.cpp
Src/ISOFile.cpp
Src/ISOProperties.cpp
+ Src/InputConfigDiag.cpp
+ Src/InputConfigDiagBitmaps.cpp
Src/LogWindow.cpp
Src/Main.cpp
Src/MemcardManager.cpp
Src/MemoryCards/GCMemcard.cpp
- Src/NetWindow.cpp
- Src/PatchAddEdit.cpp
- Src/PHackSettings.cpp
- Src/UDPConfigDiag.cpp
- Src/WiimoteConfigDiag.cpp
Src/MemoryCards/WiiSaveCrypted.cpp
+ Src/NetWindow.cpp
+ Src/PHackSettings.cpp
+ Src/PatchAddEdit.cpp
+ Src/UDPConfigDiag.cpp
+ Src/VideoConfigDiag.cpp
Src/WXInputBase.cpp
- Src/WxUtils.cpp
- Src/BreakpointDlg.cpp
- Src/BreakpointView.cpp
- Src/BreakpointWindow.cpp
- Src/CodeView.cpp
- Src/CodeWindow.cpp
- Src/CodeWindowFunctions.cpp
- Src/DebuggerPanel.cpp
- Src/DebuggerUIUtil.cpp
- Src/DSPDebugWindow.cpp
- Src/DSPRegisterView.cpp
- Src/JitWindow.cpp
- Src/MemoryCheckDlg.cpp
- Src/MemoryView.cpp
- Src/MemoryWindow.cpp
- Src/RegisterView.cpp
- Src/RegisterWindow.cpp
- Src/VideoConfigDiag.cpp)
+ Src/WiimoteConfigDiag.cpp
+ Src/WxUtils.cpp)
set(WXLIBS ${wxWidgets_LIBRARIES}
${GTK2_LIBRARIES})
-
-else(wxWidgets_FOUND)
- set(SRCS ${SRCS}
- Src/MainNoGUI.cpp)
+else()
+ set(SRCS Src/MainNoGUI.cpp)
endif()
if(WIN32)
@@ -81,15 +78,13 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR
set(LIBS ${LIBS} usbhid)
endif()
-set(EXEGUI dolphin-emu)
-set(EXENOGUI dolphin-emu-nogui)
-
if(wxWidgets_FOUND)
- add_executable(${EXEGUI} ${SRCS})
- target_link_libraries(${EXEGUI} ${LIBS} ${WXLIBS})
- install(TARGETS ${EXEGUI} RUNTIME DESTINATION ${bindir})
+ set(DOLPHIN_EXE dolphin-emu)
else()
- add_executable(${EXENOGUI} ${SRCS})
- target_link_libraries(${EXENOGUI} ${LIBS})
- install(TARGETS ${EXENOGUI} RUNTIME DESTINATION ${bindir})
+ set(DOLPHIN_EXE dolphin-emu-nogui)
endif()
+
+add_executable(${DOLPHIN_EXE} ${SRCS})
+target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS})
+install(TARGETS ${DOLPHIN_EXE} RUNTIME DESTINATION ${bindir})
+
diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj
index 4b27dfe11b..710f997510 100644
--- a/Source/Core/DolphinWX/Dolphin.vcxproj
+++ b/Source/Core/DolphinWX/Dolphin.vcxproj
@@ -216,18 +216,18 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
@@ -238,7 +238,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
-
+
@@ -252,14 +252,14 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
-
-
-
+
+
+
-
-
+
+
Create
Create
@@ -278,17 +278,17 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
-
-
-
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
@@ -297,20 +297,20 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
-
+
-
-
-
+
+
+
-
-
+
+
@@ -382,4 +382,4 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
-
\ No newline at end of file
+
diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj.filters b/Source/Core/DolphinWX/Dolphin.vcxproj.filters
index 82fd37431a..e280b08ad3 100644
--- a/Source/Core/DolphinWX/Dolphin.vcxproj.filters
+++ b/Source/Core/DolphinWX/Dolphin.vcxproj.filters
@@ -84,55 +84,55 @@
GUI
-
+
GUI\Debugger
GUI\Video
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Video
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Debugger
@@ -210,52 +210,52 @@
GUI
-
+
GUI\Debugger
GUI\Video
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Video
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Debugger
-
+
GUI\Debugger
@@ -297,4 +297,4 @@
Resources
-
\ No newline at end of file
+
diff --git a/Source/Core/DolphinWX/Src/BreakpointDlg.cpp b/Source/Core/DolphinWX/Src/Debugger/BreakpointDlg.cpp
similarity index 100%
rename from Source/Core/DolphinWX/Src/BreakpointDlg.cpp
rename to Source/Core/DolphinWX/Src/Debugger/BreakpointDlg.cpp
diff --git a/Source/Core/DolphinWX/Src/BreakpointDlg.h b/Source/Core/DolphinWX/Src/Debugger/BreakpointDlg.h
similarity index 100%
rename from Source/Core/DolphinWX/Src/BreakpointDlg.h
rename to Source/Core/DolphinWX/Src/Debugger/BreakpointDlg.h
diff --git a/Source/Core/DolphinWX/Src/BreakpointView.cpp b/Source/Core/DolphinWX/Src/Debugger/BreakpointView.cpp
similarity index 97%
rename from Source/Core/DolphinWX/Src/BreakpointView.cpp
rename to Source/Core/DolphinWX/Src/Debugger/BreakpointView.cpp
index 8d5fa6beab..395242a8bd 100644
--- a/Source/Core/DolphinWX/Src/BreakpointView.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/BreakpointView.cpp
@@ -27,9 +27,9 @@
#include "HW/Memmap.h"
extern "C" {
-#include "../resources/toolbar_add_breakpoint.c"
-#include "../resources/toolbar_add_memorycheck.c"
-#include "../resources/toolbar_debugger_delete.c"
+#include "../../resources/toolbar_add_breakpoint.c"
+#include "../../resources/toolbar_add_memorycheck.c"
+#include "../../resources/toolbar_debugger_delete.c"
}
diff --git a/Source/Core/DolphinWX/Src/BreakpointView.h b/Source/Core/DolphinWX/Src/Debugger/BreakpointView.h
similarity index 100%
rename from Source/Core/DolphinWX/Src/BreakpointView.h
rename to Source/Core/DolphinWX/Src/Debugger/BreakpointView.h
diff --git a/Source/Core/DolphinWX/Src/BreakpointWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp
similarity index 100%
rename from Source/Core/DolphinWX/Src/BreakpointWindow.cpp
rename to Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp
diff --git a/Source/Core/DolphinWX/Src/BreakpointWindow.h b/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.h
similarity index 100%
rename from Source/Core/DolphinWX/Src/BreakpointWindow.h
rename to Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.h
diff --git a/Source/Core/DolphinWX/Src/CodeView.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeView.cpp
similarity index 100%
rename from Source/Core/DolphinWX/Src/CodeView.cpp
rename to Source/Core/DolphinWX/Src/Debugger/CodeView.cpp
diff --git a/Source/Core/DolphinWX/Src/CodeView.h b/Source/Core/DolphinWX/Src/Debugger/CodeView.h
similarity index 100%
rename from Source/Core/DolphinWX/Src/CodeView.h
rename to Source/Core/DolphinWX/Src/Debugger/CodeView.h
diff --git a/Source/Core/DolphinWX/Src/CodeWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp
similarity index 98%
rename from Source/Core/DolphinWX/Src/CodeWindow.cpp
rename to Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp
index 4568c5d70d..798de4a952 100644
--- a/Source/Core/DolphinWX/Src/CodeWindow.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp
@@ -59,11 +59,11 @@
extern "C" // Bitmaps
{
- #include "../resources/toolbar_play.c"
- #include "../resources/toolbar_pause.c"
- #include "../resources/toolbar_add_memorycheck.c"
- #include "../resources/toolbar_debugger_delete.c"
- #include "../resources/toolbar_add_breakpoint.c"
+ #include "../../resources/toolbar_play.c"
+ #include "../../resources/toolbar_pause.c"
+ #include "../../resources/toolbar_add_memorycheck.c"
+ #include "../../resources/toolbar_debugger_delete.c"
+ #include "../../resources/toolbar_add_breakpoint.c"
}
class CPluginInfo;
diff --git a/Source/Core/DolphinWX/Src/CodeWindow.h b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.h
similarity index 100%
rename from Source/Core/DolphinWX/Src/CodeWindow.h
rename to Source/Core/DolphinWX/Src/Debugger/CodeWindow.h
diff --git a/Source/Core/DolphinWX/Src/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp
similarity index 98%
rename from Source/Core/DolphinWX/Src/CodeWindowFunctions.cpp
rename to Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp
index bca5714799..b62efa9cb1 100644
--- a/Source/Core/DolphinWX/Src/CodeWindowFunctions.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp
@@ -64,11 +64,11 @@
extern "C" // Bitmaps
{
- #include "../resources/toolbar_play.c"
- #include "../resources/toolbar_pause.c"
- #include "../resources/toolbar_add_memorycheck.c"
- #include "../resources/toolbar_debugger_delete.c"
- #include "../resources/toolbar_add_breakpoint.c"
+ #include "../../resources/toolbar_play.c"
+ #include "../../resources/toolbar_pause.c"
+ #include "../../resources/toolbar_add_memorycheck.c"
+ #include "../../resources/toolbar_debugger_delete.c"
+ #include "../../resources/toolbar_add_breakpoint.c"
}
// Save and load settings
diff --git a/Source/Core/DolphinWX/Src/DSPDebugWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.cpp
similarity index 100%
rename from Source/Core/DolphinWX/Src/DSPDebugWindow.cpp
rename to Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.cpp
diff --git a/Source/Core/DolphinWX/Src/DSPDebugWindow.h b/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h
similarity index 100%
rename from Source/Core/DolphinWX/Src/DSPDebugWindow.h
rename to Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h
diff --git a/Source/Core/DolphinWX/Src/DSPRegisterView.cpp b/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.cpp
similarity index 100%
rename from Source/Core/DolphinWX/Src/DSPRegisterView.cpp
rename to Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.cpp
diff --git a/Source/Core/DolphinWX/Src/DSPRegisterView.h b/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.h
similarity index 100%
rename from Source/Core/DolphinWX/Src/DSPRegisterView.h
rename to Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.h
diff --git a/Source/Core/DolphinWX/Src/DebuggerPanel.cpp b/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.cpp
similarity index 100%
rename from Source/Core/DolphinWX/Src/DebuggerPanel.cpp
rename to Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.cpp
diff --git a/Source/Core/DolphinWX/Src/DebuggerPanel.h b/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.h
similarity index 100%
rename from Source/Core/DolphinWX/Src/DebuggerPanel.h
rename to Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.h
diff --git a/Source/Core/DolphinWX/Src/DebuggerUIUtil.cpp b/Source/Core/DolphinWX/Src/Debugger/DebuggerUIUtil.cpp
similarity index 100%
rename from Source/Core/DolphinWX/Src/DebuggerUIUtil.cpp
rename to Source/Core/DolphinWX/Src/Debugger/DebuggerUIUtil.cpp
diff --git a/Source/Core/DolphinWX/Src/DebuggerUIUtil.h b/Source/Core/DolphinWX/Src/Debugger/DebuggerUIUtil.h
similarity index 100%
rename from Source/Core/DolphinWX/Src/DebuggerUIUtil.h
rename to Source/Core/DolphinWX/Src/Debugger/DebuggerUIUtil.h
diff --git a/Source/Core/DolphinWX/Src/JitWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/JitWindow.cpp
similarity index 100%
rename from Source/Core/DolphinWX/Src/JitWindow.cpp
rename to Source/Core/DolphinWX/Src/Debugger/JitWindow.cpp
diff --git a/Source/Core/DolphinWX/Src/JitWindow.h b/Source/Core/DolphinWX/Src/Debugger/JitWindow.h
similarity index 100%
rename from Source/Core/DolphinWX/Src/JitWindow.h
rename to Source/Core/DolphinWX/Src/Debugger/JitWindow.h
diff --git a/Source/Core/DolphinWX/Src/MemoryCheckDlg.cpp b/Source/Core/DolphinWX/Src/Debugger/MemoryCheckDlg.cpp
similarity index 100%
rename from Source/Core/DolphinWX/Src/MemoryCheckDlg.cpp
rename to Source/Core/DolphinWX/Src/Debugger/MemoryCheckDlg.cpp
diff --git a/Source/Core/DolphinWX/Src/MemoryCheckDlg.h b/Source/Core/DolphinWX/Src/Debugger/MemoryCheckDlg.h
similarity index 100%
rename from Source/Core/DolphinWX/Src/MemoryCheckDlg.h
rename to Source/Core/DolphinWX/Src/Debugger/MemoryCheckDlg.h
diff --git a/Source/Core/DolphinWX/Src/MemoryView.cpp b/Source/Core/DolphinWX/Src/Debugger/MemoryView.cpp
similarity index 100%
rename from Source/Core/DolphinWX/Src/MemoryView.cpp
rename to Source/Core/DolphinWX/Src/Debugger/MemoryView.cpp
diff --git a/Source/Core/DolphinWX/Src/MemoryView.h b/Source/Core/DolphinWX/Src/Debugger/MemoryView.h
similarity index 100%
rename from Source/Core/DolphinWX/Src/MemoryView.h
rename to Source/Core/DolphinWX/Src/Debugger/MemoryView.h
diff --git a/Source/Core/DolphinWX/Src/MemoryWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.cpp
similarity index 100%
rename from Source/Core/DolphinWX/Src/MemoryWindow.cpp
rename to Source/Core/DolphinWX/Src/Debugger/MemoryWindow.cpp
diff --git a/Source/Core/DolphinWX/Src/MemoryWindow.h b/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.h
similarity index 100%
rename from Source/Core/DolphinWX/Src/MemoryWindow.h
rename to Source/Core/DolphinWX/Src/Debugger/MemoryWindow.h
diff --git a/Source/Core/DolphinWX/Src/RegisterView.cpp b/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp
similarity index 100%
rename from Source/Core/DolphinWX/Src/RegisterView.cpp
rename to Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp
diff --git a/Source/Core/DolphinWX/Src/RegisterView.h b/Source/Core/DolphinWX/Src/Debugger/RegisterView.h
similarity index 100%
rename from Source/Core/DolphinWX/Src/RegisterView.h
rename to Source/Core/DolphinWX/Src/Debugger/RegisterView.h
diff --git a/Source/Core/DolphinWX/Src/RegisterWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/RegisterWindow.cpp
similarity index 100%
rename from Source/Core/DolphinWX/Src/RegisterWindow.cpp
rename to Source/Core/DolphinWX/Src/Debugger/RegisterWindow.cpp
diff --git a/Source/Core/DolphinWX/Src/RegisterWindow.h b/Source/Core/DolphinWX/Src/Debugger/RegisterWindow.h
similarity index 100%
rename from Source/Core/DolphinWX/Src/RegisterWindow.h
rename to Source/Core/DolphinWX/Src/Debugger/RegisterWindow.h
diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h
index ee313ed677..a75d34d733 100644
--- a/Source/Core/DolphinWX/Src/Frame.h
+++ b/Source/Core/DolphinWX/Src/Frame.h
@@ -29,7 +29,7 @@
#include
#include "CDUtils.h"
-#include "CodeWindow.h"
+#include "Debugger/CodeWindow.h"
#include "LogWindow.h"
#if defined(HAVE_X11) && HAVE_X11
#include "X11Utils.h"
diff --git a/Source/Core/DolphinWX/Src/LogWindow.cpp b/Source/Core/DolphinWX/Src/LogWindow.cpp
index e0181ea3ff..1bce5355e8 100644
--- a/Source/Core/DolphinWX/Src/LogWindow.cpp
+++ b/Source/Core/DolphinWX/Src/LogWindow.cpp
@@ -20,7 +20,7 @@
#include "Console.h"
#include "IniFile.h"
#include "FileUtil.h"
-#include "DebuggerUIUtil.h"
+#include "Debugger/DebuggerUIUtil.h"
#include
// Milliseconds between msgQueue flushes to wxTextCtrl
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index 6d61931d38..2e3cb98d02 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -36,8 +36,8 @@
#include "Globals.h" // Local
#include "Main.h"
#include "ConfigManager.h"
-#include "CodeWindow.h"
-#include "JitWindow.h"
+#include "Debugger/CodeWindow.h"
+#include "Debugger/JitWindow.h"
#include "ExtendedTrace.h"
#include "BootManager.h"
#include "Frame.h"
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index ac31d2a598..9bc35c3ec2 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -38,22 +38,22 @@ else:
'WiimoteConfigDiag.cpp',
'WXInputBase.cpp',
'WxUtils.cpp',
- 'BreakpointDlg.cpp',
- 'BreakpointView.cpp',
- 'BreakpointWindow.cpp',
- 'CodeView.cpp',
- 'CodeWindow.cpp',
- 'CodeWindowFunctions.cpp',
- 'DebuggerPanel.cpp',
- 'DebuggerUIUtil.cpp',
- 'DSPDebugWindow.cpp',
- 'DSPRegisterView.cpp',
- 'JitWindow.cpp',
- 'MemoryCheckDlg.cpp',
- 'MemoryView.cpp',
- 'MemoryWindow.cpp',
- 'RegisterView.cpp',
- 'RegisterWindow.cpp',
+ 'Debugger/BreakpointDlg.cpp',
+ 'Debugger/BreakpointView.cpp',
+ 'Debugger/BreakpointWindow.cpp',
+ 'Debugger/CodeView.cpp',
+ 'Debugger/CodeWindow.cpp',
+ 'Debugger/CodeWindowFunctions.cpp',
+ 'Debugger/DebuggerPanel.cpp',
+ 'Debugger/DebuggerUIUtil.cpp',
+ 'Debugger/DSPDebugWindow.cpp',
+ 'Debugger/DSPRegisterView.cpp',
+ 'Debugger/JitWindow.cpp',
+ 'Debugger/MemoryCheckDlg.cpp',
+ 'Debugger/MemoryView.cpp',
+ 'Debugger/MemoryWindow.cpp',
+ 'Debugger/RegisterView.cpp',
+ 'Debugger/RegisterWindow.cpp',
'VideoConfigDiag.cpp',
]
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp
index 8a6dbf25d8..df379da6e2 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp
@@ -31,7 +31,7 @@
#include "VertexShaderManager.h"
#include "Core.h"
-#include "DebuggerPanel.h"
+#include "Debugger/DebuggerPanel.h"
#include "DLCache.h"
#include "EmuWindow.h"
#include "FileUtil.h"
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
index 9fd369078a..1b72e26d91 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
@@ -25,7 +25,7 @@
#endif // HAVE_WX
#if defined(HAVE_WX) && HAVE_WX
-#include "DebuggerPanel.h"
+#include "Debugger/DebuggerPanel.h"
#endif // HAVE_WX
#include "MainBase.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
index 46da5f7353..0174f044c1 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
@@ -63,7 +63,7 @@ Make AA apply instantly during gameplay if possible
#if defined(HAVE_WX) && HAVE_WX
#include "VideoConfigDiag.h"
-#include "DebuggerPanel.h"
+#include "Debugger/DebuggerPanel.h"
#endif // HAVE_WX
#include "MainBase.h"