Use def-based exports in non-msvc PLATFORM_WIN32 builds

jbsolomon · jbsolomon · commit c3f154728629 · 2025-09-18T15:10:01.000-04:00
diff --git a/Graphics/Archiver/CMakeLists.txt b/Graphics/Archiver/CMakeLists.txt
@@ -78,7 +78,7 @@ add_library(Diligent-Archiver-shared SHARED
     readme.md
 )
 
-if(MSVC)
+if(PLATFORM_WIN32 AND NOT MINGW_BUILD)
     target_sources(Diligent-Archiver-shared PRIVATE ${DLL_SOURCE})
 endif()
 
diff --git a/Graphics/Archiver/interface/ArchiverFactoryLoader.h b/Graphics/Archiver/interface/ArchiverFactoryLoader.h
@@ -32,7 +32,7 @@
 // https://gcc.gnu.org/wiki/Visibility
 #    define API_QUALIFIER __attribute__((visibility("default")))
 #elif PLATFORM_WIN32 || PLATFORM_UNIVERSAL_WINDOWS
-#    define API_QUALIFIER __declspec(dllexport)
+#    define API_QUALIFIER
 #else
 #    error Unsupported platform
 #endif
diff --git a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt
@@ -173,7 +173,7 @@ add_library(Diligent-GraphicsEngineOpenGL-static STATIC
 add_library(Diligent-GraphicsEngineOpenGL-shared SHARED
     readme.md
 )
-if(MSVC)
+if(PLATFORM_WIN32 AND NOT MINGW_BUILD)
     target_sources(Diligent-GraphicsEngineOpenGL-shared PRIVATE ${DLL_SOURCE})
 endif()
 
diff --git a/Graphics/GraphicsEngineOpenGL/interface/EngineFactoryOpenGL.h b/Graphics/GraphicsEngineOpenGL/interface/EngineFactoryOpenGL.h
@@ -42,7 +42,7 @@
 // https://gcc.gnu.org/wiki/Visibility
 #    define API_QUALIFIER __attribute__((visibility("default")))
 #elif PLATFORM_WIN32
-#    define API_QUALIFIER __declspec(dllexport)
+#    define API_QUALIFIER
 #else
 #    error Unsupported platform
 #endif
diff --git a/Graphics/GraphicsEngineVulkan/CMakeLists.txt b/Graphics/GraphicsEngineVulkan/CMakeLists.txt
@@ -162,7 +162,7 @@ add_library(Diligent-GraphicsEngineVk-shared SHARED
     readme.md
 )
 
-if(MSVC)
+if(PLATFORM_WIN32 AND NOT MINGW_BUILD)
     target_sources(Diligent-GraphicsEngineVk-shared PRIVATE ${DLL_SOURCE})
 endif()
 
diff --git a/Graphics/GraphicsEngineVulkan/interface/EngineFactoryVk.h b/Graphics/GraphicsEngineVulkan/interface/EngineFactoryVk.h
@@ -39,7 +39,7 @@
 // https://gcc.gnu.org/wiki/Visibility
 #    define API_QUALIFIER __attribute__((visibility("default")))
 #elif PLATFORM_WIN32
-#    define API_QUALIFIER __declspec(dllexport)
+#    define API_QUALIFIER
 #else
 #    error Unsupported platform
 #endif
diff --git a/Graphics/GraphicsEngineWebGPU/CMakeLists.txt b/Graphics/GraphicsEngineWebGPU/CMakeLists.txt
@@ -106,7 +106,7 @@ add_library(Diligent-GraphicsEngineWebGPU-shared SHARED
     readme.md
 )
 
-if(MSVC)
+if(PLATFORM_WIN32 AND NOT MINGW_BUILD)
     target_sources(Diligent-GraphicsEngineWebGPU-shared PRIVATE ${DLL_SOURCE})
 endif()
 
diff --git a/Graphics/GraphicsEngineWebGPU/interface/EngineFactoryWebGPU.h b/Graphics/GraphicsEngineWebGPU/interface/EngineFactoryWebGPU.h
@@ -38,7 +38,7 @@
 // https://gcc.gnu.org/wiki/Visibility
 #    define API_QUALIFIER __attribute__((visibility("default")))
 #elif PLATFORM_WIN32
-#    define API_QUALIFIER __declspec(dllexport)
+#    define API_QUALIFIER
 #else
 #    error Unsupported platform
 #endif

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ add_library(Diligent-Archiver-shared SHARED`
`78`	`78`	`readme.md`
`79`	`79`	`)`
`80`	`80`
`81`		`-if(MSVC)`
	`81`	`+if(PLATFORM_WIN32 AND NOT MINGW_BUILD)`
`82`	`82`	`target_sources(Diligent-Archiver-shared PRIVATE ${DLL_SOURCE})`
`83`	`83`	`endif()`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ add_library(Diligent-GraphicsEngineOpenGL-static STATIC`
`173`	`173`	`add_library(Diligent-GraphicsEngineOpenGL-shared SHARED`
`174`	`174`	`readme.md`
`175`	`175`	`)`
`176`		`-if(MSVC)`
	`176`	`+if(PLATFORM_WIN32 AND NOT MINGW_BUILD)`
`177`	`177`	`target_sources(Diligent-GraphicsEngineOpenGL-shared PRIVATE ${DLL_SOURCE})`
`178`	`178`	`endif()`
`179`	`179`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ add_library(Diligent-GraphicsEngineVk-shared SHARED`
`162`	`162`	`readme.md`
`163`	`163`	`)`
`164`	`164`
`165`		`-if(MSVC)`
	`165`	`+if(PLATFORM_WIN32 AND NOT MINGW_BUILD)`
`166`	`166`	`target_sources(Diligent-GraphicsEngineVk-shared PRIVATE ${DLL_SOURCE})`
`167`	`167`	`endif()`
`168`	`168`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ add_library(Diligent-GraphicsEngineWebGPU-shared SHARED`
`106`	`106`	`readme.md`
`107`	`107`	`)`
`108`	`108`
`109`		`-if(MSVC)`
	`109`	`+if(PLATFORM_WIN32 AND NOT MINGW_BUILD)`
`110`	`110`	`target_sources(Diligent-GraphicsEngineWebGPU-shared PRIVATE ${DLL_SOURCE})`
`111`	`111`	`endif()`
`112`	`112`