diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-04-21 05:23:29 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-04-21 05:23:29 +0000 |
| commit | f739b285c90a56788357b3dd7a6428a74a3890b6 (patch) | |
| tree | 4c36d36de0f7bc9264dcd965223657010d39d8d7 /config.nmake | |
| parent | 2dc4b6ae918e065e10c7e604bdd10f6492be8c31 (diff) | |
| download | wireshark-f739b285c90a56788357b3dd7a6428a74a3890b6.tar.gz wireshark-f739b285c90a56788357b3dd7a6428a74a3890b6.tar.bz2 wireshark-f739b285c90a56788357b3dd7a6428a74a3890b6.zip | |
Add settings for "Microsoft Visual Studio 2010" note that
Wireshark does not build with Visual studio 10 yet.
svn path=/trunk/; revision=32529
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/config.nmake b/config.nmake index a18b60874a..eee8bf4a81 100644 --- a/config.nmake +++ b/config.nmake @@ -117,6 +117,16 @@ MSVC_VARIANT=MSVC2008 # Visual C++ 9.0, _MSC_VER 1500, msvcr90.dll #MSVC_VARIANT=MSVC2008EE +# Warning, building with this setting does not work yet +# "Microsoft Visual Studio 2010" +# Visual C++ 10.0, _MSC_VER 1600, msvcr100.dll +#MSVC_VARIANT=MSVC2010 + +# Warning, building with this setting does not work yet +# "Microsoft Visual C++ 2010 Express Edition" +# Visual C++ 10.0, _MSC_VER 1600, msvcr100.dll +#MSVC_VARIANT=MSVC2010EE + # # Optional: To compile some time critical code from assembler instead of C # @@ -675,6 +685,8 @@ MSC_VER_REQUIRED=1310 MSC_VER_REQUIRED=1400 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE" MSC_VER_REQUIRED=1500 +!ELSEIF "$(MSVC_VARIANT)" == "MSVC2010" || "$(MSVC_VARIANT)" == "MSVC2010EE" +MSC_VER_REQUIRED=1600 !ELSE !ERROR MSVC_VARIANT unknown !ENDIF @@ -691,7 +703,7 @@ MSC_VER_REQUIRED=1500 # !IF "$(MSVC_VARIANT)" == "MSVC6" || "$(MSVC_VARIANT)" == "MSVC2002" || "$(MSVC_VARIANT)" == "DOTNET10" || "$(MSVC_VARIANT)" == "MSVC2003" || "$(MSVC_VARIANT)" == "DOTNET11" LOCAL_CFLAGS=/Zi /W3 /MD /DWIN32_LEAN_AND_MEAN /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE" +!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE" || "$(MSVC_VARIANT)" == "MSVC2010" || "$(MSVC_VARIANT)" == "MSVC2010EE" LOCAL_CFLAGS=/Zi /W3 /MD /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DWIN32_LEAN_AND_MEAN /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) !IF "$(WIRESHARK_TARGET_PLATFORM)" != "win64" LOCAL_CFLAGS=$(LOCAL_CFLAGS) /D_BIND_TO_CURRENT_CRT_VERSION=1 @@ -713,7 +725,7 @@ LOCAL_CFLAGS=$(LOCAL_CFLAGS) /D_BIND_TO_CURRENT_CRT_VERSION=1 # * /showIncludes # * /Yc # -!IF "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE" +!IF "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE" || "$(MSVC_VARIANT)" == "MSVC2010" || "$(MSVC_VARIANT)" == "MSVC2010EE" LOCAL_CFLAGS= $(LOCAL_CFLAGS) /MP !ENDIF # Linker flags: @@ -793,6 +805,14 @@ VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_$(TARGET_MACHINE).exe !ELSEIF "$(MSVC_VARIANT)" == "MSVC2008" MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(VCREDIST_DLL)\Microsoft.VC90.CRT\*.* +!ELSEIF "$(MSVC_VARIANT)" == "MSVC2010EE" +# NOT TESTED +# you need to download the redistributable package vcredist_x86.exe from Microsoft first, +# and copy it to the lib folder!!! +VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_$(TARGET_MACHINE).exe +!ELSEIF "$(MSVC_VARIANT)" == "MSVC2010" +MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 10.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC100.CRT*.* + !ELSE !ERROR MSVC_VARIANT unknown !ENDIF |