janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-24 06:40:39 +01:00
Code Activity

defs.mk: Make it compile under SuSE 10.0, X86-64

Browse source
This commit is contained in:
Jan Lindemann 2006-03-16 09:06:20 +00:00 • committed by Jan Lindemann
commit 6ac400b30e
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
make/defs.mk
View file

@ -180,7 +180,7 @@ ifeq ($(QT_VERSION),2)
QT_PREFIX = /usr/lib/qt2 QT_PREFIX = /usr/lib/qt2
else else
ifeq ($(QT_VERSION),3) ifeq ($(QT_VERSION),3)
QT_PREFIX = /usr/lib/qt3 QT_PREFIX = /usr/lib/qt3
else else
ifeq ($(QT_VERSION),4) ifeq ($(QT_VERSION),4)
QT_PREFIX = $(HOME)/opt/qt4 QT_PREFIX = $(HOME)/opt/qt4
@ -191,7 +191,13 @@ endif
INCLUDE += -I$(QT_PREFIX)/include INCLUDE += -I$(QT_PREFIX)/include
LD_LIB_PATH += $(QT_PREFIX)/lib ifeq ($(ARCH),x86)
LD_LIB_PATH += $(QT_PREFIX)/lib
QT_LDFLAGS += -L$(QT_PREFIX)/lib
else
LD_LIB_PATH += $(QT_PREFIX)/lib64
QT_LDFLAGS += -L$(QT_PREFIX)/lib64
endif
MOC = $(QT_PREFIX)/bin/moc MOC = $(QT_PREFIX)/bin/moc
UIC = $(QT_PREFIX)/bin/uic UIC = $(QT_PREFIX)/bin/uic
@ -217,21 +223,25 @@ OBJ += $(patsubst %.cpp,%.o,$(RCC_CPP))
ifdef REENTRANT ifdef REENTRANT
ifneq ($(QT_VERSION),4) ifneq ($(QT_VERSION),4)
LPPFLAGS += -L$(QT_PREFIX)/lib -lqt-mt LPPFLAGS += $(QT_LDFLAGS) -lqt-mt
else else
LPPFLAGS += -L$(QT_PREFIX)/lib -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
endif endif
else else
ifneq ($(QT_VERSION),4) ifneq ($(QT_VERSION),4)
LPPFLAGS += -L$(QT_PREFIX)/lib -lqt LPPFLAGS += $(QT_LDFLAGS) -lqt
else else
LPPFLAGS += -L$(QT_PREFIX)/lib -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
endif endif
endif endif
endif endif
ifeq ($(USE_X),true) ifeq ($(USE_X),true)
LDFLAGS += -L/usr/X11/lib -lXext -lX11 ifeq ($(ARCH),x86)
LDFLAGS += -L/usr/X11/lib -lXext -lX11
else
LDFLAGS += -L/usr/X11/lib64 -lXext -lX11
endif
endif endif
LPPFLAGS += -lstdc++ LPPFLAGS += -lstdc++