2010-07-31 13:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* contrib/hbmysql/hbmysql.hbc * contrib/gtalleg/gtalleg.hbc * contrib/sddmy/sddmy.hbc * contrib/hbodbc/hbodbc.hbc * contrib/xhb/xhb.hbc * contrib/sddfb/sddfb.hbc * contrib/hbtpathy/hbtpathy.hbc * contrib/hbgt/hbgt.hbc * contrib/hbsqlit3/hbsqlit3.hbc * contrib/hbblat/hbblat.hbc * contrib/hbfbird/hbfbird.hbc * contrib/sddpg/sddpg.hbc * contrib/hbziparc/hbziparc.hbc * contrib/hbbz2/hbbz2.hbc * contrib/hbblink/hbblink.hbc * contrib/hbnf/hbnf.hbc * contrib/hbcurl/hbcurl.hbc * contrib/hbmemio/hbmemio.hbc * contrib/hbxpp/hbxpp.hbc * contrib/hbfship/hbfship.hbc * contrib/hbcups/hbcups.hbc * contrib/hbfoxpro/hbfoxpro.hbc * contrib/rddbmcdx/rddbmcdx.hbc * contrib/hbhpdf/hbhpdf.hbc * contrib/gtwvg/gtwvg.hbc * contrib/hbpgsql/hbpgsql.hbc * contrib/hbclipsm/hbclipsm.hbc * contrib/rddads/rddads.hbc * contrib/sddsqlt3/sddsqlt3.hbc * contrib/hbfimage/hbfimage.hbc * contrib/sddodbc/sddodbc.hbc * contrib/hbgd/hbgd.hbc * contrib/hbmisc/hbmisc.hbc * contrib/sddoci/sddoci.hbc * contrib/hbcomm/hbcomm.hbc * contrib/hbcairo/hbcairo.hbc * contrib/hbsms/hbsms.hbc + Added ${__HB_DYN__} to main lib libs= entry. This way the shared lib flavor can be selected to experiment with it. (use '-env:__HB_DYN__=_dll' hbmk2 option)
2010-07-31 12:00:53 +00:00
parent ff5a1d161b
commit 8b5211b118
38 changed files with 82 additions and 40 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,48 @@
   The license applies to all entries newer than 2009-04-28.
 */

+2010-07-31 13:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbmysql/hbmysql.hbc
+  * contrib/gtalleg/gtalleg.hbc
+  * contrib/sddmy/sddmy.hbc
+  * contrib/hbodbc/hbodbc.hbc
+  * contrib/xhb/xhb.hbc
+  * contrib/sddfb/sddfb.hbc
+  * contrib/hbtpathy/hbtpathy.hbc
+  * contrib/hbgt/hbgt.hbc
+  * contrib/hbsqlit3/hbsqlit3.hbc
+  * contrib/hbblat/hbblat.hbc
+  * contrib/hbfbird/hbfbird.hbc
+  * contrib/sddpg/sddpg.hbc
+  * contrib/hbziparc/hbziparc.hbc
+  * contrib/hbbz2/hbbz2.hbc
+  * contrib/hbblink/hbblink.hbc
+  * contrib/hbnf/hbnf.hbc
+  * contrib/hbcurl/hbcurl.hbc
+  * contrib/hbmemio/hbmemio.hbc
+  * contrib/hbxpp/hbxpp.hbc
+  * contrib/hbfship/hbfship.hbc
+  * contrib/hbcups/hbcups.hbc
+  * contrib/hbfoxpro/hbfoxpro.hbc
+  * contrib/rddbmcdx/rddbmcdx.hbc
+  * contrib/hbhpdf/hbhpdf.hbc
+  * contrib/gtwvg/gtwvg.hbc
+  * contrib/hbpgsql/hbpgsql.hbc
+  * contrib/hbclipsm/hbclipsm.hbc
+  * contrib/rddads/rddads.hbc
+  * contrib/sddsqlt3/sddsqlt3.hbc
+  * contrib/hbfimage/hbfimage.hbc
+  * contrib/sddodbc/sddodbc.hbc
+  * contrib/hbgd/hbgd.hbc
+  * contrib/hbmisc/hbmisc.hbc
+  * contrib/sddoci/sddoci.hbc
+  * contrib/hbcomm/hbcomm.hbc
+  * contrib/hbcairo/hbcairo.hbc
+  * contrib/hbsms/hbsms.hbc
+    + Added ${__HB_DYN__} to main lib libs= entry. This way the shared
+      lib flavor can be selected to experiment with it.
+      (use '-env:__HB_DYN__=_dll' hbmk2 option)
+
 2010-07-31 13:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
  * contrib/make.hbs
    % Code consolidation.
@@ -95,7 +137,7 @@
      symbols at link. Maybe this is not the right fix, go figure.
      (HB_STATIC_QT mode still has to be checked)

-  ; TODO: Add ${__HB_DYN__} to all .hbc files.
+  ; TODO: Add ${__HB_DYN__} to all .hbc files. [DONE]

 2010-07-31 02:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
  * include/Makefile
--- a/harbour/contrib/gtalleg/gtalleg.hbc
+++ b/harbour/contrib/gtalleg/gtalleg.hbc
@@ -2,8 +2,8 @@
 # $Id$
 #

-{!HB_STATIC_ALLEGRO}libs=${hb_name}
-{HB_STATIC_ALLEGRO}libs=${hb_name}s
+{!HB_STATIC_ALLEGRO}libs=${hb_name}${__HB_DYN__}
+{HB_STATIC_ALLEGRO}libs=${hb_name}s${__HB_DYN__}

 {!HB_STATIC_ALLEGRO&win}libs=alleg42
 {!HB_STATIC_ALLEGRO&linux}ldflags="`allegro-config --libs 2>/dev/null`"
--- a/harbour/contrib/gtwvg/gtwvg.hbc
+++ b/harbour/contrib/gtwvg/gtwvg.hbc
@@ -6,7 +6,7 @@ skip={!win}

 incpaths=.

-gt={hb_name}
+gt={hb_name}${__HB_DYN__}

 libs=../hbwin/hbwin.hbc

--- a/harbour/contrib/hbblat/hbblat.hbc
+++ b/harbour/contrib/hbblat/hbblat.hbc
@@ -6,5 +6,5 @@ skip={!win}

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 libs=blat
--- a/harbour/contrib/hbblink/hbblink.hbc
+++ b/harbour/contrib/hbblink/hbblink.hbc
@@ -4,4 +4,4 @@

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
--- a/harbour/contrib/hbbz2/hbbz2.hbc
+++ b/harbour/contrib/hbbz2/hbbz2.hbc
@@ -4,5 +4,5 @@

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 libs=bz2
--- a/harbour/contrib/hbcairo/hbcairo.hbc
+++ b/harbour/contrib/hbcairo/hbcairo.hbc
@@ -6,5 +6,5 @@ incpaths=.

 libs=${hb_name}

-{!unix}libs=cairo
+{!unix}libs=cairo${__HB_DYN__}
 {unix}ldflags="`pkg-config --libs cairo`"
--- a/harbour/contrib/hbclipsm/hbclipsm.hbc
+++ b/harbour/contrib/hbclipsm/hbclipsm.hbc
@@ -4,4 +4,4 @@

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
--- a/harbour/contrib/hbcomm/hbcomm.hbc
+++ b/harbour/contrib/hbcomm/hbcomm.hbc
@@ -4,4 +4,4 @@

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
--- a/harbour/contrib/hbcups/hbcups.hbc
+++ b/harbour/contrib/hbcups/hbcups.hbc
@@ -4,6 +4,6 @@

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}

 {unix}libs=cups
--- a/harbour/contrib/hbcurl/hbcurl.hbc
+++ b/harbour/contrib/hbcurl/hbcurl.hbc
@@ -4,8 +4,8 @@

 incpaths=.

-{!HB_STATIC_CURL}libs=${hb_name}
-{HB_STATIC_CURL}libs=${hb_name}s
+{!HB_STATIC_CURL}libs=${hb_name}${__HB_DYN__}
+{HB_STATIC_CURL}libs=${hb_name}s${__HB_DYN__}

 {!mingw}libs=libcurl
 {!HB_STATIC_CURL&mingw}libs=curldll
--- a/harbour/contrib/hbfbird/hbfbird.hbc
+++ b/harbour/contrib/hbfbird/hbfbird.hbc
@@ -4,5 +4,5 @@

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 libs=fbclient
--- a/harbour/contrib/hbfimage/hbfimage.hbc
+++ b/harbour/contrib/hbfimage/hbfimage.hbc
@@ -6,5 +6,5 @@ skip={dos}

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 libs=freeimage
--- a/harbour/contrib/hbfoxpro/hbfoxpro.hbc
+++ b/harbour/contrib/hbfoxpro/hbfoxpro.hbc
@@ -4,4 +4,4 @@

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
--- a/harbour/contrib/hbfship/hbfship.hbc
+++ b/harbour/contrib/hbfship/hbfship.hbc
@@ -4,4 +4,4 @@

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
--- a/harbour/contrib/hbgd/hbgd.hbc
+++ b/harbour/contrib/hbgd/hbgd.hbc
@@ -4,7 +4,7 @@

 incpaths=.

-{!hbdyn}libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 {win}libs=bgd
 {linux}libs=gdlib png jpeg freetype m
 {darwin}libs=gd
--- a/harbour/contrib/hbgt/hbgt.hbc
+++ b/harbour/contrib/hbgt/hbgt.hbc
@@ -2,4 +2,4 @@
 # $Id$
 #

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
--- a/harbour/contrib/hbhpdf/hbhpdf.hbc
+++ b/harbour/contrib/hbhpdf/hbhpdf.hbc
@@ -4,6 +4,6 @@

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 libs=libhpdf
 libs=png
--- a/harbour/contrib/hbmemio/hbmemio.hbc
+++ b/harbour/contrib/hbmemio/hbmemio.hbc
@@ -2,4 +2,4 @@
 # $Id$
 #

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
--- a/harbour/contrib/hbmisc/hbmisc.hbc
+++ b/harbour/contrib/hbmisc/hbmisc.hbc
@@ -2,4 +2,4 @@
 # $Id$
 #

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
--- a/harbour/contrib/hbmysql/hbmysql.hbc
+++ b/harbour/contrib/hbmysql/hbmysql.hbc
@@ -4,6 +4,6 @@

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 {unix}libs=mysqlclient
 {!unix}libs=libmysql
--- a/harbour/contrib/hbnf/hbnf.hbc
+++ b/harbour/contrib/hbnf/hbnf.hbc
@@ -4,4 +4,4 @@

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
--- a/harbour/contrib/hbodbc/hbodbc.hbc
+++ b/harbour/contrib/hbodbc/hbodbc.hbc
@@ -4,5 +4,5 @@

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 {win}libs=odbc32
--- a/harbour/contrib/hbpgsql/hbpgsql.hbc
+++ b/harbour/contrib/hbpgsql/hbpgsql.hbc
@@ -4,6 +4,6 @@

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 {unix}libs=pq
 {!unix}libs=libpq
--- a/harbour/contrib/hbsms/hbsms.hbc
+++ b/harbour/contrib/hbsms/hbsms.hbc
@@ -4,4 +4,4 @@

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
--- a/harbour/contrib/hbsqlit3/hbsqlit3.hbc
+++ b/harbour/contrib/hbsqlit3/hbsqlit3.hbc
@@ -4,5 +4,5 @@

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 libs=sqlite3
--- a/harbour/contrib/hbtpathy/hbtpathy.hbc
+++ b/harbour/contrib/hbtpathy/hbtpathy.hbc
@@ -4,4 +4,4 @@

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
--- a/harbour/contrib/hbxpp/hbxpp.hbc
+++ b/harbour/contrib/hbxpp/hbxpp.hbc
@@ -4,4 +4,4 @@

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
--- a/harbour/contrib/hbziparc/hbziparc.hbc
+++ b/harbour/contrib/hbziparc/hbziparc.hbc
@@ -2,5 +2,5 @@
 # $Id$
 #

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 libs=../hbmzip/hbmzip.hbc
--- a/harbour/contrib/rddads/rddads.hbc
+++ b/harbour/contrib/rddads/rddads.hbc
@@ -6,6 +6,6 @@ skip={!(linux|win)}

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 {win}libs=ace32
 {linux}libs=ace
--- a/harbour/contrib/rddbmcdx/rddbmcdx.hbc
+++ b/harbour/contrib/rddbmcdx/rddbmcdx.hbc
@@ -2,4 +2,4 @@
 # $Id$
 #

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
--- a/harbour/contrib/sddfb/sddfb.hbc
+++ b/harbour/contrib/sddfb/sddfb.hbc
@@ -2,7 +2,7 @@
 # $Id$
 #

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 libs=fbclient

 libs=../rddsql/rddsql.hbc
--- a/harbour/contrib/sddmy/sddmy.hbc
+++ b/harbour/contrib/sddmy/sddmy.hbc
@@ -2,7 +2,7 @@
 # $Id$
 #

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 {unix}libs=mysqlclient
 {!unix}libs=libmysql

--- a/harbour/contrib/sddoci/sddoci.hbc
+++ b/harbour/contrib/sddoci/sddoci.hbc
@@ -2,7 +2,7 @@
 # $Id$
 #

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 {HB_WITH_OCILIB_WIDE}libs=ocilibw
 {HB_WITH_OCILIB_MIXED}libs=ocilibm
 {!HB_WITH_OCILIB_WIDE&!HB_WITH_OCILIB_MIXED}libs=ociliba
--- a/harbour/contrib/sddodbc/sddodbc.hbc
+++ b/harbour/contrib/sddodbc/sddodbc.hbc
@@ -2,7 +2,7 @@
 # $Id$
 #

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 {win}libs=odbc32

 libs=../rddsql/rddsql.hbc
--- a/harbour/contrib/sddpg/sddpg.hbc
+++ b/harbour/contrib/sddpg/sddpg.hbc
@@ -2,7 +2,7 @@
 # $Id$
 #

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 {unix}libs=pq
 {!unix}libs=libpq

--- a/harbour/contrib/sddsqlt3/sddsqlt3.hbc
+++ b/harbour/contrib/sddsqlt3/sddsqlt3.hbc
@@ -2,7 +2,7 @@
 # $Id$
 #

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 libs=sqlite3

 libs=../rddsql/rddsql.hbc
--- a/harbour/contrib/xhb/xhb.hbc
+++ b/harbour/contrib/xhb/xhb.hbc
@@ -4,7 +4,7 @@

 incpaths=.

-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}

 # xhb has these as part of core, so we're adding them to emulate it.
 # They are not needed to use xhb lib itself.