From dffcf7871fc2abac8bb15536750e874b5a3059d2 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 14 Feb 2011 23:12:09 +0000 Subject: [PATCH] 2011-02-15 00:11 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbide/idemain.prg + Minor to prev. Now possible to build hbide with RDDADS if 'set HB_DYNLOAD_RDDADS=yes' is used prior to build. It's not supported, endorsed or even planned for this release, IOW don't send me reports if it doesn't work. --- harbour/ChangeLog | 7 +++++++ harbour/contrib/hbide/hbide.hbp | 4 ++-- harbour/contrib/hbide/idemain.prg | 8 ++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index cfe3e6823d..5ce465557f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2011-02-15 00:11 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbide/idemain.prg + + Minor to prev. Now possible to build hbide with RDDADS + if 'set HB_DYNLOAD_RDDADS=yes' is used prior to build. + It's not supported, endorsed or even planned for this release, + IOW don't send me reports if it doesn't work. + 2011-02-14 23:53 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbide/hbide.hbp * contrib/hbide/idemain.prg diff --git a/harbour/contrib/hbide/hbide.hbp b/harbour/contrib/hbide/hbide.hbp index 900a6da6fd..ace5b5a8a0 100644 --- a/harbour/contrib/hbide/hbide.hbp +++ b/harbour/contrib/hbide/hbide.hbp @@ -24,8 +24,8 @@ ../hbqt/hbqtnetwork.hbc ../hbqt/hbqtuitools.hbc ../hbformat/hbformat.hbc -# TODO: Need to set 'HB_DYNLOAD_RDDADS=yes' for this to work here -#../rddads/rddads.hbc +# TODO: Need to set 'HB_DYNLOAD_RDDADS=yes' for this to be enabled +../rddads/rddads.hbc{HB_DYNLOAD_RDDADS} -lhbcplr -lhbpp diff --git a/harbour/contrib/hbide/idemain.prg b/harbour/contrib/hbide/idemain.prg index b4ec31a62c..dc35de8ec1 100644 --- a/harbour/contrib/hbide/idemain.prg +++ b/harbour/contrib/hbide/idemain.prg @@ -79,7 +79,7 @@ #include "hbclass.ch" #include "hbver.ch" -#ifdef __HBIDE__RDDADS +#ifdef __HBDYNLOAD__RDDADS__ #include "rddads.hbx" #endif @@ -95,7 +95,7 @@ REQUEST __HBEXTERN__HBQTNETWORK__ REQUEST DBFCDX REQUEST DBFNTX REQUEST DBFNSX -#ifdef __HBIDE__RDDADS +#ifdef __HBDYNLOAD__RDDADS__ REQUEST ADS #endif @@ -105,7 +105,7 @@ PROCEDURE Main( ... ) LOCAL oIde LOCAL oResource -#ifdef __HBIDE__RDDADS +#ifdef __HBDYNLOAD__RDDADS__ LOCAL hRDDADS LOCAL tmp #endif @@ -125,7 +125,7 @@ PROCEDURE Main( ... ) SET CENTURY ON SET EPOCH TO 1970 -#ifdef __HBIDE__RDDADS +#ifdef __HBDYNLOAD__RDDADS__ /* TOFIX: Get the name right for other platforms than Windows. */ IF hb_FileExists( tmp := ( hb_dirBase() + "rddads-" + hb_ntos( hb_version( HB_VERSION_MAJOR ) ) + hb_ntos( hb_version( HB_VERSION_MINOR ) ) + hb_libExt() ) ) hRDDADS := hb_libLoad( hb_libName( tmp ) )