From 66b730d32dae361b69836bd78461ff316a88ea17 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 26 Feb 2010 09:57:39 +0000 Subject: [PATCH] 2010-02-26 10:56 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + contrib/hbfoxpro/dll.prg + contrib/hbfoxpro/Makefile * contrib/hbwin/Makefile - contrib/hbwin/win_dllf.prg + Moved FoxPro-like dynamic call function to hbfoxpro lib. Renamed it to FOX___DYNCALL() until we find it a better name, or someone will suggest how this is best presented for actual FoxPro users. * contrib/Makefile * utils/hbmk2/examples/contribf.hbc + Enabled hbfoxpro lib. * config/wce/global.mk * config/win/global.mk * Formatting. --- harbour/ChangeLog | 28 ++++++++++++++++--- harbour/config/wce/global.mk | 4 +-- harbour/config/win/global.mk | 4 +-- harbour/contrib/Makefile | 1 + harbour/contrib/hbfoxpro/Makefile | 18 ++++++++++++ .../{hbwin/win_dllf.prg => hbfoxpro/dll.prg} | 4 +-- harbour/contrib/hbwin/Makefile | 1 - harbour/utils/hbmk2/examples/contribf.hbc | 2 +- 8 files changed, 50 insertions(+), 12 deletions(-) create mode 100644 harbour/contrib/hbfoxpro/Makefile rename harbour/contrib/{hbwin/win_dllf.prg => hbfoxpro/dll.prg} (97%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1879d18021..64a4fb746d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,9 +17,29 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-02-26 10:56 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + + contrib/hbfoxpro/dll.prg + + contrib/hbfoxpro/Makefile + * contrib/hbwin/Makefile + - contrib/hbwin/win_dllf.prg + + Moved FoxPro-like dynamic call function to + hbfoxpro lib. + Renamed it to FOX___DYNCALL() until we find + it a better name, or someone will suggest + how this is best presented for actual FoxPro + users. + + * contrib/Makefile + * utils/hbmk2/examples/contribf.hbc + + Enabled hbfoxpro lib. + + * config/wce/global.mk + * config/win/global.mk + * Formatting. + 2010-02-25 19:11 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbide/ideharbourhelp.prg - + Implemented to open Qt's original documentation link in + + Implemented to open Qt's original documentation link in default browser. It is handy and you do not need to remember. 2010-02-25 18:45 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) @@ -35,16 +55,16 @@ NOTE: this is initial upload and contains little less than desired. I plan to adress including more info at a later date. - For now you can be comfortable as to how a method in Qt + For now you can be comfortable as to how a method in Qt class should be called, a big productivity boost. 2010-02-26 00:22 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbxpp/xppop.prg * contrib/hbxpp/xppopc.c - ! Restored stupport for negative indexes in 'string[ n ]' syntax. + ! Restored support for negative indexes in 'string[ n ]' syntax. * Two reported RTE made XPP compatible regarding 'string[ n ]' syntax. Left marked as TODO. I hope one day an XPP user will complete them. - ! Fixed names of an internal function to not be the same as in xhb lib. + ! Fixed name of an internal function to not be the same as in xhb lib. 2010-02-25 20:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/gtwvg/gtwvg.c diff --git a/harbour/config/wce/global.mk b/harbour/config/wce/global.mk index 059ae15843..352e12319f 100644 --- a/harbour/config/wce/global.mk +++ b/harbour/config/wce/global.mk @@ -7,9 +7,9 @@ all : first BIN_EXT := .exe DYN_EXT := .dll -HB_GT_LIBS += gtwvt gtgui - HB_CFLAGS += -DUNICODE HB_CFLAGS += -DUNDER_CE +HB_GT_LIBS += gtwvt gtgui + SYSLIBS += coredll ws2 diff --git a/harbour/config/win/global.mk b/harbour/config/win/global.mk index 8f2a77ce23..271561308b 100644 --- a/harbour/config/win/global.mk +++ b/harbour/config/win/global.mk @@ -7,12 +7,12 @@ all : first BIN_EXT := .exe DYN_EXT := .dll -HB_GT_LIBS += gtwvt gtgui gtwin - ifneq ($(HB_BUILD_UNICODE),no) HB_CFLAGS += -DUNICODE endif +HB_GT_LIBS += gtwvt gtgui gtwin + # kernel32: needed by some compilers (pocc/watcom) # user32: *Clipboard*(), GetKeyState(), GetKeyboardState(), SetKeyboardState(), gtwvt stuff # ws2_32: hbsocket diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile index 6d9963f1c0..75f5f05341 100644 --- a/harbour/contrib/Makefile +++ b/harbour/contrib/Makefile @@ -10,6 +10,7 @@ DIRS := \ hbbtree \ hbclipsm \ hbct \ + hbfoxpro \ hbfship \ hbgt \ hbmemio \ diff --git a/harbour/contrib/hbfoxpro/Makefile b/harbour/contrib/hbfoxpro/Makefile new file mode 100644 index 0000000000..d761857aff --- /dev/null +++ b/harbour/contrib/hbfoxpro/Makefile @@ -0,0 +1,18 @@ +# +# $Id$ +# + +ROOT := ../../ + +include $(TOP)$(ROOT)config/global.mk + +LIBNAME := hbfoxpro + +PRG_SOURCES := \ + dll.prg \ + +PRG_HEADERS := \ + hbfoxpro.ch \ + +include $(TOP)$(ROOT)config/header.mk +include $(TOP)$(ROOT)config/lib.mk diff --git a/harbour/contrib/hbwin/win_dllf.prg b/harbour/contrib/hbfoxpro/dll.prg similarity index 97% rename from harbour/contrib/hbwin/win_dllf.prg rename to harbour/contrib/hbfoxpro/dll.prg index b0175cbebc..14818fb61e 100644 --- a/harbour/contrib/hbwin/win_dllf.prg +++ b/harbour/contrib/hbfoxpro/dll.prg @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Calling function from dynamic library (HB_DYNCALLFOXPRO()) + * Calling function from dynamic library (FOX___DYNCALL()) * * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) * www - http://www.harbour-project.org @@ -58,7 +58,7 @@ DECLARE [cFunctionType] FunctionName IN LibraryName [AS AliasName] [cParamType1 [@] ParamName1, cParamType2 [@] ParamName2, ...] */ -FUNCTION hb_dynCallFoxPro( cCommand, ... ) +FUNCTION FOX___DYNCALL( cCommand, ... ) LOCAL aParam LOCAL cFunction diff --git a/harbour/contrib/hbwin/Makefile b/harbour/contrib/hbwin/Makefile index e29f4a4ba4..91a280d472 100644 --- a/harbour/contrib/hbwin/Makefile +++ b/harbour/contrib/hbwin/Makefile @@ -46,7 +46,6 @@ PRG_SOURCES := \ oleauto.prg \ axfunc.prg \ wce_sim.prg \ - win_dllf.prg \ win_os.prg \ win_reg.prg \ win_tbmp.prg \ diff --git a/harbour/utils/hbmk2/examples/contribf.hbc b/harbour/utils/hbmk2/examples/contribf.hbc index 0616c09058..7c5dc42eb5 100644 --- a/harbour/utils/hbmk2/examples/contribf.hbc +++ b/harbour/utils/hbmk2/examples/contribf.hbc @@ -6,7 +6,7 @@ # [ This should be kept in sync with local Makefile information. ] # contribs portable, with no external dependencies: -libs=hbbtree hbclipsm hbct hbfship hbgt hbmisc hbmzip hbnf hbtpathy hbxpp hbziparc rddbmcdx rddsql xhb +libs=hbbtree hbclipsm hbct hbfoxpro hbfship hbgt hbmisc hbmzip hbnf hbtpathy hbxpp hbziparc rddbmcdx rddsql xhb # contribs portable, with external dependencies: libs=hbcurl hbfbird hbgd hbhpdf hbmysql hbpgsql hbqt hbtip sddfb sddmy sddpg