diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2014-06-30 23:53:56 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-07-01 19:16:52 +0000 |
| commit | e1e7dd0cfd505ac22a1f9ef8b42957c3d88df5fe (patch) | |
| tree | 065a12e609dfcf9d8ab95a3d2802e3c14b7e4abb /Makefile.nmake | |
| parent | b5e266feda9c423550970837629f5ca32069dd1a (diff) | |
| download | wireshark-e1e7dd0cfd505ac22a1f9ef8b42957c3d88df5fe.tar.gz | |
Fix the QT build on Qt 5.3 or later to use the windeployqt tool
to copy the rquired Qt files into the runtime directory
Qt 5.2 is broken as windeployqt doesn't take the required --release flag
Also fix the passing of GCC_DLL and GPGERROR_DLL into config.pri so
that the Qt build copies the required files instead of the entire
gnutls bin dir twice (the variables expanded to nothing).
Add support for autodetection of Qt 5.3.0 with msvc2013
Change-Id: I1e9c70a5ff5d1fdfdce88ba15d324f1899c8129c
Reviewed-on: https://code.wireshark.org/review/2734
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index d1a14bb3b4..c64a747d5d 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -12,7 +12,6 @@ include <win32.mak> CC = cl LINK= link BSCMAKE= bscmake -CURR_DIR= "$(MAKEDIR)" WIN_SETUP=tools/$(WIRESHARK_TARGET_PLATFORM)-setup.sh @@ -507,6 +506,8 @@ LUA_DIR = $(LUA_DIR:\=/) GEOIP_DIR = $(GEOIP_DIR:\=/) WINSPARKLE_DIR = $(WINSPARKLE_DIR:\=/) +GCC_DLL = $(GCC_DLL) +GPGERROR_DLL = $(GPGERROR_DLL) INTL_DLL = $(INTL_DLL) guilibsdll = $(guilibsdll) @@ -524,7 +525,6 @@ QMAKE_CFLAGS *= $(STANDARD_CFLAGS) # This avoids conflicts with the C++ standard library. QMAKE_CXXFLAGS *= $(STANDARD_CFLAGS) /DNOMINMAX QMAKE_LFLAGS *= /LARGEADDRESSAWARE $(LDFLAGS) - <<KEEP # @@ -1402,16 +1402,6 @@ install-all: install-generated-files peflags --dynamicbase=true --nxcompat=true lib/gtk-2.0/modules/*.dll !ENDIF cd .. -!IF DEFINED(QT5_BASE_DIR) - cd $(QT5_BASE_DIR)\bin -!IF "$(QT_VERSION)" == "5.2" - if exist windeployqt.exe windeployqt.exe $(CURR_DIR)"\$(INSTALL_DIR_QT)\qtshark.exe" -!ENDIF -!IF "$(QT_VERSION)" == "5.3" - if exist windeployqt.exe windeployqt.exe --release $(CURR_DIR)"\$(INSTALL_DIR_QT)\qtshark.exe" -!ENDIF - cd "$(MAKEDIR)" -!ENDIF checkapi_local: $(PERL) tools/checkAPIs.pl -build \ |