diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2014-06-25 14:18:40 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-06-27 13:29:53 +0000 |
| commit | 18e14a4c6c47409c2e56e5aa5925c9f9669109eb (patch) | |
| tree | 1afe4de6f7498724ebc49ece9badd47b1d77fb83 /Makefile.nmake | |
| parent | d894c2e1e0ebe564ac8d9a6ee4a4d75b1996e662 (diff) | |
Have the makefile run windepoyqt if it exists to copy the required dlls to the install dir.
Change-Id: If87c2670e1ffef116d4497241f070fa41a70015b
Reviewed-on: https://code.wireshark.org/review/2644
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 321b498203..9c68858675 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -12,6 +12,7 @@ include <win32.mak> CC = cl LINK= link BSCMAKE= bscmake +CURR_DIR= "$(MAKEDIR)" WIN_SETUP=tools/$(WIRESHARK_TARGET_PLATFORM)-setup.sh @@ -1401,6 +1402,16 @@ 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 \ |