2018-05-18 14:46:04 +08:00
|
|
|
diff -Nuar a/nmake.opt b/nmake.opt
|
|
|
|
|
--- a/nmake.opt 2018-05-04 09:05:46.000000000 +0200
|
|
|
|
|
+++ b/nmake.opt 2018-05-11 22:58:39.387603800 +0200
|
2018-10-13 06:12:15 +08:00
|
|
|
@@ -124,11 +124,21 @@
|
2018-05-18 14:46:04 +08:00
|
|
|
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
|
|
|
|
|
!IFNDEF DEBUG
|
|
|
|
|
-OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP /MD /EHsc /Ox /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG
|
|
|
|
|
+OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP $(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 /MDd /EHsc /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG
|
|
|
|
|
+OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP $(CXX_CRT_FLAGS) /EHsc /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG
|
|
|
|
|
!ENDIF
|
|
|
|
|
!ENDIF # OPTFLAGS
|
|
|
|
|
|
