diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-01-20 18:30:44 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-01-20 18:30:44 +0000 |
| commit | 463b3178e8d4208e10a7adb0a3e8a91c8c7ed5d0 (patch) | |
| tree | 1b840827b4c99f82efccf69e1fee0dc511fd6f46 /Makefile.nmake | |
| parent | dbf1be8944e33304950d97ada20a307d371cf1bf (diff) | |
Add more configuration information to config.pri which lets us remove
more hard-coded definitions from QtShark.pro. Quote an error message to
fix a Qt Creator complaint.
Add ui\qt\config.pri to the top-level "all" nmake target.
Update README.qt.
svn path=/trunk/; revision=40607
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 2be1bc9aac..cee46b69f6 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -189,7 +189,7 @@ RESOURCES=image\wireshark.res image\libwireshark.res image\tshark.res \ image\rawshark.res image\libwsutil.res -all: $(LIBS_CHECK) config.h tools image codecs $(C_ARES_DLL) $(ADNS_DLL) $(ZLIB_DLL) wsutil wiretap epan $(EXECUTABLES) $(RESOURCES) doc help install-all +all: $(LIBS_CHECK) config.h ui/qt/config.pri tools image codecs $(C_ARES_DLL) $(ADNS_DLL) $(ZLIB_DLL) wsutil wiretap epan $(EXECUTABLES) $(RESOURCES) doc help install-all !IFDEF MAKENSIS packaging: all @@ -390,17 +390,29 @@ config.h : config.h.win32 config.nmake -e "s/@WANT_PACKET_EDITOR@/$(WANT_PACKET_EDITOR)/" \ < config.h.win32 > $@ -ui\qt\config.pri: config.nmake +ui\qt\config.pri: config.nmake Makefile.nmake @echo Creating <<ui\qt\config.pri +# Automatically generated from Makefile.nmake. Do not edit. VERSION = $(VERSION) -WIRESHARK_LIB_DIR = $(WIRESHARK_LIB_DIR) -GLIB_DIR = $(GTK_DIR) -C_ARES_DIR = $(C_ARES_DIR) -ZLIB_DIR = $(ZLIB_DIR) -GNUTLS_DIR = $(GNUTLS_DIR) -SMI_DIR = $(SMI_DIR) -KFW_DIR = $(KFW_DIR) -LUA_DIR = $(LUA_DIR) +WIRESHARK_LIB_DIR = $(WIRESHARK_LIB_DIR:\=/) +GLIB_DIR = $(GTK_DIR:\=/) +C_ARES_DIR = $(C_ARES_DIR:\=/) +ZLIB_DIR = $(ZLIB_DIR:\=/) +GNUTLS_DIR = $(GNUTLS_DIR:\=/) +SMI_DIR = $(SMI_DIR:\=/) +KFW_DIR = $(KFW_DIR:\=/) +LUA_DIR = $(LUA_DIR:\=/) + +MSVC_VARIANT = $(MSVC_VARIANT) + +WIRESHARK_LOCAL_CFLAGS = $(LOCAL_CFLAGS) +WIRESHARK_STANDARD_CFLAGS = $(STANDARD_CFLAGS) + +QMAKE_CFLAGS += $(STANDARD_CFLAGS) +QMAKE_CXXFLAGS += $(STANDARD_CFLAGS) + +DEFINES += _NEED_VAR_IMPORT_ + <<KEEP ps.c: tools\rdps.py print.ps |