From 2429282aa55ea0c5948ee2b2f31a01d508ec45a1 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 8 Nov 2005 08:39:47 +0000 Subject: [PATCH] defs.mk: Follow Qt linker flag changes Remove -lqt-mt from linker flags for qt4 and add -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug --- make/defs.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/make/defs.mk b/make/defs.mk index 54842723..3c54b072 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -209,7 +209,11 @@ OBJ += $(patsubst %.cpp,%.o,$(UIC_CPP)) OBJ += $(patsubst %.cpp,%.o,$(RCC_CPP)) ifdef REENTRANT -LPPFLAGS += -L$(QT_PREFIX)/lib -lqt-mt + ifneq ($(QT_VERSION),4) + LPPFLAGS += -L$(QT_PREFIX)/lib -lqt-mt + else + LPPFLAGS += -L$(QT_PREFIX)/lib -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug + endif else ifneq ($(QT_VERSION),4) LPPFLAGS += -L$(QT_PREFIX)/lib -lqt