mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 12:03:31 +01:00
defs.mk: Add support for qt beta 2
This commit is contained in:
parent
594d1272b9
commit
7eefb59889
1 changed files with 18 additions and 6 deletions
24
make/defs.mk
24
make/defs.mk
|
|
@ -152,12 +152,21 @@ INSTALLED_SHOBJS = $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS))
|
|||
ifeq ($(USE_QT),true)
|
||||
USE_X = true
|
||||
|
||||
ifeq ($(QT_VERSION),3)
|
||||
QT_PREFIX = /usr/lib/qt3
|
||||
else
|
||||
ifeq ($(QT_VERSION),2)
|
||||
QT_PREFIX = /usr/lib/qt2
|
||||
else
|
||||
ifeq ($(QT_VERSION),3)
|
||||
QT_PREFIX = /usr/lib/qt3
|
||||
else
|
||||
ifeq ($(QT_VERSION),4)
|
||||
QT_PREFIX = $(HOME)/opt/qt4-b2
|
||||
INCLUDE += -I$(QT_PREFIX)/include/Qt
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
INCLUDE += -I$(QT_PREFIX)/include
|
||||
|
||||
LD_LIB_PATH += $(QT_PREFIX)/lib
|
||||
|
||||
MOC = $(QT_PREFIX)/bin/moc
|
||||
|
|
@ -178,11 +187,14 @@ OBJ += $(patsubst %.cpp,%.o,$(UIC_CPP))
|
|||
ifdef REENTRANT
|
||||
LPPFLAGS += -L$(QT_PREFIX)/lib -lqt-mt
|
||||
else
|
||||
LPPFLAGS += -L$(QT_PREFIX)/lib -lqt
|
||||
endif
|
||||
INCLUDE += -I$(QT_PREFIX)/include
|
||||
ifneq ($(QT_VERSION),4)
|
||||
LPPFLAGS += -L$(QT_PREFIX)/lib -lqt
|
||||
else
|
||||
LPPFLAGS += -L$(QT_PREFIX)/lib -lQtGui_debug -lQtCore_debug
|
||||
endif
|
||||
endif
|
||||
|
||||
endif
|
||||
ifeq ($(USE_X),true)
|
||||
LDFLAGS += -L/usr/X11/lib -lXext -lX11
|
||||
endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue