diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-03-02 21:33:11 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-03-02 21:33:11 +0000 |
| commit | 57dadc4664738c0c461f039c3d0da05d24de484a (patch) | |
| tree | eae562945b06a82bed053f98246e57e693a807c6 /epan/Makefile.nmake | |
| parent | c71eeeca07fda57909aade8fcd74939063e1105e (diff) | |
More Windows compiler flag cleanups. Fix a problem with my last commit
that would break compilation for older compilers. Create a "DLL_LDFLAGS"
variable and use it in DLLs and plugins. Use PLUGIN_LDFLAGS and
DLL_LDFLAGS where needed. Don't force i386 code in the TPG plugin.
svn path=/trunk/; revision=27582
Diffstat (limited to 'epan/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index d3b1451008..fe0c1cd2ab 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -88,16 +88,12 @@ libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def crypt fty crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib $(WSLUA_LIB) ..\image\libwireshark.res @echo Linking libwireshark.dll $(link) $(dlllflags) $(conlibsdll) shell32.lib \ - $(LOCAL_LDFLAGS) \ + $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ /DEF:libwireshark.def /OUT:libwireshark.dll \ /IMPLIB:libwireshark.lib $(LIBWIRESHARK_OBJECTS) \ $(libwireshark_LIBS) ..\image\libwireshark.res \ dissectors\register.obj \ $(EXTRA_OBJECTS) -!IF $(MSC_VER_REQUIRED) >= 1400 - mt.exe -nologo -manifest "libwireshark.dll.manifest" -outputresource:libwireshark.dll;2 -!ENDIF - libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) crypt ftypes dfilter $(WSLUA_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib $(WSLUA_LIB) dissectors\dissectors.lib |