patches/qt45-02-use-gcc43.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 2550 233eeb1c68fd
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2550
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
     1
--- qt-x11-opensource-src-4.5.2/mkspecs/solaris-g++/qmake.conf.orig	Sat Jun 20 06:57:53 2009
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
     2
+++ qt-x11-opensource-src-4.5.2/mkspecs/solaris-g++/qmake.conf	Thu Apr 29 18:17:30 2010
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
     3
@@ -41,14 +41,14 @@
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
     4
 QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
     5
 QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
     6
 
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
     7
-QMAKE_INCDIR		= /usr/sfw/include
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
     8
-QMAKE_LIBDIR		= /usr/sfw/lib
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
     9
-QMAKE_INCDIR_X11	= /usr/openwin/include
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
    10
-QMAKE_LIBDIR_X11	= /usr/openwin/lib
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
    11
+QMAKE_INCDIR		= /usr/gcc/4.3/include
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
    12
+QMAKE_LIBDIR		= /usr/gcc/4.3/lib
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
    13
+QMAKE_INCDIR_X11	= /usr/X11/include
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
    14
+QMAKE_LIBDIR_X11	= /usr/X11/lib
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
    15
 QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
    16
 QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
    17
-QMAKE_INCDIR_OPENGL	= /usr/openwin/include
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
    18
-QMAKE_LIBDIR_OPENGL	= /usr/openwin/lib
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
    19
+QMAKE_INCDIR_OPENGL	= /usr/X11/include
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
    20
+QMAKE_LIBDIR_OPENGL	= /usr/X11/lib
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
    21
 
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
    22
 QMAKE_LINK		= g++
233eeb1c68fd For SFEscribus
dauphing
parents:
diff changeset
    23
 QMAKE_LINK_SHLIB	= g++