From 0323982efa72b7695fe97ca8b9f7fecf5df74b2e Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 14 Apr 2009 07:48:30 +0000
Subject: [PATCH] 2009-04-14 09:47 UTC+0200 Viktor Szakats (harbour.01 syenar
 hu)   + contrib/hbcurl/hbcurls   + contrib/hbcurl/hbcurls/Makefile   *
 contrib/hbcurl/Makefile     + Added generation of static flavour of hbcurl.
 This can       be used to link against static libcurl.

  * utils/hbmk2/hbmk2.prg
    ! Fixed target exe name with msvc.
    ! Added /debug link switch for msvc in -debug mode.
---
 harbour/ChangeLog                       | 11 +++++++
 harbour/contrib/hbcurl/Makefile         | 11 +++++++
 harbour/contrib/hbcurl/hbcurls/Makefile | 40 +++++++++++++++++++++++++
 harbour/utils/hbmk2/hbmk2.prg           |  7 +++--
 4 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 harbour/contrib/hbcurl/hbcurls/Makefile

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 599051cbe3..b3e36c2089 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,17 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-04-14 09:47 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  + contrib/hbcurl/hbcurls
+  + contrib/hbcurl/hbcurls/Makefile
+  * contrib/hbcurl/Makefile
+    + Added generation of static flavour of hbcurl. This can
+      be used to link against static libcurl.
+
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed target exe name with msvc.
+    ! Added /debug link switch for msvc in -debug mode.
+
 2009-04-14 02:01 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     + Added -clean option to clean incremental work files and dir.
diff --git a/harbour/contrib/hbcurl/Makefile b/harbour/contrib/hbcurl/Makefile
index ade2736b63..ce7c6f8ef9 100644
--- a/harbour/contrib/hbcurl/Makefile
+++ b/harbour/contrib/hbcurl/Makefile
@@ -38,6 +38,17 @@ include $(TOP)$(ROOT)config/lib.cf
 install::
 	$(INSTALL_RULE_HEADERS)
 
+ifeq ($(HB_ARCHITECTURE),win)
+DIRS += hbcurls
+endif
+ifeq ($(HB_ARCHITECTURE),wce)
+DIRS += hbcurls
+endif
+
+ifneq ($(DIRS),)
+	include $(TOP)$(ROOT)config/dir.cf
+endif
+
 else
 include $(TOP)$(ROOT)config/none.cf
 endif
diff --git a/harbour/contrib/hbcurl/hbcurls/Makefile b/harbour/contrib/hbcurl/hbcurls/Makefile
new file mode 100644
index 0000000000..869c1eb076
--- /dev/null
+++ b/harbour/contrib/hbcurl/hbcurls/Makefile
@@ -0,0 +1,40 @@
+#
+# $Id$
+#
+
+vpath %.c ../
+
+ROOT = ../../../
+
+LIBNAME=hbcurls
+
+# always export symbols
+HB_USER_CFLAGS += -DCURL_STATICLIB
+
+HB_INC_CURL_OK =
+
+ifneq ($(HB_ARCHITECTURE),dos)
+
+ifeq ($(HB_INC_CURL),)
+ifeq ($(HB_XBUILD),)
+HB_INC_CURL = /usr/include
+endif
+endif
+
+HB_INC_CURL_OK += $(foreach d, $(HB_INC_CURL), $(if $(wildcard $(d)/curl/curl.h),$(d),))
+
+endif
+
+ifneq ($(strip $(HB_INC_CURL_OK)),)
+
+HB_USER_CFLAGS += $(foreach d, $(HB_INC_CURL_OK), -I$(d))
+
+C_SOURCES=\
+	hbcurl.c \
+	hbcurlm.c \
+
+include $(TOP)$(ROOT)config/lib.cf
+
+else
+include $(TOP)$(ROOT)config/none.cf
+endif
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index ec082fd3bf..7e03614853 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1942,6 +1942,7 @@ PROCEDURE Main( ... )
             ELSE
                AAdd( s_aOPTC, "-MTd -Zi" )
             ENDIF
+            AAdd( s_aOPTL, "/debug" )
          ENDIF
          IF s_lGUI
             AAdd( s_aOPTL, "/subsystem:windows" )
@@ -1966,7 +1967,7 @@ PROCEDURE Main( ... )
          cOpt_Lib := "{FA} /out:{OL} {LO}"
          cOpt_Dyn := "{FD} /dll /out:{OD} {DL} {LO} {LL} {LS}"
          cOpt_CompC := "-nologo -c {FC} -I{DI} {LC}"
-         cOpt_Link := "-nologo {LO} {DL} {FL} {LL} {LS}"
+         cOpt_Link := "-nologo /out:{OE} {LO} {DL} {FL} {LL} {LS}"
          cLibPathPrefix := "/libpath:"
          cLibPathSep := " "
          IF s_lMAP
@@ -4157,7 +4158,9 @@ STATIC PROCEDURE ShowHelp( lLong )
       "    wce    : mingwarm, msvcarm, poccarm" ,;
       "    os2    : gcc, owatcom" ,;
       "    dos    : djgpp, owatcom" ,;
-      "    bsd, hpux, sunos: gcc" }
+      "    bsd    : gcc" ,;
+      "    hpux   : gcc" ,;
+      "    sunos  : gcc" }
 
    DEFAULT lLong TO .F.