mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-29 03:34:26 +08:00
86b0ea6fe5
* Update to 3.4.2 * Disable ATL for uwp and for arm64 * Fix linking on uwp * Fix pc file fixup * Update versions * Declare dependency on atlmfc. Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
14 lines
433 B
Diff
14 lines
433 B
Diff
diff --git a/gdal/makefile.vc b/gdal/makefile.vc
|
|
index 9de546c..56f617d 100644
|
|
--- a/gdal/makefile.vc
|
|
+++ b/gdal/makefile.vc
|
|
@@ -27,7 +27,7 @@ OGR_INCLUDE = $(OGR_BASE_INCLUDE) \
|
|
CPPFLAGS = $(CPPFLAGS) -DGNM_ENABLED
|
|
!ENDIF
|
|
|
|
-!IF DEFINED(STDCALL) && !DEFINED(WIN64)
|
|
+!IF DEFINED(STDCALL) && !DEFINED(WIN64) && "$(SYM_PREFIX)" == "_"
|
|
|
|
BASE_INCLUDE = /INCLUDE:_GDALSimpleImageWarp@36 \
|
|
/INCLUDE:_GDALReprojectImage@48 \
|