Kludge to coexist with qt1 (e.g., put QTDIR first, so that qt1 won't be
found).
This commit is contained in:
parent
9aae4e7d4c
commit
73f1fd98e1
@ -22,7 +22,7 @@
|
||||
# Linking with support libraries
|
||||
# X11
|
||||
-SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib
|
||||
+SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib -L/usr/local/lib
|
||||
+SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib -L$(QTDIR)/lib -L/usr/local/lib
|
||||
SYSCONF_LIBS_X11 = -lXext -lX11 -lm
|
||||
# Qt, Qt+OpenGL
|
||||
SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
|
||||
@ -30,7 +30,7 @@
|
||||
SYSCONF_LIBS_QT_OPENGL =
|
||||
# OpenGL
|
||||
-SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
|
||||
+SYSCONF_LFLAGS_OPENGL = -L/usr/local/lib -L/usr/X11R6/lib
|
||||
+SYSCONF_LFLAGS_OPENGL = -L$(QTDIR)/lib -L/usr/local/lib -L/usr/X11R6/lib
|
||||
SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu
|
||||
# Yacc
|
||||
SYSCONF_LIBS_YACC =
|
||||
@ -40,7 +40,7 @@
|
||||
-SYSCONF_LFLAGS =
|
||||
-SYSCONF_LIBS =
|
||||
+SYSCONF_LINK = $(SYS_CXX)
|
||||
+SYSCONF_LFLAGS = -L/usr/X11R6/lib -L/usr/local/lib
|
||||
+SYSCONF_LFLAGS = -L/usr/X11R6/lib -L$(QTDIR)/lib -L/usr/local/lib
|
||||
+SYSCONF_LIBS = -lz
|
||||
|
||||
# Link flags for shared objects
|
||||
|
@ -22,7 +22,7 @@
|
||||
# Linking with support libraries
|
||||
# X11
|
||||
-SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib
|
||||
+SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib -L/usr/local/lib
|
||||
+SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib -L$(QTDIR)/lib -L/usr/local/lib
|
||||
SYSCONF_LIBS_X11 = -lXext -lX11 -lm
|
||||
# Qt, Qt+OpenGL
|
||||
SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
|
||||
@ -30,7 +30,7 @@
|
||||
SYSCONF_LIBS_QT_OPENGL =
|
||||
# OpenGL
|
||||
-SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
|
||||
+SYSCONF_LFLAGS_OPENGL = -L/usr/local/lib -L/usr/X11R6/lib
|
||||
+SYSCONF_LFLAGS_OPENGL = -L$(QTDIR)/lib -L/usr/local/lib -L/usr/X11R6/lib
|
||||
SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu
|
||||
# Yacc
|
||||
SYSCONF_LIBS_YACC =
|
||||
@ -40,7 +40,7 @@
|
||||
-SYSCONF_LFLAGS =
|
||||
-SYSCONF_LIBS =
|
||||
+SYSCONF_LINK = $(SYS_CXX)
|
||||
+SYSCONF_LFLAGS = -L/usr/X11R6/lib -L/usr/local/lib
|
||||
+SYSCONF_LFLAGS = -L/usr/X11R6/lib -L$(QTDIR)/lib -L/usr/local/lib
|
||||
+SYSCONF_LIBS = -lz
|
||||
|
||||
# Link flags for shared objects
|
||||
|
Loading…
Reference in New Issue
Block a user