janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

qt*.mk: Fix conditional QT_VERSION definition

Browse source 
Fix, sortof, conditional variable definitions of QT_VERSION.
This commit is contained in:
Jan Lindemann 2007-07-03 13:38:27 +00:00 • committed by Jan Lindemann
commit a52010723f
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/qt-defs.mk
View file

@ -2,7 +2,7 @@ ifeq ($(USE_QT),true)
USE_X = true USE_X = true
CPPFLAGS += -DQT_THREAD_SUPPORT CPPFLAGS += -DQT_THREAD_SUPPORT
QT_VERSION = 4.3.0 QT_VERSION ?= 4.3.0
QT_MAJOR_VERSION ?= $(shell echo $(QT_VERSION) | cut -d\. -f1) QT_MAJOR_VERSION ?= $(shell echo $(QT_VERSION) | cut -d\. -f1)
ifeq ($(QT_MAJOR_VERSION),2) ifeq ($(QT_MAJOR_VERSION),2)

4
make/qtexe.mk
View file

@ -3,7 +3,9 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
include $(MODDIR)/make/qtversion.mk USE_QT = true
include $(MODDIR)/make/qt-defs.mk
include $(MODDIR)/make/exe.mk include $(MODDIR)/make/exe.mk
include $(MODDIR)/make/qt.mk include $(MODDIR)/make/qt.mk