diff --git a/3rdparty/winpixeventruntime/CMakeLists.txt b/3rdparty/winpixeventruntime/CMakeLists.txt index 785f83370c..30dbd8ffad 100644 --- a/3rdparty/winpixeventruntime/CMakeLists.txt +++ b/3rdparty/winpixeventruntime/CMakeLists.txt @@ -1,5 +1,13 @@ add_library(WinPixEventRuntime::WinPixEventRuntime UNKNOWN IMPORTED GLOBAL) -set_target_properties(WinPixEventRuntime::WinPixEventRuntime PROPERTIES - IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/lib/WinPixEventRuntime.lib" - INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include" -) + +if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64") + set_target_properties(WinPixEventRuntime::WinPixEventRuntime PROPERTIES + IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/libarm64/WinPixEventRuntime.lib" + INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include" + ) +else() + set_target_properties(WinPixEventRuntime::WinPixEventRuntime PROPERTIES + IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/lib/WinPixEventRuntime.lib" + INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include" + ) +endif() diff --git a/3rdparty/winpixeventruntime/WinPixEventRuntime.props b/3rdparty/winpixeventruntime/WinPixEventRuntime.props index 8f5272bcfe..4ae8c34bc0 100644 --- a/3rdparty/winpixeventruntime/WinPixEventRuntime.props +++ b/3rdparty/winpixeventruntime/WinPixEventRuntime.props @@ -1,19 +1,22 @@ - $(SolutionDir)bin\ + $(SolutionDir)bin\ + $(SolutionDir)bin-arm64\ $(SolutionDir)3rdparty\winpixeventruntime\ $(WinPixEventRuntimeDir)include;%(AdditionalIncludeDirectories) - - $(WinPixEventRuntimeDir)lib;%(AdditionalLibraryDirectories) + + $(WinPixEventRuntimeDir)lib;%(AdditionalLibraryDirectories) + $(WinPixEventRuntimeDir)libarm64;%(AdditionalLibraryDirectories) WinPixEventRuntime.lib;%(AdditionalDependencies) - - $(WinPixEventRuntimeDir)lib;%(AdditionalLibraryDirectories) + + $(WinPixEventRuntimeDir)lib;%(AdditionalLibraryDirectories) + $(WinPixEventRuntimeDir)libarm64;%(AdditionalLibraryDirectories) WinPixEventRuntime.lib;%(AdditionalDependencies) @@ -21,10 +24,10 @@ + diff --git a/3rdparty/winpixeventruntime/binarm64/WinPixEventRuntime.dll b/3rdparty/winpixeventruntime/binarm64/WinPixEventRuntime.dll new file mode 100644 index 0000000000..236c67baec Binary files /dev/null and b/3rdparty/winpixeventruntime/binarm64/WinPixEventRuntime.dll differ diff --git a/3rdparty/winpixeventruntime/libarm64/WinPixEventRuntime.lib b/3rdparty/winpixeventruntime/libarm64/WinPixEventRuntime.lib new file mode 100644 index 0000000000..fc17386b4a Binary files /dev/null and b/3rdparty/winpixeventruntime/libarm64/WinPixEventRuntime.lib differ