diff options
| author | Guy Harris <guy@alum.mit.edu> | 2007-12-07 23:58:46 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2007-12-07 23:58:46 +0000 |
| commit | 947e70b4b72bf65c8ad5e29d5cc0d7353f031513 (patch) | |
| tree | 7901804d8412c5b0248e742c48f65a09151e5c39 /config.nmake | |
| parent | 8b87d048e9f98e9261742118cf0664639f88d96c (diff) | |
Delete the *right* config.h.win32.
Copy the MSVC++-version-checking stuff from it into the top-level
config.h.win32, and try to set up config.nmake so that MSC_VER_REQUIRED
is defined in all Makefiles that include config.nmake.
svn path=/trunk/; revision=23802
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/config.nmake b/config.nmake index af4abd9958..98ee4ae365 100644 --- a/config.nmake +++ b/config.nmake @@ -414,6 +414,21 @@ UPX=$(WIRESHARK_LIBS)\upx301w\upx.exe ##### Flags, PATHs and Miscellaneous ##### +# "convert" the MSVC variant into the required MSC compiler version +!IF "$(MSVC_VARIANT)" == "MSVC6" +MSC_VER_REQUIRED=1200 +!ELSEIF "$(MSVC_VARIANT)" == "MSVC2002" || "$(MSVC_VARIANT)" == "DOTNET10" +MSC_VER_REQUIRED=1300 +!ELSEIF "$(MSVC_VARIANT)" == "MSVC2003" || "$(MSVC_VARIANT)" == "DOTNET11" +MSC_VER_REQUIRED=1310 +!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" +MSC_VER_REQUIRED=1400 +!ELSEIF "$(MSVC_VARIANT)" == "MSVC2008EE" +MSC_VER_REQUIRED=1500 +!ELSE +!ERROR MSVC_VARIANT unknown +!ENDIF + # Compiler flags: # /W3 warning level 3 (0 less - 4 most, 1 default) # /Zi create .pdb file for debugging @@ -422,9 +437,9 @@ UPX=$(WIRESHARK_LIBS)\upx301w\upx.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)" == "DOTNET10" || "$(MSVC_VARIANT)" == "MSVC2003" || "$(MSVC_VARIANT)" == "DOTNET11" -LOCAL_CFLAGS=/Zi /W3 /MD +LOCAL_CFLAGS=/Zi /W3 /MD /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008EE" -LOCAL_CFLAGS=/Zi /W3 /MD /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 /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) !ELSE !ERROR MSVC_VARIANT unknown !ENDIF @@ -852,19 +867,3 @@ LIBWIRESHARK_CONFIG= # Construct the path PATH=$(PATH);$(CYGWIN_PATH);$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin;$(ZLIB_PATH);$(ADNS_PATH) - - -# "convert" the MSVC variant into the required MSC compiler version -!IF "$(MSVC_VARIANT)" == "MSVC6" -MSC_VER_REQUIRED=1200 -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2002" || "$(MSVC_VARIANT)" == "DOTNET10" -MSC_VER_REQUIRED=1300 -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2003" || "$(MSVC_VARIANT)" == "DOTNET11" -MSC_VER_REQUIRED=1310 -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" -MSC_VER_REQUIRED=1400 -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2008EE" -MSC_VER_REQUIRED=1500 -!ELSE -!ERROR MSVC_VARIANT unknown -!ENDIF |