diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-01-30 04:37:12 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-01-30 04:37:12 +0000 |
| commit | 4308ba7dc53630a9a0764266f3e9cb54b4b2b4b2 (patch) | |
| tree | c63fb336f0ef0e734ac459a233449f8675fd4dc0 /Makefile.nmake | |
| parent | 098725271f13645c08a5d71b41b976543d1ca419 (diff) | |
Rework Windows Wireshark Qt build configuration a bit:
1. Compile and link with (almost exactly) the same options as used
when building Windows Wireshark Gtk.
The options used allow debugging of the exe using Visual Studio exactly
as is done for Wireshark Gtk.
Essentially: configure the "release" version to compile and link with
symbols. (See ui\qt\QtShark for the details).
2. Update QtShark.pro to create a Makefile only for 1 version of Wireshark Qt
which is linked against the "release" Qt libraries.
(IOW: don't create a "debug" Makefile).
3. Remove unused variable assignments from config.pri.
(They can be added back if needed in the future).
svn path=/trunk/; revision=40768
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 1691ad128d..47629e2c11 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -36,7 +36,7 @@ CHECK_TAG= !ENDIF # ------------- -LDFLAGS = /NOLOGO /INCREMENTAL:no $(LOCAL_LDFLAGS) +LDFLAGS = /NOLOGO /INCREMENTAL:NO $(LOCAL_LDFLAGS) # We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output GENERATED_CFLAGS=\ @@ -407,11 +407,9 @@ PORTAUDIO_DIR = $(PORTAUDIO_DIR:\=/) MSVC_VARIANT = $(MSVC_VARIANT) -WIRESHARK_LOCAL_CFLAGS = $(LOCAL_CFLAGS) -WIRESHARK_STANDARD_CFLAGS = $(STANDARD_CFLAGS) - -QMAKE_CFLAGS += $(STANDARD_CFLAGS) $(PORTAUDIO_CFLAGS:\=/) -QMAKE_CXXFLAGS += $(STANDARD_CFLAGS) $(PORTAUDIO_CFLAGS:\=/) +QMAKE_CFLAGS *= $(STANDARD_CFLAGS) $(PORTAUDIO_CFLAGS:\=/) +QMAKE_CXXFLAGS *= $(STANDARD_CFLAGS) $(PORTAUDIO_CFLAGS:\=/) +QMAKE_LFLAGS *= /LARGEADDRESSAWARE $(LDFLAGS) DEFINES += _NEED_VAR_IMPORT_ |