piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-06-28 01:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use Qt 6 by default on all platforms and update build instructions (#2187)

Browse Source
This commit is contained in:
Nadia Holmquist Pedersen
2024-11-05 17:03:07 +01:00
committed by GitHub
parent d8f1d106f0
commit 5959009ebd
6 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/ConfigureVcpkg.cmake
View File

@ -19,11 +19,7 @@ set(VCPKG_OVERLAY_TRIPLETS "${CMAKE_SOURCE_DIR}/cmake/overlay-triplets")
option(USE_RECOMMENDED_TRIPLETS "Use the recommended triplets that are used for official builds" ON)
# Duplicated here because it needs to be set before project()
if (NOT WIN32)
option(USE_QT6 "Build using Qt 6 instead of 5" ON)
else()
option(USE_QT6 "Build using Qt 6 instead of 5" OFF)
endif()
option(USE_QT6 "Use Qt 6 instead of Qt 5" ON)
# Since the Linux build pulls in glib anyway, we can just use upstream libslirp
if (UNIX AND NOT APPLE)