From ccdcecb09478a44d402f89099989124d11e75708 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 22 Feb 2010 14:21:15 +0000
Subject: [PATCH] 2010-02-22 15:20 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * config/os2/gcc.mk     + Attempt to fix direct ld usage to
 create Harbour .dlls.       Please make tests for all versions of gcc/gccomf
 targets.

  * INSTALL
    - Deleted TCPV4 header instructions for OS/2. (they still
      works, it just got less emphasis with this)
---
 harbour/ChangeLog         | 9 +++++++++
 harbour/INSTALL           | 4 ----
 harbour/config/os2/gcc.mk | 5 +++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0fe968627c..b434c90483 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-02-22 15:20 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * config/os2/gcc.mk
+    + Attempt to fix direct ld usage to create Harbour .dlls.
+      Please make tests for all versions of gcc/gccomf targets.
+
+  * INSTALL
+    - Deleted TCPV4 header instructions for OS/2. (they still
+      works, it just got less emphasis with this)
+
 2010-02-22 15:06 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * include/hbdefs.h
     ! Fixed to not #include <dos.h> unconditionally. This should
diff --git a/harbour/INSTALL b/harbour/INSTALL
index c6a5636446..ca6c7e72e6 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -105,10 +105,6 @@ HARBOUR
       > hello
       You should see 'Hello world!' on screen.
 
-      NOTE: To select alternative TCP/IP stack, use these commands:
-            set HB_USER_CFLAGS=-DTCPV40HDRS %HB_USER_CFLAGS%
-            set HB_USER_LDFLAGS=-LC:\usr\lib\tcpipv4 %HB_USER_LDFLAGS%
-
    on Linux hosts
    --------------
    (possible cross-build targets: Windows, Windows CE, MS-DOS, OS/2)
diff --git a/harbour/config/os2/gcc.mk b/harbour/config/os2/gcc.mk
index 4ff8b06b3a..9828da6405 100644
--- a/harbour/config/os2/gcc.mk
+++ b/harbour/config/os2/gcc.mk
@@ -117,7 +117,8 @@ ifeq ($(HB_COMPILER),gccomf)
    DFLAGS += -Zomf
 endif
 DY_OUT := $(LD_OUT)
-DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))
+DLIBPATHS := $(foreach dir,$(HB_COMP_PATH_PUB)..\lib $(subst ;, ,$(LIBRARY_PATH)),-L$(dir))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS) c_alias c_dll os2 gcc_so_d,-l$(lib))
 
 # NOTE: The empty line directly before 'endef' HAS TO exist!
 define dyn_object
@@ -135,7 +136,7 @@ define create_dynlib
    @$(ECHO) $(ECHOQUOTE)DATA PRELOAD MOVEABLE MULTIPLE NONSHARED$(ECHOQUOTE) >> __dyn__.def
    @$(ECHO) $(ECHOQUOTE)EXPORTS$(ECHOQUOTE) >> __dyn__.def
    $(foreach file,$^,$(dyn_object))
-   $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ @__dyn__.tmp __dyn__.def $(DLIBS) $(DYSTRIP)
+   $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DLIBPATHS) $(DY_OUT)$(DYN_DIR)/$@ dll0$(OBJ_EXT) @__dyn__.tmp __dyn__.def $(DLIBS) $(DYSTRIP)
    emximp -o $(IMP_FILE) $(DYN_DIR)/$@
 endef