]> SALOME platform Git repositories - tools/install.git/commitdiff
Salome HOME
Fix pb with OpenGL libraries (for qt) on 64bit platforms (RHEL 4 64bit)
authorvsr <vsr@opencascade.com>
Fri, 23 May 2008 13:39:09 +0000 (13:39 +0000)
committervsr <vsr@opencascade.com>
Fri, 23 May 2008 13:39:09 +0000 (13:39 +0000)
config_files/patches/qt-3.3.4-lib64.patch

index f5051b873e8f16f41c6fa1eac449b1c6bd01b86d..c50eb83b8f43e6b422dfc7ca32d0a98c53ef8719 100755 (executable)
@@ -1,6 +1,6 @@
-diff -Naur qt-3.3.4-original/mkspecs/linux-g++-64/qmake.conf qt-3.3.4-changed/mkspecs/linux-g++-64/qmake.conf
---- qt-3.3.4-original/mkspecs/linux-g++-64/qmake.conf  2005-01-21 20:16:44.000000000 +0300
-+++ qt-3.3.4-changed/mkspecs/linux-g++-64/qmake.conf   2006-10-12 14:09:27.000000000 +0400
+diff -Naur --exclude=CVS qt-3.3.4-orig/mkspecs/linux-g++-64/qmake.conf qt-3.3.4/mkspecs/linux-g++-64/qmake.conf
+--- qt-3.3.4-orig/mkspecs/linux-g++-64/qmake.conf      2005-01-21 20:16:44.000000000 +0300
++++ qt-3.3.4/mkspecs/linux-g++-64/qmake.conf   2008-05-23 17:34:01.000000000 +0400
 @@ -17,7 +17,7 @@
  QMAKE_LEXFLAGS                =
  QMAKE_YACC            = yacc
@@ -10,3 +10,12 @@ diff -Naur qt-3.3.4-original/mkspecs/linux-g++-64/qmake.conf qt-3.3.4-changed/mk
  QMAKE_CFLAGS_DEPS     = -M
  QMAKE_CFLAGS_WARN_ON  = -Wall -W
  QMAKE_CFLAGS_WARN_OFF = -w
+@@ -45,7 +45,7 @@
+ QMAKE_INCDIR_QT               = $(QTDIR)/include
+ QMAKE_LIBDIR_QT               = $(QTDIR)/lib
+ QMAKE_INCDIR_OPENGL   = /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib64
++QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib64 /usr/lib64
+ QMAKE_LINK            = g++
+ QMAKE_LINK_SHLIB      = g++