diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-03-02 21:33:11 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-03-02 21:33:11 +0000 |
| commit | ea387b136a2f0e0b4c39c78d42f85d50f0ad01e7 (patch) | |
| tree | eae562945b06a82bed053f98246e57e693a807c6 /wiretap | |
| parent | 129042ebb7770ff873a6aa8fa7a06685f4f0a16d (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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27582 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'wiretap')
| -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 |