Account for PLATFORM_UNIVERSAL_WINDOWS in non-msvc conditionals

jbsolomon · jbsolomon · commit 580b35161412 · 2025-09-18T17:05:40.000-04:00
diff --git a/Graphics/Archiver/CMakeLists.txt b/Graphics/Archiver/CMakeLists.txt
@@ -78,7 +78,9 @@ add_library(Diligent-Archiver-shared SHARED
     readme.md
 )
 
-if(PLATFORM_WIN32 AND NOT MINGW_BUILD)
+if((PLATFORM_WIN32 OR
+    PLATFORM_UNIVERSAL_WINDOWS) AND
+   NOT MINGW_BUILD)
     target_sources(Diligent-Archiver-shared PRIVATE ${DLL_SOURCE})
 endif()
 
diff --git a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt
@@ -173,7 +173,10 @@ add_library(Diligent-GraphicsEngineOpenGL-static STATIC
 add_library(Diligent-GraphicsEngineOpenGL-shared SHARED
     readme.md
 )
-if(PLATFORM_WIN32 AND NOT MINGW_BUILD)
+
+if((PLATFORM_WIN32 OR
+    PLATFORM_UNIVERSAL_WINDOWS) AND
+   NOT MINGW_BUILD)
     target_sources(Diligent-GraphicsEngineOpenGL-shared PRIVATE ${DLL_SOURCE})
 endif()
 
diff --git a/Graphics/GraphicsEngineVulkan/CMakeLists.txt b/Graphics/GraphicsEngineVulkan/CMakeLists.txt
@@ -162,7 +162,9 @@ add_library(Diligent-GraphicsEngineVk-shared SHARED
     readme.md
 )
 
-if(PLATFORM_WIN32 AND NOT MINGW_BUILD)
+if((PLATFORM_WIN32 OR
+    PLATFORM_UNIVERSAL_WINDOWS) AND
+   NOT MINGW_BUILD)
     target_sources(Diligent-GraphicsEngineVk-shared PRIVATE ${DLL_SOURCE})
 endif()
 
diff --git a/Graphics/GraphicsEngineWebGPU/CMakeLists.txt b/Graphics/GraphicsEngineWebGPU/CMakeLists.txt
@@ -106,7 +106,9 @@ add_library(Diligent-GraphicsEngineWebGPU-shared SHARED
     readme.md
 )
 
-if(PLATFORM_WIN32 AND NOT MINGW_BUILD)
+if((PLATFORM_WIN32 OR
+    PLATFORM_UNIVERSAL_WINDOWS) AND
+   NOT MINGW_BUILD)
     target_sources(Diligent-GraphicsEngineWebGPU-shared PRIVATE ${DLL_SOURCE})
 endif()
 

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,9 @@ add_library(Diligent-Archiver-shared SHARED`
`78`	`78`	`readme.md`
`79`	`79`	`)`
`80`	`80`
`81`		`-if(PLATFORM_WIN32 AND NOT MINGW_BUILD)`
	`81`	`+if((PLATFORM_WIN32 OR`
	`82`	`+ PLATFORM_UNIVERSAL_WINDOWS) AND`
	`83`	`+ NOT MINGW_BUILD)`
`82`	`84`	`target_sources(Diligent-Archiver-shared PRIVATE ${DLL_SOURCE})`
`83`	`85`	`endif()`
`84`	`86`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,9 @@ add_library(Diligent-GraphicsEngineVk-shared SHARED`
`162`	`162`	`readme.md`
`163`	`163`	`)`
`164`	`164`
`165`		`-if(PLATFORM_WIN32 AND NOT MINGW_BUILD)`
	`165`	`+if((PLATFORM_WIN32 OR`
	`166`	`+ PLATFORM_UNIVERSAL_WINDOWS) AND`
	`167`	`+ NOT MINGW_BUILD)`
`166`	`168`	`target_sources(Diligent-GraphicsEngineVk-shared PRIVATE ${DLL_SOURCE})`
`167`	`169`	`endif()`
`168`	`170`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,9 @@ add_library(Diligent-GraphicsEngineWebGPU-shared SHARED`
`106`	`106`	`readme.md`
`107`	`107`	`)`
`108`	`108`
`109`		`-if(PLATFORM_WIN32 AND NOT MINGW_BUILD)`
	`109`	`+if((PLATFORM_WIN32 OR`
	`110`	`+ PLATFORM_UNIVERSAL_WINDOWS) AND`
	`111`	`+ NOT MINGW_BUILD)`
`110`	`112`	`target_sources(Diligent-GraphicsEngineWebGPU-shared PRIVATE ${DLL_SOURCE})`
`111`	`113`	`endif()`
`112`	`114`