diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2007-01-10 03:11:13 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2007-01-10 03:11:13 +0000 |
| commit | 49fd1e07c8ad46ce845f8e292df9380498203ca7 (patch) | |
| tree | 17d07767547ebb8087a9046c59ae0c1e36b60168 /config.nmake | |
| parent | b82782e9c8e27225d2d306d20636b07824dc4c51 (diff) | |
from Laurent Rabret:
use /MD switch instead of direct linker switches
(hopefully this will fix linker issues mentioned by Andrew and Stephen)
svn path=/trunk/; revision=20370
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/config.nmake b/config.nmake index d0a5ceeb4e..b4c8b029c4 100644 --- a/config.nmake +++ b/config.nmake @@ -405,9 +405,9 @@ MAKENSIS="$(PROGRAM_FILES)\nsis\makensis.exe" # /D_CRT_NONSTDC_NO_DEPRECATE don't warn for "Deprecated CRT Functions" as MSDN calls this # !IF "$(MSVC_VARIANT)" == "MSVC6" || "$(MSVC_VARIANT)" == "MSVC2002" || "$(MSVC_VARIANT)" == "MSVC2003" || "$(MSVC_VARIANT)" == "DOTNET11FRAMEWORK" || "$(MSVC_VARIANT)" == "VC2003TOOLKIT" -LOCAL_CFLAGS=/Zi /W3 +LOCAL_CFLAGS=/Zi /W3 /MD !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "DOTNET20FRAMEWORK" -LOCAL_CFLAGS=/Zi /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE +LOCAL_CFLAGS=/Zi /W3 /MD /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE !ELSE !ERROR MSVC_VARIANT unknown !ENDIF @@ -421,17 +421,12 @@ LOCAL_CFLAGS=/Zi /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE !IF "$(MSVC_VARIANT)" == "MSVC6" LOCAL_LDFLAGS=/DEBUG !ELSEIF "$(MSVC_VARIANT)" == "MSVC2002" || "$(MSVC_VARIANT)" == "MSVC2003" || "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "VC2003TOOLKIT" || "$(MSVC_VARIANT)" == "DOTNET11FRAMEWORK" || "$(MSVC_VARIANT)" == "DOTNET20FRAMEWORK" -LOCAL_LDFLAGS=/DEBUG /DEFAULTLIB:msvcrt /NODEFAULTLIB:libc /NODEFAULTLIB:libcmt +LOCAL_LDFLAGS=/DEBUG !ELSE !ERROR MSVC_VARIANT unknown !ENDIF -!IF "$(MSVC_VARIANT)" == "DOTNET11FRAMEWORK" || "$(MSVC_VARIANT)" == "MSVC2002" || "$(MSVC_VARIANT)" == "MSVC2003" -PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 -!ELSE PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) -!ENDIF - # # Optional: Use the User's Guide as the online help system |