Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dolphin-emu/dolphin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 083f7614c7aa68d4887c8deb3ec175482814b0a5
Choose a base ref
..
head repository: dolphin-emu/dolphin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c5cf28c440805e1b0905385e35bc1575cb90ee27
Choose a head ref
Showing with 18 additions and 2 deletions.
  1. +6 −1 CMakeLists.txt
  2. +8 −0 Externals/SteamRuntimeQt/CMakeLists.txt
  3. +4 −1 Source/Core/DolphinQt/CMakeLists.txt
7 changes: 6 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -837,7 +837,12 @@ if(USE_DISCORD_PRESENCE)
include_directories(Externals/discord-rpc/include)
endif()

if(NOT ENABLE_QT)
if(ENABLE_QT)
if(STEAM_RUNTIME)
message(STATUS "Using Qt for Steam Runtime from Externals")
add_subdirectory(Externals/SteamRuntimeQt)
endif()
else()
set(USE_MGBA 0)
endif()
if(USE_MGBA)
8 changes: 8 additions & 0 deletions Externals/SteamRuntimeQt/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
include(FetchContent)

FetchContent_Declare(SteamRuntimeQt
GIT_REPOSITORY https://github.com/OatmealDome/ext-steam-runtime-qt.git
GIT_TAG "5.12.2"
)

FetchContent_Populate(SteamRuntimeQt)
5 changes: 4 additions & 1 deletion Source/Core/DolphinQt/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
include(FetchContent)

if (NOT Qt5_DIR AND MSVC)
if(_M_ARM_64)
set(Qt5_DIR "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt5.15.0/msvc2019_arm64/lib/cmake/Qt5")
else()
set(Qt5_DIR "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt5.15.0/msvc2019_64/lib/cmake/Qt5")
endif()
elseif (STEAM_RUNTIME)
set(Qt5_DIR "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt5.15.2/steamrt_x86-64/lib/cmake/Qt5")
FetchContent_GetProperties(SteamRuntimeQt SOURCE_DIR SteamRuntimeQt_SOURCE_DIR)
set(Qt5_DIR "${SteamRuntimeQt_SOURCE_DIR}/Qt5.15.2/steamrt_x86-64/lib/cmake/Qt5")
endif()

find_package(Qt5 5.9 REQUIRED COMPONENTS Gui Widgets)