From 4e59887d15142b5dec1a630f5d099a2219e8307b Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 7 Jun 2009 11:33:58 +0000
Subject: [PATCH] 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)
---
 harbour/ChangeLog                          | 14 ++++++++++++++
 harbour/contrib/gtalleg/tests/gtalleg.hbc  | 10 ++++++++++
 harbour/contrib/gtalleg/tests/gtallegd.hbc |  9 ---------
 harbour/contrib/gtalleg/tests/gtallegs.hbc |  9 ---------
 harbour/contrib/gtqtc/tests/gtqtc.hbc      |  5 ++---
 harbour/contrib/hbqt/tests/hbqt.hbc        |  5 ++---
 6 files changed, 28 insertions(+), 24 deletions(-)
 create mode 100644 harbour/contrib/gtalleg/tests/gtalleg.hbc
 delete mode 100644 harbour/contrib/gtalleg/tests/gtallegd.hbc
 delete mode 100644 harbour/contrib/gtalleg/tests/gtallegs.hbc

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c5990580bf..a80624222d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -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
diff --git a/harbour/contrib/gtalleg/tests/gtalleg.hbc b/harbour/contrib/gtalleg/tests/gtalleg.hbc
new file mode 100644
index 0000000000..63816a9e71
--- /dev/null
+++ b/harbour/contrib/gtalleg/tests/gtalleg.hbc
@@ -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`"
diff --git a/harbour/contrib/gtalleg/tests/gtallegd.hbc b/harbour/contrib/gtalleg/tests/gtallegd.hbc
deleted file mode 100644
index b8dafe75cd..0000000000
--- a/harbour/contrib/gtalleg/tests/gtallegd.hbc
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-
-# shared linking
-
-libs=gtalleg
-{win}libs=alleg
-{linux}ldflags="`allegro-config --libs 2>/dev/null`"
diff --git a/harbour/contrib/gtalleg/tests/gtallegs.hbc b/harbour/contrib/gtalleg/tests/gtallegs.hbc
deleted file mode 100644
index 2c65aa9f76..0000000000
--- a/harbour/contrib/gtalleg/tests/gtallegs.hbc
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-
-# static linking
-
-libs=gtalleg
-{win}libs=alleg_s d3d9 dsound
-{linux}ldflags="`allegro-config --static 2>/dev/null`"
diff --git a/harbour/contrib/gtqtc/tests/gtqtc.hbc b/harbour/contrib/gtqtc/tests/gtqtc.hbc
index 06002f6a78..c5dbf50204 100644
--- a/harbour/contrib/gtqtc/tests/gtqtc.hbc
+++ b/harbour/contrib/gtqtc/tests/gtqtc.hbc
@@ -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
diff --git a/harbour/contrib/hbqt/tests/hbqt.hbc b/harbour/contrib/hbqt/tests/hbqt.hbc
index d5028ed4b8..e71bf3d429 100644
--- a/harbour/contrib/hbqt/tests/hbqt.hbc
+++ b/harbour/contrib/hbqt/tests/hbqt.hbc
@@ -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