- Timestamp:
- Jul 27, 2021 1:40:44 PM (3 years ago)
- File:
-
- 1 edited
-
trunk/configure (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/configure
r90354 r90355 567 567 568 568 if [ -z "$WATCOM" ]; then 569 WATCOM=`/bin/ls -rd1 $ PWD/tools/common/openwatcom/* 2> /dev/null | head -1`569 WATCOM=`/bin/ls -rd1 $DEVDIR/common/openwatcom/* 2> /dev/null | head -1` 570 570 if [ -z "$WATCOM" ]; then 571 571 if [ $OSE -eq 0 -a $OS = "linux" ]; then … … 1548 1548 # First check if there is the internal version of Qt. If yes nothing else 1549 1549 # has to be done. 1550 QT_INTERNAL=`/bin/ls -rd1 $ PWD/tools/$BUILD_TARGET.$BUILD_PLATFORM_ARCH/qt/* 2> /dev/null`1550 QT_INTERNAL=`/bin/ls -rd1 $DEVDIR/$BUILD_TARGET.$BUILD_PLATFORM_ARCH/qt/* 2> /dev/null` 1551 1551 for t in $QT_INTERNAL; do 1552 1552 if [ -f "$t/Frameworks/QtCoreVBox.framework/QtCoreVBox" ]; then … … 1588 1588 if [ $? -eq 0 ]; then 1589 1589 echo "(Qt5 from pkg-config)" >> $LOG 1590 FLGQT5=`pkg-config Qt5Core --cflags`1590 FLGQT5=`pkg-config Qt5Core Qt5Gui --cflags` 1591 1591 # gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk) 1592 1592 [ $(($cc_maj * 100 + $cc_min)) -ge 408 ] && FLGQT5="$FLGQT5 -std=c++11" 1593 1593 INCQT5=`strip_I "$FLGQT5"` 1594 1594 LIBDIR5=`pkg-config Qt5Core --variable=libdir` 1595 LIBQT5=`pkg-config Qt5Core --libs`1595 LIBQT5=`pkg-config Qt5Core Qt5Gui --libs` 1596 1596 LIBQT5="-L$LIBDIR5 $LIBQT5" 1597 1597 TOOLQT5=`pkg-config Qt5Core --variable=prefix` … … 1608 1608 if [ -z "$foundqt5" ]; then 1609 1609 # Do it the old way (e.g. user has specified QT5DIR): 1610 for q in $QT5DIR "$ PWD/tools/linux.$TARGET_MACHINE"/qt/v5.*; do1610 for q in $QT5DIR "$DEVDIR/linux.$TARGET_MACHINE"/qt/v5.*; do 1611 1611 echo "(Qt5 from '$q')" >> $LOG 1612 1612 INCQT5="$q/include $q/include/QtCore" 1613 1613 FLGQT5="-DQT_SHARED -std=c++11" 1614 1614 I_INCQT5=`prefix_I "$INCQT5"` 1615 LIBQT5="-L$q/lib -lQt5CoreVBox "1615 LIBQT5="-L$q/lib -lQt5CoreVBox -lQt5GuiVBox" 1616 1616 TOOLQT5="$q" 1617 1617 if test_compile "$LIBQT5 $LIBPTHREAD $I_INCQT5 $FLGQT5" qt5 qt5 nofatal && … … 1620 1620 break; 1621 1621 fi 1622 LIBQT5="-L$q/lib -lQt5Core "1622 LIBQT5="-L$q/lib -lQt5Core lQt5Gui" 1623 1623 if test_compile "$LIBQT5 $LIBPTHREAD $I_INCQT5 $FLGQT5" qt5 qt5 nofatal && 1624 1624 test_execute_path "`L_to_PATH "$LIBQT5"`" nofatal; then
Note:
See TracChangeset
for help on using the changeset viewer.

