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

Fixup: error in CMake from rebase

Browse Source
This commit is contained in:
B3n30 2017-08-30 11:01:22 +02:00
parent 4c06dd953a
commit 38d79c56b9
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/CMakeLists.txt
View File

@ -386,11 +386,11 @@ set(HEADERS
telemetry_session.h telemetry_session.h
) )
set(SYSTEM_ARCHIVES create_directory_groups(${SRCS} ${HEADERS})
../../dist/shared_font.app.romfs.h add_library(core STATIC ${SRCS} ${HEADERS})
) if (ENABLE_CUSTOM_SYSTEM_ARCHIVES)
create_directory_groups(${SRCS} ${HEADERS} ${SYSTEM_ARCHIVES}) target_include_directories(core INTERFACE "${CUSTOM_ARCHIVES_PREFIX}")
add_library(core STATIC ${SRCS} ${HEADERS} ${SYSTEM_ARCHIVES}) endif()
target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core) target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core)
target_link_libraries(core PUBLIC Boost::boost PRIVATE cryptopp dynarmic fmt) target_link_libraries(core PUBLIC Boost::boost PRIVATE cryptopp dynarmic fmt)
if (ENABLE_WEB_SERVICE) if (ENABLE_WEB_SERVICE)

1
src/core/core.cpp
View File

@ -228,7 +228,6 @@ void System::SystemIntegrityCheck() {
if (file->IsOpen()) { if (file->IsOpen()) {
file->Close(); file->Close();
LOG_INFO(Core, "SystemCheck: Shared Font(legacy) exists."); LOG_INFO(Core, "SystemCheck: Shared Font(legacy) exists.");
return true;
} else { } else {
LOG_ERROR(Core, "SystemCheck: Shared Font missing."); LOG_ERROR(Core, "SystemCheck: Shared Font missing.");
system_integrity = static_cast<Integrity>(system_integrity | Integrity::SharedFont); system_integrity = static_cast<Integrity>(system_integrity | Integrity::SharedFont);