OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-25 17:30:16 +00:00
Code Issues Projects Releases Wiki Activity

hack for my fucking msys

Browse Source
This commit is contained in:
wwylele 2016-09-04 17:30:13 +08:00
parent b77d510699
commit 90a1624f8e
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/CMakeLists.txt
View File

@ -5,10 +5,10 @@ add_subdirectory(common)
add_subdirectory(core) add_subdirectory(core)
add_subdirectory(video_core) add_subdirectory(video_core)
add_subdirectory(audio_core) add_subdirectory(audio_core)
add_subdirectory(tests) # add_subdirectory(tests)
if (ENABLE_SDL2) # if (ENABLE_SDL2)
add_subdirectory(citra) # add_subdirectory(citra)
endif() # endif()
if (ENABLE_QT) if (ENABLE_QT)
add_subdirectory(citra_qt) add_subdirectory(citra_qt)
endif() endif()

2
src/citra_qt/CMakeLists.txt
View File

@ -99,7 +99,7 @@ else()
add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS}) add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS})
endif() endif()
target_link_libraries(citra-qt core video_core audio_core common qhexedit) 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) target_link_libraries(citra-qt ${PLATFORM_LIBRARIES} Threads::Threads)
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|OpenBSD|NetBSD") if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|OpenBSD|NetBSD")

4
src/citra_qt/bootmanager.cpp
View File

@ -11,7 +11,7 @@
#include "citra_qt/bootmanager.h" #include "citra_qt/bootmanager.h"
#include "common/key_map.h" #include "common/key_map.h"
#include "common/microprofile.h" //#include "common/microprofile.h"
#include "common/scm_rev.h" #include "common/scm_rev.h"
#include "common/string_util.h" #include "common/string_util.h"
@ -34,7 +34,7 @@ EmuThread::EmuThread(GRenderWindow* render_window) :
void EmuThread::run() { void EmuThread::run() {
render_window->MakeCurrent(); render_window->MakeCurrent();
MicroProfileOnThreadCreate("EmuThread"); //MicroProfileOnThreadCreate("EmuThread");
stop_run = false; stop_run = false;

2
src/citra_qt/main.cpp
View File

@ -36,7 +36,7 @@
#include "citra_qt/debugger/ramview.h" #include "citra_qt/debugger/ramview.h"
#include "citra_qt/debugger/registers.h" #include "citra_qt/debugger/registers.h"
#include "common/microprofile.h" //#include "common/microprofile.h"
#include "common/platform.h" #include "common/platform.h"
#include "common/scm_rev.h" #include "common/scm_rev.h"
#include "common/scope_exit.h" #include "common/scope_exit.h"