| -rw-r--r-- | mkspecs/qws/linux-generic-g++/qmake.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/qws/linux-generic-g++/qmake.conf b/mkspecs/qws/linux-generic-g++/qmake.conf index add69b3..2610b12 100644 --- a/mkspecs/qws/linux-generic-g++/qmake.conf +++ b/mkspecs/qws/linux-generic-g++/qmake.conf | |||
| @@ -20,50 +20,50 @@ QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | |||
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = $(CCACHE) $(DISTCC) g++ | 25 | QMAKE_CXX = $(CCACHE) $(DISTCC) g++ |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 34 | 34 | ||
| 35 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
| 36 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
| 37 | QMAKE_INCDIR_X11= | 37 | QMAKE_INCDIR_X11= |
| 38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
| 39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | 43 | ||
| 44 | QMAKE_LINK = gcc | 44 | QMAKE_LINK = g++ |
| 45 | QMAKE_LINK_SHLIB= gcc | 45 | QMAKE_LINK_SHLIB= g++ |
| 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 47 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 48 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB = -shared | 49 | QMAKE_LFLAGS_SHLIB = -shared |
| 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD = | 52 | QMAKE_LFLAGS_THREAD = |
| 53 | QMAKE_RPATH = -Wl,-rpath, | 53 | QMAKE_RPATH = -Wl,-rpath, |
| 54 | 54 | ||
| 55 | QMAKE_LIBS = $(LIBS_EXTRA) | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 56 | QMAKE_LIBS_DYNLOAD = -ldl | 56 | QMAKE_LIBS_DYNLOAD = -ldl |
| 57 | QMAKE_LIBS_X11 = | 57 | QMAKE_LIBS_X11 = |
| 58 | QMAKE_LIBS_X11SM= | 58 | QMAKE_LIBS_X11SM= |
| 59 | QMAKE_LIBS_QT = -lqte | 59 | QMAKE_LIBS_QT = -lqte |
| 60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 60 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
| 61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 61 | QMAKE_LIBS_QT_OPENGL= -lqgl |
| 62 | QMAKE_LIBS_THREAD = -lpthread | 62 | QMAKE_LIBS_THREAD = -lpthread |
| 63 | 63 | ||
| 64 | QMAKE_MOC = $(QTDIR)/bin/moc | 64 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 65 | QMAKE_UIC = $(QTDIR)/bin/uic | 65 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 66 | 66 | ||
| 67 | QMAKE_AR = ar cqs | 67 | QMAKE_AR = ar cqs |
| 68 | QMAKE_RANLIB = | 68 | QMAKE_RANLIB = |
| 69 | 69 | ||