janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-23 06:30:38 +01:00
Code Activity

defs.mk: Add support for qt beta 2

Browse source
This commit is contained in:
Jan Lindemann 2005-04-20 11:03:06 +00:00 • committed by Jan Lindemann
commit 7eefb59889
1 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
make/defs.mk
View file

@ -152,11 +152,20 @@ INSTALLED_SHOBJS = $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS))
ifeq ($(USE_QT),true) ifeq ($(USE_QT),true)
USE_X = true USE_X = true
ifeq ($(QT_VERSION),2)
QT_PREFIX = /usr/lib/qt2
else
ifeq ($(QT_VERSION),3) ifeq ($(QT_VERSION),3)
QT_PREFIX = /usr/lib/qt3 QT_PREFIX = /usr/lib/qt3
else else
QT_PREFIX = /usr/lib/qt2 ifeq ($(QT_VERSION),4)
QT_PREFIX = $(HOME)/opt/qt4-b2
INCLUDE += -I$(QT_PREFIX)/include/Qt
endif endif
endif
endif
INCLUDE += -I$(QT_PREFIX)/include
LD_LIB_PATH += $(QT_PREFIX)/lib LD_LIB_PATH += $(QT_PREFIX)/lib
@ -178,11 +187,14 @@ OBJ += $(patsubst %.cpp,%.o,$(UIC_CPP))
ifdef REENTRANT ifdef REENTRANT
LPPFLAGS += -L$(QT_PREFIX)/lib -lqt-mt LPPFLAGS += -L$(QT_PREFIX)/lib -lqt-mt
else else
ifneq ($(QT_VERSION),4)
LPPFLAGS += -L$(QT_PREFIX)/lib -lqt LPPFLAGS += -L$(QT_PREFIX)/lib -lqt
else
LPPFLAGS += -L$(QT_PREFIX)/lib -lQtGui_debug -lQtCore_debug
endif endif
INCLUDE += -I$(QT_PREFIX)/include
endif endif
endif
ifeq ($(USE_X),true) ifeq ($(USE_X),true)
LDFLAGS += -L/usr/X11/lib -lXext -lX11 LDFLAGS += -L/usr/X11/lib -lXext -lX11
endif endif