summaryrefslogtreecommitdiffstats
path: root/tqtinterface/qt4/mkspecs/hurd-g++
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-07-23 17:13:36 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-07-23 17:13:36 -0500
commitd3f7a9d6f1b8f6e24fb49aaa8caeaa7623ae48b5 (patch)
treebaeeba639393f46abab749f4700a250091c3cc16 /tqtinterface/qt4/mkspecs/hurd-g++
parentd7be1694839bacae31e500ea9e36b3c13257ce28 (diff)
downloadexperimental-d3f7a9d6f1b8f6e24fb49aaa8caeaa7623ae48b5.tar.gz
experimental-d3f7a9d6f1b8f6e24fb49aaa8caeaa7623ae48b5.zip
Apply all Qt3.3.8d patches
NOTE: This will *likely* break compilation of TQt4 Please wait a few days for fixes to be committed as needed!
Diffstat (limited to 'tqtinterface/qt4/mkspecs/hurd-g++')
-rw-r--r--tqtinterface/qt4/mkspecs/hurd-g++/qmake.conf13
1 files changed, 10 insertions, 3 deletions
diff --git a/tqtinterface/qt4/mkspecs/hurd-g++/qmake.conf b/tqtinterface/qt4/mkspecs/hurd-g++/qmake.conf
index 6c43133..5744d6a 100644
--- a/tqtinterface/qt4/mkspecs/hurd-g++/qmake.conf
+++ b/tqtinterface/qt4/mkspecs/hurd-g++/qmake.conf
@@ -15,7 +15,7 @@ TQMAKE_LEX = flex
TQMAKE_LEXFLAGS =
TQMAKE_YACC = yacc
TQMAKE_YACCFLAGS = -d
-TQMAKE_CFLAGS =
+TQMAKE_CFLAGS = -pipe
TQMAKE_CFLAGS_DEPS = -M
TQMAKE_CFLAGS_WARN_ON = -Wall -W
TQMAKE_CFLAGS_WARN_OFF = -w
@@ -23,6 +23,7 @@ TQMAKE_CFLAGS_RELEASE = -O2
TQMAKE_CFLAGS_DEBUG = -g
TQMAKE_CFLAGS_SHLIB = -fPIC
TQMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
+TQMAKE_CFLAGS_THREAD = -D_REENTRANT
TQMAKE_CXX = g++
TQMAKE_CXXFLAGS = $$TQMAKE_CFLAGS
@@ -33,6 +34,7 @@ TQMAKE_CXXFLAGS_RELEASE = $$TQMAKE_CFLAGS_RELEASE
TQMAKE_CXXFLAGS_DEBUG = $$TQMAKE_CFLAGS_DEBUG
TQMAKE_CXXFLAGS_SHLIB = $$TQMAKE_CFLAGS_SHLIB
TQMAKE_CXXFLAGS_YACC = $$TQMAKE_CFLAGS_YACC
+TQMAKE_CXXFLAGS_THREAD = $$TQMAKE_CFLAGS_THREAD
TQMAKE_INCDIR =
TQMAKE_LIBDIR =
@@ -51,14 +53,19 @@ TQMAKE_LFLAGS_DEBUG =
TQMAKE_LFLAGS_SHLIB = -shared
TQMAKE_LFLAGS_PLUGIN = $$TQMAKE_LFLAGS_SHLIB
TQMAKE_LFLAGS_SONAME = -Wl,-soname,
+TQMAKE_LFLAGS_THREAD =
-TQMAKE_LIBS =
+# The following trick (TQMAKE_LIBS{,_THREAD}) is needed at the moment
+TQMAKE_LIBS = -lpthread
TQMAKE_LIBS_DYNLOAD = -ldl
TQMAKE_LIBS_X11 = -lXext -lX11 -lm
+TQMAKE_LIBS_X11SM = -lSM -lICE
+TQMAKE_LIBS_NIS = -lnsl
TQMAKE_LIBS_QT = -lqt
-
+TQMAKE_LIBS_TQT_THREAD = -lqt-mt
TQMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu
TQMAKE_LIBS_OPENGL_QT = -lGL -lXmu
+TQMAKE_LIBS_THREAD =
TQMAKE_TQMOC = $(TQTDIR)/bin/tqmoc
TQMAKE_UIC = $(TQTDIR)/bin/uic