| 12345678910111213141516171819202122232425262728293031323334353637383940414243 |
- 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
-
|
