diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-03-02 18:57:35 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-03-02 18:57:35 +0000 |
| commit | 07e5df616e4ad5d5f464e2be167947c08197af14 (patch) | |
| tree | df069aabd4186cdc53e23776144940b676982bad /config.nmake | |
| parent | e18f0f79dab3956b53ad19b3fa59f1afc7dc66b1 (diff) | |
Disable manifest building for our DLLs. This attempts to fix bug 3272.
svn path=/trunk/; revision=27579
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config.nmake b/config.nmake index bda2183f0f..1e81d8d0b0 100644 --- a/config.nmake +++ b/config.nmake @@ -481,6 +481,7 @@ MSC_VER_REQUIRED=1500 # /DWIN32_LEAN_AND_MEAN Don't include unnecessary Windows include files (see windows.h) # /MP [<number of processes>] [MSVC2008]: Compiles multiple source files by using multiple processes # Add if desired for compile speedup on machines with 2 or more "effective processors" +# /MANIFEST:no Don't create a SxS manifest. Makes sure our plugins don't load a second copy of the CRT. # !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) @@ -499,6 +500,9 @@ LOCAL_CFLAGS=/Zi /W3 /MD /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE LOCAL_LDFLAGS=/DEBUG /MACHINE:$(TARGET_MACHINE) PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no $(LOCAL_LDFLAGS) +!IF $(MSC_VER_REQUIRED) >= 1400 +PLUGIN_LDFLAGS = /MANIFEST:no +!ENDIF # # According to http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=403 |