mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 08:49:01 +08:00
23 lines
1007 B
Diff
23 lines
1007 B
Diff
--- a/nmake.opt Fri Dec 14 22:34:20 2018
|
|
+++ b/nmake.opt Wed Mar 27 11:00:00 2019
|
|
@@ -133,7 +133,17 @@
|
|
|
|
+# 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 /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
|