Fix dllexport for mingw-dynamic

microsoft · Jul 9, 2021 · 2c67800 · 2c67800
1 parent f7d4a6d
commit 2c67800
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/ports/gdal/0006-Fix-mingw-dllexport.patch b/ports/gdal/0006-Fix-mingw-dllexport.patch
@@ -0,0 +1,13 @@
+diff --git a/port/cpl_port.h b/port/cpl_port.h
+index 9e3ebbb..130af04 100644
+--- a/port/cpl_port.h
++++ b/port/cpl_port.h
+@@ -343,7 +343,7 @@ typedef unsigned int  GUIntptr_t;
+ #endif
+
+ #ifndef CPL_DLL
+-#if defined(_MSC_VER) && !defined(CPL_DISABLE_DLL)
++#if defined(WIN32) && !defined(CPL_DISABLE_DLL)
+ #  ifdef GDAL_COMPILATION
+ #    define CPL_DLL __declspec(dllexport)
+ #  else
diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake
@@ -17,8 +17,10 @@ set(GDAL_PATCHES
     0004-Fix-cfitsio.patch
     0005-Fix-configure.patch
 )
-if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     list(APPEND GDAL_PATCHES 0003-Fix-static-build.patch)
+else()
+    list(APPEND GDAL_PATCHES 0006-Fix-mingw-dllexport.patch)
 endif()
 
 vcpkg_extract_source_archive_ex(