diff options
| author | Connor McLaughlin <stenzek@gmail.com> | 2020-01-12 15:34:40 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-12 15:34:40 +1000 |
| commit | 1701363854b4a42cc71ecff23eecde7c042a812e (patch) | |
| tree | 08cf425c4990368d84c5b988f1fb9ff9e8e3941f /Source/Core | |
| parent | c48427657481d87bc276d048c8689de443ba732f (diff) | |
| parent | d8b2be9d061420201ba27165380eb2863d74c3ea (diff) | |
Merge pull request #8547 from stenzek/windows-arm64-qt
DolphinQt: Support compiling on ARM64
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinQt/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Source/Core/DolphinQt/DolphinQt.vcxproj | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index f76bf69770..4596b9ff15 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -1,5 +1,9 @@ if (NOT Qt5_DIR AND MSVC) -set(Qt5_DIR "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt5.13.1/5.13.1/msvc2017_64/lib/cmake/Qt5") + if(_M_ARM_64) + set(Qt5_DIR "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt5.13.1/5.13.1/msvc2017_64/lib/cmake/Qt5") + else() + set(Qt5_DIR "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt5.13.2/5.13.2/msvc2017_arm64/lib/cmake/Qt5") + endif() endif() find_package(Qt5 5.9 REQUIRED COMPONENTS Gui Widgets) diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj index 92a3be2edd..a22f267982 100644 --- a/Source/Core/DolphinQt/DolphinQt.vcxproj +++ b/Source/Core/DolphinQt/DolphinQt.vcxproj @@ -54,9 +54,10 @@ </ItemDefinitionGroup> <ItemDefinitionGroup> <Link> - <AdditionalLibraryDirectories>$(ExternalsDir)ffmpeg\lib;$(IntDir)..\discord-rpc\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalDependencies>avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;rpcrt4.lib;comctl32.lib;Shlwapi.lib;discord-rpc.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalLibraryDirectories>$(IntDir)..\discord-rpc\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalDependencies Condition="'$(Platform)'=='x64'">opengl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">$(ExternalsDir)ffmpeg\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> <ClCompile> <AdditionalIncludeDirectories>$(ProjectDir)VideoInterface;$(ProjectDir)GameList;$(ProjectDir)Debugger;$(ProjectDir)Settings;$(ProjectDir)Config;$(ProjectDir)Config\Mapping;$(ProjectDir)Config\Graphics;$(ProjectDir)Config\ControllerInterface;$(ProjectDir)NetPlay;$(ProjectDir)QtUtils;$(ProjectDir)TAS;$(ProjectDir)FIFO;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |