diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-03-25 19:01:58 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-03-25 19:01:58 +0000 |
| commit | 6f5273e81e5f5ba0c1e0dc3b52bfd3cecfaaf6c4 (patch) | |
| tree | 5dbe97ef1345900a20f20bf9bb35d3fb73f6dab8 /Makefile.nmake | |
| parent | 921b0f140d5317f8feea162e70362a5eaa59d9df (diff) | |
| download | wireshark-6f5273e81e5f5ba0c1e0dc3b52bfd3cecfaaf6c4.tar.gz wireshark-6f5273e81e5f5ba0c1e0dc3b52bfd3cecfaaf6c4.tar.bz2 wireshark-6f5273e81e5f5ba0c1e0dc3b52bfd3cecfaaf6c4.zip | |
Fix the Qt build for Win64.
svn path=/trunk/; revision=41761
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index bcb2480d68..47cac08815 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -427,6 +427,9 @@ VERSION = $(VERSION) !IFDEF MANIFEST_INFO_REQUIRED CONFIG += wireshark_manifest_info_required !ENDIF +!IFDEF KFW_DIR +CONFIG += wireshark_use_kfw +!ENDIF WIRESHARK_LIB_DIR = $(WIRESHARK_LIB_DIR:\=/) GLIB_DIR = $(GTK_DIR:\=/) C_ARES_DIR = $(C_ARES_DIR:\=/) @@ -437,6 +440,8 @@ KFW_DIR = $(KFW_DIR:\=/) LUA_DIR = $(LUA_DIR:\=/) PORTAUDIO_DIR = $(PORTAUDIO_DIR:\=/) +INTL_DLL = $(INTL_DLL) + MSVC_VARIANT = $(MSVC_VARIANT) QMAKE_CFLAGS *= $(STANDARD_CFLAGS) $(PORTAUDIO_CFLAGS:\=/) |