janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-21 05:47:38 +01:00
Code Activity

make: Introduce QT_MAJOR_VERSION

Browse source 
- Replace QT_MAJOR_VERSION
  - Replace QT_VERSION by QT_MAJOR_VERSION
This commit is contained in:
Jan Lindemann 2007-06-17 11:51:29 +00:00 • committed by Jan Lindemann
commit 0f3d0ad40d
4 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

28
make/qt-defs.mk
View file

@ -2,28 +2,32 @@ ifeq ($(USE_QT),true)
USE_X = true USE_X = true
CPPFLAGS += -DQT_THREAD_SUPPORT CPPFLAGS += -DQT_THREAD_SUPPORT
QT_VERSION ?= 4 QT_VERSION = 4.3.0
QT_MAJOR_VERSION ?= $(shell echo $(QT_VERSION) | cut -d\. -f1)
ifeq ($(QT_VERSION),2) ifeq ($(QT_MAJOR_VERSION),2)
QT_PREFIX = /usr/lib/qt2 QT_PREFIX = /usr/lib/qt2
INCLUDE += -I$(QT_PREFIX)/include
else else
ifeq ($(QT_VERSION),3) ifeq ($(QT_MAJOR_VERSION),3)
QT_PREFIX = /usr/lib/qt3 QT_PREFIX = /usr/lib/qt3
INCLUDE += -I$(QT_PREFIX)/include
else else
ifeq ($(QT_VERSION),4) ifeq ($(QT_MAJOR_VERSION),4)
QT_PREFIX = $(HOME)/opt/qt4 QT_PREFIX = $(HOME)/opt/qt4
INCLUDE += -I$(QT_PREFIX)/include/Qt INCLUDE += -I$(QT_PREFIX)/include \
$(addprefix -I$(QT_PREFIX)/include/, \
Qt Qt3Support QtAssistant QtCore QtDesigner \
QtGui QtNetwork QtOpenGL QtScript)
endif endif
endif endif
endif endif
INCLUDE += -I$(QT_PREFIX)/include
ifeq ($(ARCH),x86) ifeq ($(ARCH),x86)
LD_LIB_PATH += $(QT_PREFIX)/lib LD_LIB_PATH += $(QT_PREFIX)/lib
QT_LDFLAGS += -L$(QT_PREFIX)/lib QT_LDFLAGS += -L$(QT_PREFIX)/lib
else else
ifeq ($(QT_VERSION),4) ifeq ($(QT_MAJOR_VERSION),4)
LD_LIB_PATH += $(QT_PREFIX)/lib LD_LIB_PATH += $(QT_PREFIX)/lib
QT_LDFLAGS += -L$(QT_PREFIX)/lib QT_LDFLAGS += -L$(QT_PREFIX)/lib
else else
@ -43,7 +47,7 @@ MOC_H_UI = $(patsubst %.ui,%.h,$(UIFILES))
MOC_H = $(sort $(MOC_H_HC) $(MOC_H_UI)) MOC_H = $(sort $(MOC_H_HC) $(MOC_H_UI))
MOC_CPP = $(patsubst %.h,moc_%.cpp, $(MOC_H)) MOC_CPP = $(patsubst %.h,moc_%.cpp, $(MOC_H))
RCC_CPP = $(patsubst %.qrc,rcc_%.cpp, $(RCCFILES)) RCC_CPP = $(patsubst %.qrc,rcc_%.cpp, $(RCCFILES))
ifeq ($(QT_VERSION),4) ifeq ($(QT_MAJOR_VERSION),4)
UIC_H = $(patsubst %.ui,ui_%.h, $(UIFILES)) UIC_H = $(patsubst %.ui,ui_%.h, $(UIFILES))
else else
UIC_H = $(patsubst %.ui,%.h, $(UIFILES)) UIC_H = $(patsubst %.ui,%.h, $(UIFILES))
@ -55,14 +59,14 @@ OBJ += $(patsubst %.cpp,%.o,$(UIC_CPP))
OBJ += $(patsubst %.cpp,%.o,$(RCC_CPP)) OBJ += $(patsubst %.cpp,%.o,$(RCC_CPP))
ifdef REENTRANT ifdef REENTRANT
ifneq ($(QT_VERSION),4) ifneq ($(QT_MAJOR_VERSION),4)
LPPFLAGS += $(QT_LDFLAGS) -lqt-mt LPPFLAGS += $(QT_LDFLAGS) -lqt-mt
else else
# LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug # LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore
endif endif
else else
ifneq ($(QT_VERSION),4) ifneq ($(QT_MAJOR_VERSION),4)
LPPFLAGS += $(QT_LDFLAGS) -lqt LPPFLAGS += $(QT_LDFLAGS) -lqt
else else
# LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug # LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug

4
make/qtplugin.mk
View file

@ -4,8 +4,8 @@
# $Id$ # $Id$
USE_QT = true USE_QT = true
ifndef QT_VERSION ifndef QT_MAJOR_VERSION
QT_VERSION = 4 QT_MAJOR_VERSION = 4
endif endif
include $(MODDIR)/make/plugin.mk include $(MODDIR)/make/plugin.mk

4
make/qtversion.mk
View file

@ -1,4 +1,4 @@
USE_QT = true USE_QT = true
ifndef QT_VERSION ifndef QT_MAJOR_VERSION
QT_VERSION = 4 QT_MAJOR_VERSION = 4
endif endif

6
make/rules.mk
View file

@ -24,7 +24,7 @@ $(LIBDIR):
# $(AR) r $@ $*.o # $(AR) r $@ $*.o
# $(RM) $*.o # $(RM) $*.o
ifeq ($(QT_VERSION),3) ifeq ($(QT_MAJOR_VERSION),3)
moc_%.cpp: %.h moc_%.cpp: %.h
$(MOC) -o $@ $< $(MOC) -o $@ $<
else else
@ -35,14 +35,14 @@ endif
rcc_%.cpp: %.qrc rcc_%.cpp: %.qrc
$(RCC) -o $@ $< $(RCC) -o $@ $<
ifeq ($(QT_VERSION),4) ifeq ($(QT_MAJOR_VERSION),4)
ui_%.h: %.ui ui_%.h: %.ui
else else
%.h: %.ui %.h: %.ui
endif endif
$(UIC) $< -o $@ $(UIC) $< -o $@
ifeq ($(QT_VERSION),4) ifeq ($(QT_MAJOR_VERSION),4)
uic_%.cpp: %.h uic_%.cpp: %.h
echo -e "#include <$<>\n" > $@ echo -e "#include <$<>\n" > $@
else else