diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1e1245160..2b106fc2b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,10 +5,10 @@ add_subdirectory(common) add_subdirectory(core) add_subdirectory(video_core) add_subdirectory(audio_core) -add_subdirectory(tests) -if (ENABLE_SDL2) - add_subdirectory(citra) -endif() +# add_subdirectory(tests) +# if (ENABLE_SDL2) +# add_subdirectory(citra) +# endif() if (ENABLE_QT) add_subdirectory(citra_qt) endif() diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt index e97d33da4..6365d7987 100644 --- a/src/citra_qt/CMakeLists.txt +++ b/src/citra_qt/CMakeLists.txt @@ -99,7 +99,7 @@ else() add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS}) endif() target_link_libraries(citra-qt core video_core audio_core common qhexedit) -target_link_libraries(citra-qt ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS}) +target_link_libraries(citra-qt opengl32 ${CITRA_QT_LIBS}) target_link_libraries(citra-qt ${PLATFORM_LIBRARIES} Threads::Threads) if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|OpenBSD|NetBSD") diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 6dddde9ba..8dd89b929 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -11,7 +11,7 @@ #include "citra_qt/bootmanager.h" #include "common/key_map.h" -#include "common/microprofile.h" +//#include "common/microprofile.h" #include "common/scm_rev.h" #include "common/string_util.h" @@ -34,7 +34,7 @@ EmuThread::EmuThread(GRenderWindow* render_window) : void EmuThread::run() { render_window->MakeCurrent(); - MicroProfileOnThreadCreate("EmuThread"); + //MicroProfileOnThreadCreate("EmuThread"); stop_run = false; diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 35cbee545..18916f227 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -36,7 +36,7 @@ #include "citra_qt/debugger/ramview.h" #include "citra_qt/debugger/registers.h" -#include "common/microprofile.h" +//#include "common/microprofile.h" #include "common/platform.h" #include "common/scm_rev.h" #include "common/scope_exit.h"