piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11506 from phire/cmake_fixes

Browse Source 
CMake/MSVC fixes
This commit is contained in:
Scott Mansell
2023-01-31 23:53:31 +13:00
committed by GitHub
parent 12431a83ba 5d7643a680
commit c6b851c2b6
7 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Common/WindowsRegistry.h
View File

@ -1,6 +1,9 @@
#pragma once
#include <Windows.h>
#include <string>
#include "Common/CommonTypes.h"
namespace WindowsRegistry
{

2
Source/Core/Common/x64CPUDetect.cpp
View File

@ -4,9 +4,11 @@
#include "Common/CPUDetect.h"
#ifdef _WIN32
#include <windows.h>
#include <processthreadsapi.h>
#endif
#include <algorithm>
#include <cstring>
#include <string>
#include <thread>

6
Source/Core/DolphinQt/CMakeLists.txt
View File

@ -3,11 +3,11 @@ if(POLICY CMP0084)
cmake_policy(SET CMP0084 NEW)
endif()
if (NOT QT_DIR AND MSVC)
if (MSVC)
if(_M_ARM_64)
set(QT_DIR "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.3.0/ARM64/lib/cmake/Qt6")
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.3.0/ARM64")
else()
set(QT_DIR "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.3.0/x64/lib/cmake/Qt6")
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.3.0/x64")
endif()
endif()