Finish Linux x86_64 build
This commit is contained in:
@@ -15,7 +15,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modul
|
||||
include(DownloadExternals)
|
||||
include(CMakeDependentOption)
|
||||
|
||||
project(citra LANGUAGES C CXX ASM)
|
||||
project(Lucina3DS LANGUAGES C CXX ASM)
|
||||
|
||||
# Some submodules like to pick their own default build type if not specified.
|
||||
# Make sure we default to Release build type always, unless the generator has custom types.
|
||||
@@ -88,12 +88,12 @@ option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
|
||||
# Compile options
|
||||
CMAKE_DEPENDENT_OPTION(COMPILE_WITH_DWARF "Add DWARF debugging information" ${IS_DEBUG_BUILD} "MINGW" OFF)
|
||||
option(ENABLE_LTO "Enable link time optimization" ${DEFAULT_ENABLE_LTO})
|
||||
option(CITRA_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
|
||||
option(CITRA_WARNINGS_AS_ERRORS "Enable warnings as errors" ON)
|
||||
option(LUCINA3DS_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
|
||||
option(LUCINA3DS_WARNINGS_AS_ERRORS "Enable warnings as errors" ON)
|
||||
|
||||
include(CitraHandleSystemLibs)
|
||||
|
||||
if (CITRA_USE_PRECOMPILED_HEADERS)
|
||||
if (LUCINA3DS_USE_PRECOMPILED_HEADERS)
|
||||
message(STATUS "Using Precompiled Headers.")
|
||||
set(CMAKE_PCH_INSTANTIATE_TEMPLATES ON)
|
||||
|
||||
@@ -434,11 +434,11 @@ add_subdirectory(src)
|
||||
add_subdirectory(dist/installer)
|
||||
|
||||
|
||||
# Set citra-qt project or citra project as default StartUp Project in Visual Studio depending on whether QT is enabled or not
|
||||
# Set lucina3ds-qt project or lucina3ds project as default StartUp Project in Visual Studio depending on whether QT is enabled or not
|
||||
if(ENABLE_QT)
|
||||
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT citra-qt)
|
||||
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT lucina3ds-qt)
|
||||
else()
|
||||
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT citra)
|
||||
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT lucina3ds)
|
||||
endif()
|
||||
|
||||
# Create target for outputting distributable bundles.
|
||||
@@ -446,13 +446,13 @@ endif()
|
||||
if (NOT ANDROID AND NOT IOS)
|
||||
include(BundleTarget)
|
||||
if (ENABLE_SDL2_FRONTEND)
|
||||
bundle_target(citra)
|
||||
bundle_target(lucina3ds)
|
||||
endif()
|
||||
if (ENABLE_QT)
|
||||
bundle_target(citra-qt)
|
||||
bundle_target(lucina3ds-qt)
|
||||
endif()
|
||||
if (ENABLE_DEDICATED_ROOM)
|
||||
bundle_target(citra-room)
|
||||
bundle_target(lucina3ds-room)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -464,22 +464,22 @@ endif()
|
||||
# http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
|
||||
# http://standards.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html
|
||||
if(ENABLE_QT AND UNIX AND NOT APPLE)
|
||||
install(FILES "${PROJECT_SOURCE_DIR}/dist/citra-qt.desktop"
|
||||
install(FILES "${PROJECT_SOURCE_DIR}/dist/lucina3ds-qt.desktop"
|
||||
DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
|
||||
install(FILES "${PROJECT_SOURCE_DIR}/dist/citra.svg"
|
||||
install(FILES "${PROJECT_SOURCE_DIR}/dist/lucina3ds.svg"
|
||||
DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps")
|
||||
install(FILES "${PROJECT_SOURCE_DIR}/dist/citra.xml"
|
||||
install(FILES "${PROJECT_SOURCE_DIR}/dist/lucina3ds.xml"
|
||||
DESTINATION "${CMAKE_INSTALL_PREFIX}/share/mime/packages")
|
||||
endif()
|
||||
|
||||
if(UNIX)
|
||||
if(ENABLE_SDL2)
|
||||
install(FILES "${PROJECT_SOURCE_DIR}/dist/citra.6"
|
||||
install(FILES "${PROJECT_SOURCE_DIR}/dist/lucina3ds.6"
|
||||
DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man6")
|
||||
endif()
|
||||
|
||||
if (ENABLE_QT)
|
||||
install(FILES "${PROJECT_SOURCE_DIR}/dist/citra-qt.6"
|
||||
install(FILES "${PROJECT_SOURCE_DIR}/dist/lucina3ds-qt.6"
|
||||
DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man6")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user