2009-06-07 13:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* contrib/hbqt/tests/hbqt.hbc
  * contrib/gtqtc/tests/gtqtc.hbc
    + Added static linking option for Windows. It can be
      enabled by setting envvar HB_QT_STATIC.
      (needs latest hbmk2)

  - contrib/gtalleg/tests/gtallegs.hbc
  - contrib/gtalleg/tests/gtallegd.hbc
  + contrib/gtalleg/tests/gtalleg.hbc
    + Merged separate static/shared config files into one.
      Static mode can now be enabled by setting evvar HB_ALLEGRO_STATIC.
      (needs latest hbmk2)
This commit is contained in:
Viktor Szakats
2009-06-07 11:33:58 +00:00
parent d372987f38
commit 4e59887d15
6 changed files with 28 additions and 24 deletions

View File

@@ -17,6 +17,20 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-06-07 13:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/tests/hbqt.hbc
* contrib/gtqtc/tests/gtqtc.hbc
+ Added static linking option for Windows. It can be
enabled by setting envvar HB_QT_STATIC.
(needs latest hbmk2)
- contrib/gtalleg/tests/gtallegs.hbc
- contrib/gtalleg/tests/gtallegd.hbc
+ contrib/gtalleg/tests/gtalleg.hbc
+ Merged separate static/shared config files into one.
Static mode can now be enabled by setting evvar HB_ALLEGRO_STATIC.
(needs latest hbmk2)
2009-06-07 11:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.hu_HU.po
* utils/hbmk2/hbmk2.prg

View File

@@ -0,0 +1,10 @@
#
# $Id$
#
libs=gtalleg
{win&HB_ALLEGRO_STATIC}libs=alleg_s d3d9 dsound
{win&!HB_ALLEGRO_STATIC}libs=alleg
{linux&HB_ALLEGRO_STATIC}ldflags="`allegro-config --static 2>/dev/null`"
{linux&!HB_ALLEGRO_STATIC}ldflags="`allegro-config --libs 2>/dev/null`"

View File

@@ -1,9 +0,0 @@
#
# $Id$
#
# shared linking
libs=gtalleg
{win}libs=alleg
{linux}ldflags="`allegro-config --libs 2>/dev/null`"

View File

@@ -1,9 +0,0 @@
#
# $Id$
#
# static linking
libs=gtalleg
{win}libs=alleg_s d3d9 dsound
{linux}ldflags="`allegro-config --static 2>/dev/null`"

View File

@@ -5,14 +5,13 @@
{allwin}libpaths=${HB_DIR_QT}\lib
{mingw|mingwce|(gcc&(linux|darwin))}libs=supc++
{allwin}libs=QtCore4 QtGui4 QtNetwork4 QtWebKit4
{allwin&!HB_QT_STATIC}libs=QtCore4 QtGui4 QtNetwork4 QtWebKit4
{allwin&HB_QT_STATIC}libs=QtCore QtGui QtNetwork QtWebKit
{linux}libs=QtCore QtGui QtNetwork QtWebKit
{darwin}libs=/Library/Frameworks/QtCore.framework/QtCore
{darwin}libs=/Library/Frameworks/QtGui.framework/QtGui
{darwin}libs=/Library/Frameworks/QtNetwork.framework/QtNetwork
{darwin}libs=/Library/Frameworks/QtWebKit.framework/QtWebKit
# static libs
#libs=QtCore QtGui QtNetwork QtWebKit
gui=yes
gt=gtqtc
# optional

View File

@@ -6,13 +6,12 @@
{mingw|mingwce|(gcc&(linux|darwin))}libs=supc++
libs=hbqt
{allwin}libs=QtCore4 QtGui4 QtNetwork4 QtWebKit4
{allwin&!HB_QT_STATIC}libs=QtCore4 QtGui4 QtNetwork4 QtWebKit4
{allwin&HB_QT_STATIC}libs=QtCore QtGui QtNetwork QtWebKit
{linux}libs=QtCore QtGui QtNetwork QtWebKit
{darwin}libs=/Library/Frameworks/QtCore.framework/QtCore
{darwin}libs=/Library/Frameworks/QtGui.framework/QtGui
{darwin}libs=/Library/Frameworks/QtNetwork.framework/QtNetwork
{darwin}libs=/Library/Frameworks/QtWebKit.framework/QtWebKit
# static libs
#libs=QtCore QtGui QtNetwork QtWebKit
gui=yes
gt=gtnul