2008-08-25 14:12 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

* make_vc.mak
   * make_vcce.mak
     % Cleaned list of system libraries for VC. winspool.lib 
       removed, the rest documented.
     * Syncing between VC and VCCE.
     ; NOTE: WinCE system lib list didn't get anything removed 
             (just added), but nevertheless pls test it.

   * ChangeLog
     * Some cleanups (regarding my entries).

   * source/pp/hbpp.c
     ! Comment typo.

   * source/rtl/gtclip.c
     ! Fixed for __CYGWIN__.

   * contrib/hbw32/dllcall.c
     ! Disabled asm parts for __CYGWIN__ to make it compile.

   * config/w32/gcc.cf
     ! Added missing system lib wsock32 for Cygwin.

   * config/w32/gcc.cf
   * config/w32/cemgw.cf
   * config/w32/mingw32.cf
   * config/w32/owatcom.cf
   * config/w32/pocc.cf
   * config/w32/watcom.cf
   * config/w32/xcc.cf
     * Attempt to sort out system libs needed for core from 
       those needed for contribs. No system libraries have 
       been removed or added so far. [ I wonder why we need to 
       include contrib sys lib dependencies here, when Harbour 
       GNU make system doesn't build any contrib dependent 
       executables. Also, some ws2_32.lib seems definitely 
       superfluous. ]

   ; TOFIX: (for __CYGWIN__)
     ../../filesys.c: In function `hb_fsPOpen':
     ../../filesys.c:577: warning: passing arg 1 of `pipe' from incompatible pointer type

harbour/config/w32/cemgw.cf

@@ -58,8 +58,6 @@ ifneq ($(LNK_USR_LIB),)
 LDLIBS += $(foreach lib, $(LNK_USR_LIB), -l$(lib))
 endif
 
-#SYSLIBS = -luser32 -lwinspool -lgdi32 -lcomctl32 -lcomdlg32 \
-#          -lole32 -loleaut32 -luuid -lmpr -lwsock32 -lws2_32 -lmapi32
 SYSLIBS = -lwininet -lws2
 # for contribs
 SYSLIBS += -lcommdlg -lcommctrl -luuid -lole32

harbour/config/w32/gcc.cf

@@ -33,7 +33,8 @@ LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
 LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # This library is needed for CharToOemBuff() and OemToCharBuff() support.
-LINKLIBS += -luser32 -lwinspool
+LINKLIBS += -luser32 -lwsock32
+LINKLIBS += -lwinspool
 
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)

harbour/config/w32/mingw32.cf

@@ -68,8 +68,8 @@ LDLIBS += $(foreach lib, $(LNK_USR_LIB), -l$(lib))
 endif
 
 # This library is needed for CharToOemBuff() and OemToCharBuff() support.
-SYSLIBS = -luser32 -lwinspool -lgdi32 -lcomctl32 -lcomdlg32 \
-          -lole32 -loleaut32 -luuid -lmpr -lwsock32 -lws2_32 -lmapi32
+SYSLIBS = -luser32 -lgdi32 -lwsock32
+SYSLIBS += -lwinspool -lcomctl32 -lcomdlg32 -lole32 -loleaut32 -luuid -lmpr -lws2_32 -lmapi32
 
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 # It causes that every echo command will be separated by LF

harbour/config/w32/owatcom.cf

@@ -54,7 +54,7 @@ $(foreach lib, $(LINKLIBS), $(link_lib))
 $(foreach lib, $(RDDLIBS), $(link_lib))
 $(foreach lib, $(GTLIBS), $(link_lib))
 echo. @%watcom%/binnt/wlink.lnk >> __link__.tmp
-echo. LIB kernel32.lib, user32.lib, winspool.lib, oleaut32.lib, uuid.lib, comctl32.lib, mapi32.lib, wsock32.lib >> __link__.tmp
+echo. LIB kernel32.lib, user32.lib, wsock32.lib, winspool.lib, oleaut32.lib, uuid.lib, comctl32.lib, mapi32.lib >> __link__.tmp
 -$(LD) @__link__.tmp
 endef
 

harbour/config/w32/pocc.cf

@@ -55,14 +55,9 @@ ifeq ($(findstring rtl,$(LIBS)),rtl)
 LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
 endif
 
-#LDFLAGS = $(LINKPATHS)
-LDFLAGS = $(LINKPATHS) kernel32.lib user32.lib \
-          winspool.lib ole32.lib oleaut32.lib uuid.lib \
-          comctl32.lib mapi32.lib advapi32.lib \
-          gdi32.lib mpr.lib wsock32.lib ws2_32.lib \
-          comdlg32.lib
-
-# ws2 ws2_32
+LDFLAGS = $(LINKPATHS) kernel32.lib user32.lib gdi32.lib wsock32.lib advapi32.lib
+LDFLAGS += winspool.lib ole32.lib oleaut32.lib uuid.lib \
+           comctl32.lib mapi32.lib mpr.lib
 
 ifeq ($(HB_GT_DEFAULT),gtgui)
 LDFLAGS += /SUBSYSTEM:WINDOWS

harbour/config/w32/watcom.cf

@@ -51,7 +51,7 @@ endef
 
 define link_exe_file
 echo. $(LDFLAGS) NAME $@ > __link__.tmp
-echo. LIB kernel32.lib, user32.lib, winspool.lib, oleaut32.lib, uuid.lib, comctl32.lib, mapi32.lib, wsock32.lib >> __link__.tmp
+echo. LIB kernel32.lib, user32.lib, wsock32.lib, winspool.lib, oleaut32.lib, uuid.lib, comctl32.lib, mapi32.lib >> __link__.tmp
 $(foreach file, $(^F), $(link_file))
 $(foreach lib, $(LINKLIBS), $(link_lib))
 $(foreach lib, $(RDDLIBS), $(link_lib))

harbour/config/w32/xcc.cf

@@ -45,10 +45,9 @@ ifeq ($(findstring rtl,$(LIBS)),rtl)
 LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
 endif
 
-LDFLAGS = $(LINKPATHS) kernel32.lib user32.lib \
-          winspool.lib ole32.lib oleaut32.lib uuid.lib \
-          comctl32.lib mapi32.lib advapi32.lib \
-          gdi32.lib mpr.lib wsock32.lib
+LDFLAGS = $(LINKPATHS) kernel32.lib user32.lib gdi32.lib wsock32.lib advapi32.lib
+LDFLAGS += winspool.lib ole32.lib oleaut32.lib uuid.lib \
+           comctl32.lib mapi32.lib mpr.lib
 
 ifeq ($(HB_GT_DEFAULT),gtgui)
 LDFLAGS += /SUBSYSTEM:WINDOWS
@@ -58,8 +57,6 @@ LDFLAGS += /SUBSYSTEM:WINDOWS
 endif
 endif
 
-# mpr wsock32 ws2_32 mapi32
-
 AR = xlib.exe
 ARFLAGS = $(A_USR)
 AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F)

harbour/contrib/hbw32/dllcall.c

@@ -66,7 +66,7 @@
 #include "hbapierr.h"
 #include "hbapiitm.h"
 
-#if !defined( HB_NO_ASM ) && defined( HB_OS_WIN_32 )
+#if !defined( HB_NO_ASM ) && defined( HB_OS_WIN_32 ) && !defined(__CYGWIN__)
 
 #ifdef __XHARBOUR__
 

harbour/make_vc.mak

@@ -169,6 +169,12 @@ LDFLAGS        = /DEBUG $(LDFLAGS)
 LDFLAGSDLL     = /DEBUG $(LDFLAGSDLL)
 !endif
 
+# user32.lib: *Clipboard*(), MessageBox(), CharToOemBuff(), OemToCharBuff(), GetKeyState(), GetKeyboardState(), SetKeyboardState()
+# wsock32.lib: hbinet
+# advapi32.lib: GetUserName()
+# gdi32.lib: gtwvt
+STANDARD_SYSLIBS = user32.lib wsock32.lib advapi32.lib gdi32.lib
+
 #**********************************************************
 # COMPILE Rules
 #**********************************************************
@@ -766,6 +772,7 @@ $(**: = ^
 $(COMMON_LIB)
 $(COMPILER_LIB)
 $(PP_LIB)
+$(STANDARD_SYSLIBS)
 <<$(HB_KEEPSTATE)
 #**********************************************************
 # HBPP build rule
@@ -778,6 +785,7 @@ $(LDFLAGS)
 $(**: = ^
 )
 $(COMMON_LIB)
+$(STANDARD_SYSLIBS)
 <<$(HB_KEEPSTATE)
 #**********************************************************
 # HBRUN build rule
@@ -790,7 +798,7 @@ $(LDFLAGS)
 $(**: = ^
 )
 $(STANDARD_STATIC_HBLIBS)
-user32.lib winspool.lib wsock32.lib advapi32.lib
+$(STANDARD_SYSLIBS)
 <<$(HB_KEEPSTATE)
 #**********************************************************
 # HBTEST build rule
@@ -803,7 +811,7 @@ $(LDFLAGS)
 $(**: = ^
 )
 $(STANDARD_STATIC_HBLIBS)
-user32.lib winspool.lib
+$(STANDARD_SYSLIBS)
 <<$(HB_KEEPSTATE)
 #**********************************************************
 # HBDOC build rule
@@ -817,7 +825,7 @@ $(**: = ^
 )
 $(MINIMAL_STATIC_HBLIBS)
 $(HBDOC_LIBS)
-user32.lib winspool.lib
+$(STANDARD_SYSLIBS)
 <<$(HB_KEEPSTATE)
 #**********************************************************
 # HBMAKE build rule
@@ -830,7 +838,7 @@ $(LDFLAGS)
 $(**: = ^
 )
 $(MINIMAL_STATIC_HBLIBS)
-user32.lib winspool.lib
+$(STANDARD_SYSLIBS)
 <<$(HB_KEEPSTATE)
 #**********************************************************
 
@@ -843,7 +851,7 @@ $(LDFLAGSDLL) /OUT:$(@)
 /IMPLIB:$(@:.dll=.lib)
 $(DLL_OBJS: = ^
 )
-advapi32.lib gdi32.lib user32.lib winspool.lib wsock32.lib
+$(STANDARD_SYSLIBS)
 <<$(HB_KEEPSTATE)
 #**********************************************************
 # DLL EXECUTABLE Targets

harbour/make_vcce.mak

@@ -195,6 +195,8 @@ LDFLAGS        = /DEBUG $(LDFLAGS)
 LDFLAGSDLL     = /DEBUG $(LDFLAGSDLL)
 !endif
 
+STANDARD_SYSLIBS = coredll.lib corelibc.lib winsock.lib ws2.lib gdi32.lib
+
 #**********************************************************
 # COMPILE Rules
 #**********************************************************
@@ -792,7 +794,7 @@ $(**: = ^
 $(COMMON_LIB)
 $(COMPILER_LIB)
 $(PP_LIB)
-coredll.lib corelibc.lib
+$(STANDARD_SYSLIBS)
 <<$(HB_KEEPSTATE)
 #**********************************************************
 # HBPP build rule
@@ -805,7 +807,7 @@ $(LDFLAGS)
 $(**: = ^
 )
 $(COMMON_LIB)
-coredll.lib corelibc.lib
+$(STANDARD_SYSLIBS)
 <<$(HB_KEEPSTATE)
 #**********************************************************
 # HBRUN build rule
@@ -818,7 +820,7 @@ $(LDFLAGS)
 $(**: = ^
 )
 $(STANDARD_STATIC_HBLIBS)
-coredll.lib corelibc.lib winsock.lib ws2.lib
+$(STANDARD_SYSLIBS)
 <<$(HB_KEEPSTATE)
 #**********************************************************
 # HBTEST build rule
@@ -831,7 +833,7 @@ $(LDFLAGS)
 $(**: = ^
 )
 $(STANDARD_STATIC_HBLIBS)
-coredll.lib corelibc.lib winsock.lib ws2.lib
+$(STANDARD_SYSLIBS)
 <<$(HB_KEEPSTATE)
 #**********************************************************
 # HBDOC build rule
@@ -845,7 +847,7 @@ $(**: = ^
 )
 $(MINIMAL_STATIC_HBLIBS)
 $(HBDOC_LIBS)
-coredll.lib corelibc.lib winsock.lib ws2.lib
+$(STANDARD_SYSLIBS)
 <<$(HB_KEEPSTATE)
 #**********************************************************
 # HBMAKE build rule
@@ -858,7 +860,7 @@ $(LDFLAGS)
 $(**: = ^
 )
 $(MINIMAL_STATIC_HBLIBS)
-coredll.lib corelibc.lib winsock.lib ws2.lib
+$(STANDARD_SYSLIBS)
 <<$(HB_KEEPSTATE)
 #**********************************************************
 
@@ -871,7 +873,7 @@ $(LDFLAGSDLL) /OUT:$(@)
 /IMPLIB:$(@:.dll=.lib)
 $(DLL_OBJS: = ^
 )
-coredll.lib gdi32.lib
+$(STANDARD_SYSLIBS)
 <<$(HB_KEEPSTATE)
 #**********************************************************
 # DLL EXECUTABLE Targets

harbour/source/pp/hbpp.c

@@ -61,7 +61,7 @@
 
 /*
  * library functions used by PP core code
- * necessary to create stand alone binries
+ * necessary to create standalone binaries
  */
 void * hb_xgrab( ULONG ulSize ) { return malloc( ulSize ); }
 void * hb_xrealloc( void * pMem, ULONG ulSize ) { return realloc( pMem, ulSize ); }

harbour/source/rtl/gtclip.c

@@ -56,6 +56,10 @@
 #define HB_OS_WIN_32_USED
 #include "hbgtcore.h"
 
+#if defined(__CYGWIN__)
+   #include <wchar.h>
+#endif
+
 /* TODO: add protection for MT mode */
 static char *     s_szClipboardData;
 static ULONG      s_ulClipboardLen;