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 /config.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 'config.nmake')
| -rw-r--r-- | config.nmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config.nmake b/config.nmake index 1e81d8d0b0..b59148a264 100644 --- a/config.nmake +++ b/config.nmake @@ -498,12 +498,13 @@ LOCAL_CFLAGS=/Zi /W3 /MD /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE # /NODEFAULTLIB:xxx don't use xxx as the standard C library # LOCAL_LDFLAGS=/DEBUG /MACHINE:$(TARGET_MACHINE) - -PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no $(LOCAL_LDFLAGS) +DLL_LDFLAGS = !IF $(MSC_VER_REQUIRED) >= 1400 -PLUGIN_LDFLAGS = /MANIFEST:no +DLL_LDFLAGS = /MANIFEST:no !ENDIF +PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) + # # According to http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=403 # XCOPY under Windows NT doesn't support the "/Y" flag. This works |