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

CMake: Fix building ARM64 on Windows

Browse Source
This commit is contained in:
spycrab
2020-02-12 00:07:56 +01:00
parent a9dc4ac3f0
commit 213a9adcff
6 changed files with 72 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/Arm64Emitter.cpp
View File

@ -15,6 +15,10 @@
#include "Common/CommonTypes.h"
#include "Common/MathUtil.h"
#ifdef _WIN32
#include <Windows.h>
#endif
namespace Arm64Gen
{
namespace

4
Source/Core/Common/CMakeLists.txt
View File

@ -156,9 +156,11 @@ elseif(WIN32)
PRIVATE
kernel32.lib
shlwapi.lib
opengl32.lib
winmm.lib
)
if (_M_X86_64)
target_link_libraries(common PRIVATE opengl32.lib)
endif()
endif()
if(ANDROID)

6
Source/Core/Common/Hash.cpp
View File

@ -11,9 +11,13 @@
#include "Common/CommonFuncs.h"
#include "Common/Intrinsics.h"
#if defined(_M_ARM_64) && !defined(_MSC_VER)
#ifdef _M_ARM_64
#ifdef _MSC_VER
#include <intrin.h>
#else
#include <arm_acle.h>
#endif
#endif
namespace Common
{

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

@ -296,6 +296,14 @@ PRIVATE
imgui
)
if (WIN32)
target_link_libraries(dolphin-emu
PRIVATE
gdi32.lib
shell32.lib
)
endif()
if(WIN32)
target_sources(dolphin-emu PRIVATE DolphinQt.manifest DolphinQt.rc)