fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-06-10 22:30 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* INSTALL
  * contrib/hbqt/hbqts.hbp
  * contrib/hbqt/hbqtguis.hbp
  * contrib/hbqt/hbqtcores.hbp
  * contrib/hbqt/hbqtnetworks.hbp
  * contrib/hbqt/hbqts.hbc
    % Fixed to avoid building separate, but completely idendical
      HBQT libs on Linux platform for linking to static QT libs.
      Please note that on all platforms except Windows and Symbian,
      it's not necessary to create separate HBQT builds for
      static and dynamic QT libraries. Instead, on these
      platforms (Linux, Darwin and possible OS/2) it's enough to
      just link the same HBQT libs with either static or dynamic
      QT libs. For this reason, recently added HBQT_ISSTATICLINK()
      function will only work on Windows, thus it's not portable.
      It needs to be redesigned to use QT API to retrieve lib type,
      or if such API doesn't exist, this function should be deleted
      from Harbour.
This commit is contained in:
Viktor Szakats
2010-06-10 20:33:15 +00:00
parent 346e4dcd94
commit bac17c287f
7 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
harbour/ChangeLog
View File

@@ -16,6 +16,26 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-06-10 22:30 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
* contrib/hbqt/hbqts.hbp
* contrib/hbqt/hbqtguis.hbp
* contrib/hbqt/hbqtcores.hbp
* contrib/hbqt/hbqtnetworks.hbp
* contrib/hbqt/hbqts.hbc
% Fixed to avoid building separate, but completely idendical
HBQT libs on Linux platform for linking to static QT libs.
Please note that on all platforms except Windows and Symbian,
it's not necessary to create separate HBQT builds for
static and dynamic QT libraries. Instead, on these
platforms (Linux, Darwin and possible OS/2) it's enough to
just link the same HBQT libs with either static or dynamic
QT libs. For this reason, recently added HBQT_ISSTATICLINK()
function will only work on Windows, thus it's not portable.
It needs to be redesigned to use QT API to retrieve lib type,
or if such API doesn't exist, this function should be deleted
from Harbour.
2010-06-10 21:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* external/zlib/deflate.c
* external/zlib/zutil.c

4
harbour/INSTALL
View File

@@ -333,9 +333,9 @@ HARBOUR
locally hosted copy of these packages, where applicable. 'nolocal' will
explicitly disable using locally hosted copies.
Some contribs support build mode in which they can be linkek _statically_
Some contribs support build mode in which they can be linked _statically_
with 3rd party components:
HB_QT_STATIC=yes
HB_QT_STATIC=yes (only meaningful on Windows platform)
You can override automatic detection of QT 'moc' tool, f.e.:
HB_QT_MOC_BIN=/opt/qt46/bin/moc

2
harbour/contrib/hbqt/hbqtcores.hbp
View File

@@ -2,7 +2,7 @@
# $Id$
#
-stop{!HB_QT_STATIC}
-stop{!HB_QT_STATIC|!allwin}
hbqtcore.hbp

2
harbour/contrib/hbqt/hbqtguis.hbp
View File

@@ -2,7 +2,7 @@
# $Id$
#
-stop{!HB_QT_STATIC}
-stop{!HB_QT_STATIC|!allwin}
hbqtgui.hbp

2
harbour/contrib/hbqt/hbqtnetworks.hbp
View File

@@ -2,7 +2,7 @@
# $Id$
#
-stop{!HB_QT_STATIC}
-stop{!HB_QT_STATIC|!allwin}
hbqtnetwork.hbp

3
harbour/contrib/hbqt/hbqts.hbc
View File

@@ -7,7 +7,8 @@ incpaths=.
{allwin|os2}libpaths=${HB_WITH_QT}\..\lib
libs=${hb_name}
libs=hbqtcores hbqtguis hbqtnetworks
{allwin}libs=hbqtcores hbqtguis hbqtnetworks
{linux}libs=hbqtcore hbqtgui hbqtnetwork
{allwin|linux}libs=QtCore QtGui QtNetwork QtUiTools
{allgcc}libs=supc++

2
harbour/contrib/hbqt/hbqts.hbp
View File

@@ -2,7 +2,7 @@
# $Id$
#
-stop{!HB_QT_STATIC}
-stop{!HB_QT_STATIC|!allwin}
hbqt.hbp