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 /wsutil/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 'wsutil/Makefile.nmake')
| -rw-r--r-- | wsutil/Makefile.nmake | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/wsutil/Makefile.nmake b/wsutil/Makefile.nmake index be90c94aec..d12fe41863 100644 --- a/wsutil/Makefile.nmake +++ b/wsutil/Makefile.nmake @@ -31,14 +31,11 @@ libwsutil.exp: libwsutil.dll libwsutil.dll : $(OBJECTS) libwsutil.def ..\image\libwsutil.res $(link) $(dlllflags) $(conlibsdll) \ - $(LOCAL_LDFLAGS) \ + $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ /DEF:libwsutil.def /OUT:libwsutil.dll \ /IMPLIB:libwsutil.lib \ ..\image\libwsutil.res \ $(OBJECTS) $(libwsutil_LIBS) -!IF $(MSC_VER_REQUIRED) >= 1400 - mt.exe -nologo -manifest "libwsutil.dll.manifest" -outputresource:libwsutil.dll;2 -!ENDIF clean : rm -f $(OBJECTS) \ |