From 817129328bdd00cc27320716770cc14de662451b Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Sat, 2 Sep 2023 13:38:26 +1000
Subject: [PATCH] dep: Move WinPixEventRuntime to root

---
 dep/winpixeventruntime/CMakeLists.txt              |  13 +++++++++++++
 .../winpixeventruntime/WinPixEventRuntime.props    |   2 +-
 .../bin64/WinPixEventRuntime.dll                   | Bin
 .../binarm64/WinPixEventRuntime.dll                | Bin
 .../include/WinPixEventRuntime/PIXEvents.h         |   0
 .../include/WinPixEventRuntime/PIXEventsCommon.h   |   0
 .../include/WinPixEventRuntime/pix3.h              |   0
 .../include/WinPixEventRuntime/pix3_win.h          |   0
 .../lib64/WinPixEventRuntime.lib                   | Bin
 .../libarm64/WinPixEventRuntime.lib                | Bin
 src/util/util.props                                |   2 +-
 11 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 dep/winpixeventruntime/CMakeLists.txt
 rename dep/{msvc => }/winpixeventruntime/WinPixEventRuntime.props (95%)
 rename dep/{msvc => }/winpixeventruntime/bin64/WinPixEventRuntime.dll (100%)
 rename dep/{msvc => }/winpixeventruntime/binarm64/WinPixEventRuntime.dll (100%)
 rename dep/{msvc => }/winpixeventruntime/include/WinPixEventRuntime/PIXEvents.h (100%)
 rename dep/{msvc => }/winpixeventruntime/include/WinPixEventRuntime/PIXEventsCommon.h (100%)
 rename dep/{msvc => }/winpixeventruntime/include/WinPixEventRuntime/pix3.h (100%)
 rename dep/{msvc => }/winpixeventruntime/include/WinPixEventRuntime/pix3_win.h (100%)
 rename dep/{msvc => }/winpixeventruntime/lib64/WinPixEventRuntime.lib (100%)
 rename dep/{msvc => }/winpixeventruntime/libarm64/WinPixEventRuntime.lib (100%)

diff --git a/dep/winpixeventruntime/CMakeLists.txt b/dep/winpixeventruntime/CMakeLists.txt
new file mode 100644
index 000000000..fd4957b82
--- /dev/null
+++ b/dep/winpixeventruntime/CMakeLists.txt
@@ -0,0 +1,13 @@
+add_library(WinPixEventRuntime::WinPixEventRuntime UNKNOWN IMPORTED GLOBAL)
+
+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}/lib64/WinPixEventRuntime.lib"
+    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include"
+  )
+endif()
diff --git a/dep/msvc/winpixeventruntime/WinPixEventRuntime.props b/dep/winpixeventruntime/WinPixEventRuntime.props
similarity index 95%
rename from dep/msvc/winpixeventruntime/WinPixEventRuntime.props
rename to dep/winpixeventruntime/WinPixEventRuntime.props
index caea8f719..59c8acd6f 100644
--- a/dep/msvc/winpixeventruntime/WinPixEventRuntime.props
+++ b/dep/winpixeventruntime/WinPixEventRuntime.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
     <BinaryOutputDir>$(SolutionDir)bin\$(Platform)\</BinaryOutputDir>
-    <WinPixEventRuntimeDir>$(SolutionDir)dep\msvc\winpixeventruntime\</WinPixEventRuntimeDir>
+    <WinPixEventRuntimeDir>$(SolutionDir)dep\winpixeventruntime\</WinPixEventRuntimeDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
diff --git a/dep/msvc/winpixeventruntime/bin64/WinPixEventRuntime.dll b/dep/winpixeventruntime/bin64/WinPixEventRuntime.dll
similarity index 100%
rename from dep/msvc/winpixeventruntime/bin64/WinPixEventRuntime.dll
rename to dep/winpixeventruntime/bin64/WinPixEventRuntime.dll
diff --git a/dep/msvc/winpixeventruntime/binarm64/WinPixEventRuntime.dll b/dep/winpixeventruntime/binarm64/WinPixEventRuntime.dll
similarity index 100%
rename from dep/msvc/winpixeventruntime/binarm64/WinPixEventRuntime.dll
rename to dep/winpixeventruntime/binarm64/WinPixEventRuntime.dll
diff --git a/dep/msvc/winpixeventruntime/include/WinPixEventRuntime/PIXEvents.h b/dep/winpixeventruntime/include/WinPixEventRuntime/PIXEvents.h
similarity index 100%
rename from dep/msvc/winpixeventruntime/include/WinPixEventRuntime/PIXEvents.h
rename to dep/winpixeventruntime/include/WinPixEventRuntime/PIXEvents.h
diff --git a/dep/msvc/winpixeventruntime/include/WinPixEventRuntime/PIXEventsCommon.h b/dep/winpixeventruntime/include/WinPixEventRuntime/PIXEventsCommon.h
similarity index 100%
rename from dep/msvc/winpixeventruntime/include/WinPixEventRuntime/PIXEventsCommon.h
rename to dep/winpixeventruntime/include/WinPixEventRuntime/PIXEventsCommon.h
diff --git a/dep/msvc/winpixeventruntime/include/WinPixEventRuntime/pix3.h b/dep/winpixeventruntime/include/WinPixEventRuntime/pix3.h
similarity index 100%
rename from dep/msvc/winpixeventruntime/include/WinPixEventRuntime/pix3.h
rename to dep/winpixeventruntime/include/WinPixEventRuntime/pix3.h
diff --git a/dep/msvc/winpixeventruntime/include/WinPixEventRuntime/pix3_win.h b/dep/winpixeventruntime/include/WinPixEventRuntime/pix3_win.h
similarity index 100%
rename from dep/msvc/winpixeventruntime/include/WinPixEventRuntime/pix3_win.h
rename to dep/winpixeventruntime/include/WinPixEventRuntime/pix3_win.h
diff --git a/dep/msvc/winpixeventruntime/lib64/WinPixEventRuntime.lib b/dep/winpixeventruntime/lib64/WinPixEventRuntime.lib
similarity index 100%
rename from dep/msvc/winpixeventruntime/lib64/WinPixEventRuntime.lib
rename to dep/winpixeventruntime/lib64/WinPixEventRuntime.lib
diff --git a/dep/msvc/winpixeventruntime/libarm64/WinPixEventRuntime.lib b/dep/winpixeventruntime/libarm64/WinPixEventRuntime.lib
similarity index 100%
rename from dep/msvc/winpixeventruntime/libarm64/WinPixEventRuntime.lib
rename to dep/winpixeventruntime/libarm64/WinPixEventRuntime.lib
diff --git a/src/util/util.props b/src/util/util.props
index eb902332f..35d993262 100644
--- a/src/util/util.props
+++ b/src/util/util.props
@@ -21,5 +21,5 @@
   </ItemDefinitionGroup>
 
   <Import Project="..\..\dep\msvc\vsprops\SDL2Compile.props" />
-  <Import Project="..\..\dep\msvc\winpixeventruntime\WinPixEventRuntime.props" />
+  <Import Project="..\..\dep\winpixeventruntime\WinPixEventRuntime.props" />
 </Project>