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 /wiretap/Makefile.nmake | |
| parent | c71eeeca07fda57909aade8fcd74939063e1105e (diff) | |
| download | wireshark-57dadc4664738c0c461f039c3d0da05d24de484a.tar.gz | |
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 'wiretap/Makefile.nmake')
| -rw-r--r-- | wiretap/Makefile.nmake | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake index 40ebb967ea..a8e15b33db 100644 --- a/wiretap/Makefile.nmake +++ b/wiretap/Makefile.nmake @@ -31,14 +31,11 @@ wiretap-$(WTAP_VERSION).exp: wiretap-$(WTAP_VERSION).dll wiretap-$(WTAP_VERSION).dll : $(OBJECTS) wtap.def ..\image\wiretap.res $(link) $(dlllflags) $(conlibsdll) \ - $(LOCAL_LDFLAGS) \ + $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ /DEF:wtap.def /OUT:wiretap-$(WTAP_VERSION).dll \ /IMPLIB:wiretap-$(WTAP_VERSION).lib \ ..\image\wiretap.res \ $(OBJECTS) $(wiretap_LIBS) -!IF $(MSC_VER_REQUIRED) >= 1400 - mt.exe -nologo -manifest "wiretap-$(WTAP_VERSION).dll.manifest" -outputresource:wiretap-$(WTAP_VERSION).dll;2 -!ENDIF RUNLEX = ..\tools\runlex.sh |