Changeset 21864

Timestamp:

Dec 8, 2011, 2:30:53 PM (14 years ago)

Author:

dmik

Message:

Make sure correct libsocket version is used with TCPV40HDRS.

File:

• branches/gcc-kmk/Config.kmk (modified) (2 diffs)

branches/gcc-kmk/Config.kmk

@@ -20 +20 @@
 ifn1of ($(EMXOMFLD_TYPE),WLINK wlink)
 $(error You must use Watcom Linker and set EMXOMFLD_TYPE to WLINK (it's now $(EMXOMFLD_TYPE)))
+endif
+
+#
+# TCPV40HDRS requires an alternative libsocket.lib located in a separate directory.
+# Try to deduce it.
+#
+PATH_GCC_LIB_TCPIPV4 := $(dir $(shell gcc -print-file-name=libsocket.lib))/tcpipv4
+ifeq ($(PATH_GCC_LIB_TCPIPV4),/tcpipv4)
+$(error Could not detect the GCC TCPIPV4 socket library path.)
 endif
 
@@ -209 +218 @@
 TEMPLATE_OdinDLL_EXTENDS    = OdinCxx
 TEMPLATE_OdinDLL_EXTENDS_BY = appending
-TEMPLATE_OdinDLL_DEFS       = $(TEMPLATE_OdinCxx_DEFS) __WINE__ TCPV40HDRS COMCTL32UNDOC
+TEMPLATE_OdinDLL_DEFS       = $(TEMPLATE_OdinCxx_DEFS) __WINE__ COMCTL32UNDOC TCPV40HDRS __USE_LIBC_TCPIP
 TEMPLATE_OdinDLL_LIBS       = $(PATH_STAGE_LIB)/odincrt.lib \
                               $(PATH_STAGE_LIB)/initdll.lib
+TEMPLATE_OdinDLL_LDFLAGS    = -L$(PATH_GCC_LIB_TCPIPV4) # necessary for TCPV40HDRS
 TEMPLATE_OdinDLL_WRCFLAGS   = -p_$(target)