diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-09-18 19:42:04 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-09-18 19:42:04 +0000 |
| commit | d67f3341e599ff58709d3ef0666f8d8ed80ecaa2 (patch) | |
| tree | 1b55013be0e52d603625440608c507662a83c380 /config.nmake | |
| parent | 2ce8b9bd7a8a58b95807ac75e81527e1ea4a519b (diff) | |
| download | wireshark-d67f3341e599ff58709d3ef0666f8d8ed80ecaa2.tar.gz | |
Add stuff to config to build with VS2012. However: build currently fails.
svn path=/trunk/; revision=44982
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/config.nmake b/config.nmake index 0d18e99c14..50c63a3c52 100644 --- a/config.nmake +++ b/config.nmake @@ -110,6 +110,11 @@ PROCESSOR_ARCHITECTURE=amd64 # Visual C++ 10.0, _MSC_VER 1600, msvcr100.dll #MSVC_VARIANT=MSVC2010EE +# "Microsoft Visual C++ 2012 Express Edition" +# Visual C++ 11.0, _MSC_VER 1700, msvcr110.dll +## Note: Sep 18,2012: "not ready for prime time" (i.e. build fails) +#MSVC_VARIANT=MSVC2012EE + # The default if we haven't set a system environment variable or # uncommented an entry above. We default to the version recommended # in the Developer's Guide, namely MSVC++ 2010 Express Edition. @@ -734,6 +739,8 @@ MSC_VER_REQUIRED=1400 MSC_VER_REQUIRED=1500 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2010" || "$(MSVC_VARIANT)" == "MSVC2010EE" MSC_VER_REQUIRED=1600 +!ELSEIF "$(MSVC_VARIANT)" == "MSVC2012" || "$(MSVC_VARIANT)" == "MSVC2012EE" +MSC_VER_REQUIRED=1700 !ELSE !ERROR MSVC_VARIANT unknown !ENDIF @@ -773,7 +780,9 @@ MANIFEST_INFO_REQUIRED=1 "$(MSVC_VARIANT)" == "MSVC2008" || \ "$(MSVC_VARIANT)" == "MSVC2008EE" || \ "$(MSVC_VARIANT)" == "MSVC2010" || \ - "$(MSVC_VARIANT)" == "MSVC2010EE" + "$(MSVC_VARIANT)" == "MSVC2010EE" || \ + "$(MSVC_VARIANT)" == "MSVC2012" || \ + "$(MSVC_VARIANT)" == "MSVC2012EE" LOCAL_CFLAGS=/Zi /W3 /MD /DWIN32_LEAN_AND_MEAN /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) \ /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE @@ -806,7 +815,9 @@ WARNINGS_CFLAGS=/w34295 !IF "$(MSVC_VARIANT)" == "MSVC2008" || \ "$(MSVC_VARIANT)" == "MSVC2008EE" || \ "$(MSVC_VARIANT)" == "MSVC2010" || \ - "$(MSVC_VARIANT)" == "MSVC2010EE" + "$(MSVC_VARIANT)" == "MSVC2010EE" || \ + "$(MSVC_VARIANT)" == "MSVC2012" || \ + "$(MSVC_VARIANT)" == "MSVC2012EE" LOCAL_CFLAGS= $(LOCAL_CFLAGS) /MP !ENDIF @@ -912,6 +923,8 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(PROCESSOR_ARC VCREDIST_EXE=$(WIRESHARK_LIB_DIR)\vcredist_$(TARGET_MACHINE).exe !ELSEIF "$(MSVC_VARIANT)" == "MSVC2010" MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 10.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC100.CRT\*.* +!ELSEIF "$(MSVC_VARIANT)" == "MSVC2012" +MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 11.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC110.CRT\*.* !ELSE !ERROR MSVC_VARIANT unknown |