diff --git a/src/audio/CMakeLists.txt b/src/audio/CMakeLists.txt index a240477b..b78de255 100644 --- a/src/audio/CMakeLists.txt +++ b/src/audio/CMakeLists.txt @@ -7,12 +7,6 @@ add_library(CemuAudio set_property(TARGET CemuAudio PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") -# move these to UI folder -target_sources(CemuAudio PRIVATE - audioDebuggerWindow.cpp - audioDebuggerWindow.h -) - if(WIN32) target_sources(CemuAudio PRIVATE DirectSoundAPI.cpp @@ -48,8 +42,3 @@ if(ENABLE_CUBEB) # PUBLIC because cubeb.h/cubeb.h is included in CubebAPI.h target_link_libraries(CemuAudio PUBLIC cubeb::cubeb) endif() - -if (ENABLE_WXWIDGETS) - # PUBLIC because wx/wx.h is included in audioDebuggerWindow.h - target_link_libraries(CemuAudio PUBLIC wx::base wx::core) -endif() diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 90dc91c0..a1572c13 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -22,6 +22,8 @@ add_library(CemuGui components/wxLogCtrl.h components/wxTitleManagerList.cpp components/wxTitleManagerList.h + debugger/AudioDebuggerWindow.cpp + debugger/AudioDebuggerWindow.h debugger/BreakpointWindow.cpp debugger/BreakpointWindow.h debugger/DebuggerWindow2.cpp diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 7fe4ec54..852e32a7 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -9,7 +9,6 @@ #include "gui/PadViewFrame.h" #include "gui/windows/TextureRelationViewer/TextureRelationWindow.h" #include "gui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.h" -#include "audio/audioDebuggerWindow.h" #include "gui/canvas/OpenGLCanvas.h" #include "gui/canvas/VulkanCanvas.h" #include "Cafe/OS/libs/nn_nfp/nn_nfp.h" @@ -17,6 +16,7 @@ #include "Cafe/IOSU/legacy/iosu_crypto.h" #include "Cafe/GameProfile/GameProfile.h" #include "gui/debugger/DebuggerWindow2.h" +#include "gui/debugger/AudioDebuggerWindow.h" #include "util/helpers/helpers.h" #include "config/CemuConfig.h" #include "Cemu/DiscordPresence/DiscordPresence.h" diff --git a/src/audio/audioDebuggerWindow.cpp b/src/gui/debugger/AudioDebuggerWindow.cpp similarity index 99% rename from src/audio/audioDebuggerWindow.cpp rename to src/gui/debugger/AudioDebuggerWindow.cpp index 41107820..d082630e 100644 --- a/src/audio/audioDebuggerWindow.cpp +++ b/src/gui/debugger/AudioDebuggerWindow.cpp @@ -1,5 +1,5 @@ #include "gui/wxgui.h" -#include "audioDebuggerWindow.h" +#include "gui/debugger/AudioDebuggerWindow.h" #include "Cafe/OS/libs/snd_core/ax.h" #include "Cafe/OS/libs/snd_core/ax_internal.h" diff --git a/src/audio/audioDebuggerWindow.h b/src/gui/debugger/AudioDebuggerWindow.h similarity index 100% rename from src/audio/audioDebuggerWindow.h rename to src/gui/debugger/AudioDebuggerWindow.h