From 35ec14bff9c2e3a7fb7ef3175e347b176e1c4ed4 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 17 Sep 2009 13:16:55 +0000
Subject: [PATCH] 2009-09-17 15:13 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.prg     - Deleted supc++ lib. hbmk2 won't be
 able to solve every existing       compiler configuration problems, so in
 this case users will have to deal       with this special case and supply
 supc++ or supcxx or stdc++       lib if it's required, or manually select C++
 mode for hbmk2 if       that better solves local needs.       Case closed
 from my side.

  * contrib/hbqt/hbqts.hbc
  * contrib/hbqt/hbqt.hbc
  * contrib/gtqtc/gtqtcs.hbc
  * contrib/gtqtc/gtqtc.hbc
    + Readded supc++ libs to .hbc files, where needed.
---
 harbour/ChangeLog                | 15 +++++++++++++++
 harbour/contrib/gtqtc/gtqtc.hbc  |  1 +
 harbour/contrib/gtqtc/gtqtcs.hbc |  1 +
 harbour/contrib/hbqt/hbqt.hbc    |  1 +
 harbour/contrib/hbqt/hbqts.hbc   |  1 +
 harbour/utils/hbmk2/hbmk2.prg    | 10 ----------
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 84238b0e78..8b2cc3c7e6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,21 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-17 15:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    - Deleted supc++ lib. hbmk2 won't be able to solve every existing
+      compiler configuration problems, so in this case users will have to deal
+      with this special case and supply supc++ or supcxx or stdc++
+      lib if it's required, or manually select C++ mode for hbmk2 if
+      that better solves local needs.
+      Case closed from my side.
+
+  * contrib/hbqt/hbqts.hbc
+  * contrib/hbqt/hbqt.hbc
+  * contrib/gtqtc/gtqtcs.hbc
+  * contrib/gtqtc/gtqtc.hbc
+    + Readded supc++ libs to .hbc files, where needed.
+
 2009-09-17 14:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     - Deleted supc++ lib from os2/gcc targets.
diff --git a/harbour/contrib/gtqtc/gtqtc.hbc b/harbour/contrib/gtqtc/gtqtc.hbc
index ffd3a531bb..0ca8e38a44 100644
--- a/harbour/contrib/gtqtc/gtqtc.hbc
+++ b/harbour/contrib/gtqtc/gtqtc.hbc
@@ -10,6 +10,7 @@ libs=QtCore4 QtGui4 QtNetwork4 QtWebKit4
 {darwin}libs=/Library/Frameworks/QtGui.framework/QtGui
 {darwin}libs=/Library/Frameworks/QtNetwork.framework/QtNetwork
 {darwin}libs=/Library/Frameworks/QtWebKit.framework/QtWebKit
+{allgcc}libs=supc++
 gui=yes
 gt=gtqtc
 # optional
diff --git a/harbour/contrib/gtqtc/gtqtcs.hbc b/harbour/contrib/gtqtc/gtqtcs.hbc
index 232a1a411b..8bf0551847 100644
--- a/harbour/contrib/gtqtc/gtqtcs.hbc
+++ b/harbour/contrib/gtqtc/gtqtcs.hbc
@@ -5,6 +5,7 @@
 {allwin}libpaths=${HB_DIR_QT}\lib
 
 libs=QtCore QtGui QtNetwork QtWebKit
+{allgcc}libs=supc++
 gui=yes
 gt=gtqtcs
 # optional
diff --git a/harbour/contrib/hbqt/hbqt.hbc b/harbour/contrib/hbqt/hbqt.hbc
index e87dc02a63..963497ab5d 100644
--- a/harbour/contrib/hbqt/hbqt.hbc
+++ b/harbour/contrib/hbqt/hbqt.hbc
@@ -14,5 +14,6 @@ libs=hbqt
 {darwin}libs=/Library/Frameworks/QtGui.framework/QtGui
 {darwin}libs=/Library/Frameworks/QtNetwork.framework/QtNetwork
 {darwin}libs=/Library/Frameworks/QtWebKit.framework/QtWebKit
+{allgcc}libs=supc++
 gui=yes
 gt=gtnul
diff --git a/harbour/contrib/hbqt/hbqts.hbc b/harbour/contrib/hbqt/hbqts.hbc
index 4c372980a0..4f76066668 100644
--- a/harbour/contrib/hbqt/hbqts.hbc
+++ b/harbour/contrib/hbqt/hbqts.hbc
@@ -9,5 +9,6 @@ incpaths=.
 libs=hbqts
 {win}libs=version shlwapi
 {allwin}libs=QtCore QtGui QtNetwork QtWebKit
+{allgcc}libs=supc++
 gui=yes
 gt=gtnul
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index db232b2487..7b21d501bd 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2261,8 +2261,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             AAdd( l_aLIBSYS, "X11" )
          ENDIF
 
-         AAdd( l_aLIBSYS, "supc++" ) /* NOTE: or stdc++? */
-
       CASE ( hbmk[ _HBMK_cPLAT ] == "win" .AND. hbmk[ _HBMK_cCOMP ] == "gcc" ) .OR. ;
            ( hbmk[ _HBMK_cPLAT ] == "win" .AND. hbmk[ _HBMK_cCOMP ] == "mingw" ) .OR. ;
            ( hbmk[ _HBMK_cPLAT ] == "win" .AND. hbmk[ _HBMK_cCOMP ] == "mingw64" ) .OR. ;
@@ -2378,8 +2376,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             ENDIF
          ENDIF
 
-         AAdd( l_aLIBSYS, "supc++" ) /* NOTE: or stdc++? */
-
       CASE hbmk[ _HBMK_cPLAT ] == "os2" .AND. hbmk[ _HBMK_cCOMP ] == "gcc"
 
          IF hbmk[ _HBMK_lDEBUG ]
@@ -2446,10 +2442,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             cBin_Res   := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Res, nCmd_Esc )
          ENDIF
 
-#if 0 /* Causes strange linker (emxomf) warnings. */
-         AAdd( l_aLIBSYS, "supc++" ) /* NOTE: or stdc++? */
-#endif
-
       CASE hbmk[ _HBMK_cPLAT ] == "dos" .AND. hbmk[ _HBMK_cCOMP ] == "djgpp"
 
          IF hbmk[ _HBMK_lDEBUG ]
@@ -2510,8 +2502,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             cBin_Link  := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Link, nCmd_Esc )
          ENDIF
 
-         AAdd( l_aLIBSYS, "supcxx" ) /* NOTE: or stdcxx? */
-
       /* Watcom family */
       CASE hbmk[ _HBMK_cCOMP ] == "watcom"