diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2007-01-08 22:29:18 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2007-01-08 22:29:18 +0000 |
| commit | e71b416608e67a268fabd82ab815e538862eb746 (patch) | |
| tree | 79438a0e5544a3df82768584a9c2e9fb366c0062 /config.nmake | |
| parent | 39956903b5a30268a830851cc21fc397e23e2128 (diff) | |
fix compilation for:
- Visual Studio .NET (2002)
- Visual Studio .NET 2003
svn path=/trunk/; revision=20349
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config.nmake b/config.nmake index 53581aff99..d0a5ceeb4e 100644 --- a/config.nmake +++ b/config.nmake @@ -47,11 +47,11 @@ PROGRAM_FILES=C:/Program Files # Visual C++ 6.0, _MSC_VER 1200, msvcrt.dll (version 6) MSVC_VARIANT=MSVC6 -# "Microsoft Visual Studio .NET (2002)" - NOT YET WORKING +# "Microsoft Visual Studio .NET (2002)" - EXPERIMENTAL # Visual C++ 7.0, _MSC_VER 1300, msvcr70.dll #MSVC_VARIANT=MSVC2002 -# "Microsoft Visual Studio .NET 2003" - NOT YET WORKING +# "Microsoft Visual Studio .NET 2003" - EXPERIMENTAL # Visual C++ 7.1, _MSC_VER 1310, msvcr71.dll #MSVC_VARIANT=MSVC2003 @@ -404,7 +404,7 @@ MAKENSIS="$(PROGRAM_FILES)\nsis\makensis.exe" # /D_CRT_SECURE_NO_DEPRECATE don't warn for "insecure" calls, see MSDN "Security Enhancements in the CRT" # /D_CRT_NONSTDC_NO_DEPRECATE don't warn for "Deprecated CRT Functions" as MSDN calls this # -!IF "$(MSVC_VARIANT)" == "MSVC6" || "$(MSVC_VARIANT)" == "DOTNET11FRAMEWORK" || "$(MSVC_VARIANT)" == "VC2003TOOLKIT" +!IF "$(MSVC_VARIANT)" == "MSVC6" || "$(MSVC_VARIANT)" == "MSVC2002" || "$(MSVC_VARIANT)" == "MSVC2003" || "$(MSVC_VARIANT)" == "DOTNET11FRAMEWORK" || "$(MSVC_VARIANT)" == "VC2003TOOLKIT" LOCAL_CFLAGS=/Zi /W3 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "DOTNET20FRAMEWORK" LOCAL_CFLAGS=/Zi /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE @@ -420,13 +420,13 @@ LOCAL_CFLAGS=/Zi /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE # !IF "$(MSVC_VARIANT)" == "MSVC6" LOCAL_LDFLAGS=/DEBUG -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "VC2003TOOLKIT" || "$(MSVC_VARIANT)" == "DOTNET11FRAMEWORK" || "$(MSVC_VARIANT)" == "DOTNET20FRAMEWORK" +!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 !ELSE !ERROR MSVC_VARIANT unknown !ENDIF -!IF "$(MSVC_VARIANT)" == "DOTNET11FRAMEWORK" +!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) |