diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-10-12 00:12:24 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-10-12 00:12:24 +0000 |
| commit | fcff2c96e6a30dda03f1f359c49a679e1432f672 (patch) | |
| tree | 28fa45de76d6d6c8e409e4c28bf14d3de854e469 /Makefile.nmake | |
| parent | 383ed6465ac88d7e09e376596ac0bbf5ff758576 (diff) | |
QT_DIR → QT5_BASE_DIR. This matches the CMake environment.
svn path=/trunk/; revision=52557
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index edf2b4c8f9..e012f1bd3b 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -192,7 +192,7 @@ EXECUTABLES=wireshark.exe tshark.exe rawshark.exe \ capinfos.exe editcap.exe mergecap.exe text2pcap.exe randpkt.exe \ reordercap.exe dumpcap.exe dftest.exe -!IFDEF QT_DIR +!IFDEF QT5_BASE_DIR EXECUTABLES=$(EXECUTABLES) qtshark.exe !ENDIF @@ -556,7 +556,7 @@ clean: clean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd gtk $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean -!IFDEF QT_DIR +!IFDEF QT5_BASE_DIR cd ../qt -$(MAKE) clean !ENDIF @@ -610,7 +610,7 @@ distclean: distclean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd gtk $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean -!IFDEF QT_DIR +!IFDEF QT5_BASE_DIR cd ../qt -$(MAKE) distclean !ENDIF @@ -657,7 +657,7 @@ maintainer-clean: maintainer-clean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd gtk $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean -!IFDEF QT_DIR +!IFDEF QT5_BASE_DIR cd ../qt -$(MAKE) distclean !ENDIF @@ -777,9 +777,9 @@ gtk:: help config.h svnversion.h doxygen cd ../.. qt:: help config.h svnversion.h doxygen -!IFDEF QT_DIR +!IFDEF QT5_BASE_DIR cd ui/qt - $(QT_DIR)\bin\qmake CONFIG+=release QtShark.pro + $(QT5_BASE_DIR)\bin\qmake CONFIG+=release QtShark.pro nmake cd ../.. !ENDIF @@ -858,8 +858,8 @@ REQUIRED_TOOLS=\ peflags \ $(PERL) \ $(PYTHON) \ -!IFDEF QT_DIR - --windowsonly $(QT_DIR)\bin\qmake \ +!IFDEF QT5_BASE_DIR + --windowsonly $(QT5_BASE_DIR)\bin\qmake \ !ENDIF sed \ unzip \ @@ -917,7 +917,7 @@ process_libs: @if not exist "$(WIRESHARK_LIB_DIR)" md "$(WIRESHARK_LIB_DIR)" @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ . WinPcap_$(PCAP_VERSION).exe -!IFNDEF QT_DIR +!IFNDEF QT5_BASE_DIR !MESSAGE Can't find Qt. This will become a problem at some point. !ENDIF !IFDEF GTK_DIR |