mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-27 05:10:36 +00:00
Unbroke with threaded GL library (XFree86-4) and recent QT changes (qtgl).
This commit is contained in:
parent
b3b3a86d86
commit
60b3916f6f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=40886
@ -20,7 +20,7 @@ USE_QT_VER= 2
|
||||
USE_MESA= yes
|
||||
USE_GMAKE= yes
|
||||
USE_LIBTOOL= yes
|
||||
CONFIGURE_ENV= LDFLAGS="-lm" \
|
||||
CONFIGURE_ENV= LDFLAGS="-lm ${PTHREAD_LIBS}" \
|
||||
QTDIR=${X11BASE}
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -21,10 +21,10 @@ $FreeBSD$
|
||||
CPPFLAGS="$saved_CPPFLAGS -I$qt_includes"
|
||||
if test -n "$qt_libraries"; then
|
||||
- LIBS="$saved_LIBS -L$qt_libraries -lqt"
|
||||
+ LIBS="$saved_LIBS -L$qt_libraries -lqt2"
|
||||
+ LIBS="$saved_LIBS -L$qt_libraries -lqtgl"
|
||||
else
|
||||
- LIBS="$saved_LIBS -lqt -lm $X11_LIBS"
|
||||
+ LIBS="$saved_LIBS -lqt2 -lm $X11_LIBS"
|
||||
+ LIBS="$saved_LIBS -lqtgl -lm $X11_LIBS"
|
||||
fi
|
||||
echo $ac_n "checking for QT includes ($qt_includes)""... $ac_c" 1>&6
|
||||
echo "configure:3021: checking for QT includes ($qt_includes)" >&5
|
||||
@ -33,10 +33,10 @@ $FreeBSD$
|
||||
if test "$qt_libraries_found" = "yes"; then
|
||||
if test -n "$qt_libraries"; then
|
||||
- QT_LIBS="-L$qt_libraries -lqt -lm $X11_LIBS";
|
||||
+ QT_LIBS="-L$qt_libraries -lqt2 -lm $X11_LIBS";
|
||||
+ QT_LIBS="-L$qt_libraries -lqtgl -lm $X11_LIBS";
|
||||
else
|
||||
- QT_LIBS="-lqt -lm $X11_LIBS";
|
||||
+ QT_LIBS="-lqt2 -lm $X11_LIBS";
|
||||
+ QT_LIBS="-lqtgl -lm $X11_LIBS";
|
||||
fi
|
||||
echo "$ac_t""yes" 1>&6
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user