dep: Move WinPixEventRuntime to root

stenzek · Sep 2, 2023 · 8171293 · 8171293
1 parent 203e71f
commit 8171293
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 2 deletions.
diff --git a/dep/winpixeventruntime/CMakeLists.txt 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/...npixeventruntime/WinPixEventRuntime.props → ...npixeventruntime/WinPixEventRuntime.props b/...npixeventruntime/WinPixEventRuntime.props → ...npixeventruntime/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/...eventruntime/bin64/WinPixEventRuntime.dll → ...eventruntime/bin64/WinPixEventRuntime.dll b/...eventruntime/bin64/WinPixEventRuntime.dll → ...eventruntime/bin64/WinPixEventRuntime.dll
diff --git a/...ntruntime/binarm64/WinPixEventRuntime.dll → ...ntruntime/binarm64/WinPixEventRuntime.dll b/...ntruntime/binarm64/WinPixEventRuntime.dll → ...ntruntime/binarm64/WinPixEventRuntime.dll
diff --git a/...me/include/WinPixEventRuntime/PIXEvents.h → ...me/include/WinPixEventRuntime/PIXEvents.h b/...me/include/WinPixEventRuntime/PIXEvents.h → ...me/include/WinPixEventRuntime/PIXEvents.h
diff --git a/...lude/WinPixEventRuntime/PIXEventsCommon.h → ...lude/WinPixEventRuntime/PIXEventsCommon.h b/...lude/WinPixEventRuntime/PIXEventsCommon.h → ...lude/WinPixEventRuntime/PIXEventsCommon.h
diff --git a/...runtime/include/WinPixEventRuntime/pix3.h → ...runtime/include/WinPixEventRuntime/pix3.h b/...runtime/include/WinPixEventRuntime/pix3.h → ...runtime/include/WinPixEventRuntime/pix3.h
diff --git a/...ime/include/WinPixEventRuntime/pix3_win.h → ...ime/include/WinPixEventRuntime/pix3_win.h b/...ime/include/WinPixEventRuntime/pix3_win.h → ...ime/include/WinPixEventRuntime/pix3_win.h
diff --git a/...eventruntime/lib64/WinPixEventRuntime.lib → ...eventruntime/lib64/WinPixEventRuntime.lib b/...eventruntime/lib64/WinPixEventRuntime.lib → ...eventruntime/lib64/WinPixEventRuntime.lib
diff --git a/...ntruntime/libarm64/WinPixEventRuntime.lib → ...ntruntime/libarm64/WinPixEventRuntime.lib b/...ntruntime/libarm64/WinPixEventRuntime.lib → ...ntruntime/libarm64/WinPixEventRuntime.lib
diff --git 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>