From 79c4f25b39404f647e4ae0653e50fc86ef37f55a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Tue, 17 Dec 2024 03:07:16 +0100 Subject: [PATCH] 2024-12-17 03:07 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * contrib/gtqtc/gtqtc.hbc ! fixed dependency macros - hbmk2 defines HB_HAS_* only for optional packages --- ChangeLog.txt | 4 ++++ contrib/gtqtc/gtqtc.hbc | 22 ++++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index e78de17e2b..282ab8bb5a 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,10 @@ Entries may not always be in chronological/commit order. See license at the end of file. */ +2024-12-17 03:07 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * contrib/gtqtc/gtqtc.hbc + ! fixed dependency macros - hbmk2 defines HB_HAS_* only for optional packages + 2024-12-17 01:09 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * contrib/gtqtc/gtqtc.hbc * contrib/gtqtc/gtqtc.hbp diff --git a/contrib/gtqtc/gtqtc.hbc b/contrib/gtqtc/gtqtc.hbc index 6bb6c2c4cb..613213b2b7 100644 --- a/contrib/gtqtc/gtqtc.hbc +++ b/contrib/gtqtc/gtqtc.hbc @@ -31,22 +31,24 @@ depfinish=qt6 {!(HBMK_HAS_QT5|HBMK_HAS_QT6)&darwin}depincpath=qt:/usr/local/include {!(HBMK_HAS_QT5|HBMK_HAS_QT6)}depfinish=qt -{(allwin|os2)|HBMK_HAS_QT}libpaths=${HBMK_DIR_QT}/../lib -{(allwin|os2)|(HBMK_HAS_QT5|HBMK_HAS_QT6)}libpaths=${HBMK_DIR_QT5}/../lib +{(allwin|os2)|!(HBMK_HAS_QT5|HBMK_HAS_QT6)}libpaths=${HBMK_DIR_QT}/../lib +{(allwin|os2)|HBMK_HAS_QT5}libpaths=${HBMK_DIR_QT5}/../lib {(allwin|os2)|HBMK_HAS_QT6}libpaths=${HBMK_DIR_QT6}/../lib -{bsd&HBMK_HAS_QT}libpaths=/usr/local/lib/qt4 -{bsd&(HBMK_HAS_QT5|HBMK_HAS_QT6)}libpaths=/usr/local/lib/qt5 +{bsd&!(HBMK_HAS_QT5|HBMK_HAS_QT6)}libpaths=/usr/local/lib/qt4 +{bsd&HBMK_HAS_QT5}libpaths=/usr/local/lib/qt5 {bsd&HBMK_HAS_QT6}libpaths=/usr/local/lib/qt6 -{(allwin|os2)&HBMK_HAS_QT}libs=QtCore4 QtGui4 +{(allwin|os2)&!(HBMK_HAS_QT5|HBMK_HAS_QT6)}libs=QtCore4 QtGui4 {(allwin|os2|linux|bsd|beos|symbian)&HBMK_HAS_QT5}libs=Qt5Core Qt5Gui Qt5Widgets {(allwin|os2|linux|bsd|beos|symbian)&HBMK_HAS_QT6}libs=Qt6Core Qt6Gui Qt6Widgets {(allwin|os2|linux|bsd|beos|symbian)&HBMK_HAS_QT5&HB_QT_SOUND='yes'}libs=Qt5Multimedia {(allwin|os2|linux|bsd|beos|symbian)&HBMK_HAS_QT6&HB_QT_SOUND='yes'}libs=Qt6Multimedia -{(linux|beos|symbian)&HBMK_HAS_QT}libs=QtCore QtGui -{HBMK_HAS_QT&darwin}ldflags=-F${HBMK_DIR_QT}/../lib -{HBMK_HAS_QT&darwin}dflags=-F${HBMK_DIR_QT}/../lib -{(HBMK_HAS_QT5|HBMK_HAS_QT6)&darwin}ldflags=-F${HBMK_DIR_QT5}/../lib -{(HBMK_HAS_QT5|HBMK_HAS_QT6)&darwin}dflags=-F${HBMK_DIR_QT5}/../lib +{(linux|beos|symbian)&!(HBMK_HAS_QT5|HBMK_HAS_QT6)}libs=QtCore QtGui +{!(HBMK_HAS_QT5|HBMK_HAS_QT6)&darwin}ldflags=-F${HBMK_DIR_QT}/../lib +{!(HBMK_HAS_QT5|HBMK_HAS_QT6)&darwin}dflags=-F${HBMK_DIR_QT}/../lib +{HBMK_HAS_QT5&darwin}ldflags=-F${HBMK_DIR_QT5}/../lib +{HBMK_HAS_QT5&darwin}dflags=-F${HBMK_DIR_QT5}/../lib +{HBMK_HAS_QT6&darwin}ldflags=-F${HBMK_DIR_QT6}/../lib +{HBMK_HAS_QT6&darwin}dflags=-F${HBMK_DIR_QT6}/../lib {darwin}frameworks=QtCore QtGui {darwin&(HBMK_HAS_QT5|HBMK_HAS_QT6)}frameworks=QtWidgets {darwin&(HBMK_HAS_QT5|HBMK_HAS_QT6)&HB_QT_SOUND='yes'}frameworks=QtMultimedia