diff options
| author | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-01-31 02:23:06 +0000 |
|---|---|---|
| committer | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-01-31 02:23:06 +0000 |
| commit | 16617da3ee5184cb262bd889c1f717afd5f46a56 (patch) | |
| tree | 04289b1bbdfd4b07cccfe3a7495b1e61025e7546 /config.nmake | |
| parent | 6aff5a6cbb5823f5275e0ee400d2577f72627727 (diff) | |
C preprocessor only handles integers for conditional compilation. Build MSC_VER_REQUIRED in config.nmake and compare it with _MSC_VER in config.h.win32
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20637 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/config.nmake b/config.nmake index 3b2a67a9e2..2144c7b1f0 100644 --- a/config.nmake +++ b/config.nmake @@ -768,3 +768,17 @@ 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=1300 +!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 +!ELSE +!ERROR MSVC_VARIANT unknown +!ENDIF |