mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 18:09:01 +08:00
68fc55c971
* update
* update
* update
* Update portfile.cmake
* update
* Revert "update"
This reverts commit 103cc600cf.
* update
* Update portfile.cmake
* update
* update
* update
* update
* update
* update
* update
* fix linux build
* fix linux libxml2 error
* Update gdal.json
* Update ports/gdal/vcpkg.json
* update version record
* update gdal to 3.2.2
* update version
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
diff --git a/nmake.opt b/nmake.opt
|
|
index 468d2ba1a..e75a081f7 100644
|
|
--- a/nmake.opt
|
|
+++ b/nmake.opt
|
|
@@ -148,16 +148,26 @@ GDAL_PDB = $(GDAL_ROOT)\gdal$(VERSION)$(POSTFIX).pdb
|
|
!ENDIF
|
|
|
|
!IFDEF WITH_PDB
|
|
-CXX_PDB_FLAGS=/Zi /Fd$(GDAL_PDB)
|
|
+CXX_PDB_FLAGS=/Z7 /Fd$(GDAL_PDB)
|
|
!ELSE
|
|
CXX_PDB_FLAGS=
|
|
!ENDIF
|
|
|
|
+# Flags to choose CRT variant to link against (e.g. static: /MT, /MTd, dynamic: /MD, /MDd)
|
|
+# Ensure MRSID_CONFIG in mrsid/nmake.opt is set appropriately as well
|
|
+!IFNDEF CXX_CRT_FLAGS
|
|
+!IFNDEF DEBUG
|
|
+CXX_CRT_FLAGS=/MD
|
|
+!ELSE
|
|
+CXX_CRT_FLAGS=/MDd
|
|
+!ENDIF
|
|
+!ENDIF
|
|
+
|
|
!IFNDEF OPTFLAGS
|
|
!IF "$(DEBUG)" == "0"
|
|
-OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) /MD /EHsc /Ox /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG
|
|
+OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) $(CXX_CRT_FLAGS) /EHsc /Ox /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG
|
|
!ELSE
|
|
-OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) /MDd /EHsc /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG
|
|
+OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) $(CXX_CRT_FLAGS) /EHsc /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG
|
|
!ENDIF
|
|
!ENDIF # OPTFLAGS
|
|
|
|
@@ -175,7 +185,7 @@ OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) /MDd /EH
|
|
# 4351: new behavior: elements of array 'array' will be default initialized (needed for https://trac.osgeo.org/gdal/changeset/35593)
|
|
# 4611: interaction between '_setjmp' and C++ object destruction is non-portable
|
|
#
|
|
-WARNFLAGS = /W4 /wd4127 /wd4251 /wd4275 /wd4786 /wd4100 /wd4245 /wd4206 /wd4351 /wd4611
|
|
+WARNFLAGS = /W3 /wd4127 /wd4251 /wd4275 /wd4786 /wd4100 /wd4245 /wd4206 /wd4351 /wd4611
|
|
|
|
!ENDIF
|
|
|