diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 41233ee59b..cfe3e6823d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2011-02-14 23:53 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbide/hbide.hbp + * contrib/hbide/idemain.prg + - Disabled RDDADS dynamic load. It requires further work + and brainstorm, which in turn requires interested contributors. + Delayed to the future, after stable release. + 2011-02-14 23:30 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * harbour/src/vm/classes.c ! fixed typo diff --git a/harbour/contrib/hbide/hbide.hbp b/harbour/contrib/hbide/hbide.hbp index 9980804df0..900a6da6fd 100644 --- a/harbour/contrib/hbide/hbide.hbp +++ b/harbour/contrib/hbide/hbide.hbp @@ -24,7 +24,8 @@ ../hbqt/hbqtnetwork.hbc ../hbqt/hbqtuitools.hbc ../hbformat/hbformat.hbc -../rddads/rddads.hbc +# TODO: Need to set 'HB_DYNLOAD_RDDADS=yes' for this to work here +#../rddads/rddads.hbc -lhbcplr -lhbpp diff --git a/harbour/contrib/hbide/idemain.prg b/harbour/contrib/hbide/idemain.prg index f4c5dc8689..b4ec31a62c 100644 --- a/harbour/contrib/hbide/idemain.prg +++ b/harbour/contrib/hbide/idemain.prg @@ -79,7 +79,9 @@ #include "hbclass.ch" #include "hbver.ch" +#ifdef __HBIDE__RDDADS #include "rddads.hbx" +#endif /* Link all Harbour Functions : needed to run external scripts */ REQUEST __HB_EXTERN__ @@ -93,7 +95,9 @@ REQUEST __HBEXTERN__HBQTNETWORK__ REQUEST DBFCDX REQUEST DBFNTX REQUEST DBFNSX +#ifdef __HBIDE__RDDADS REQUEST ADS +#endif /*----------------------------------------------------------------------*/ @@ -101,8 +105,10 @@ PROCEDURE Main( ... ) LOCAL oIde LOCAL oResource +#ifdef __HBIDE__RDDADS LOCAL hRDDADS LOCAL tmp +#endif #ifdef HB_IDE_DISTRO LOCAL cBse := hb_dirBase() + ".." @@ -119,6 +125,7 @@ PROCEDURE Main( ... ) SET CENTURY ON SET EPOCH TO 1970 +#ifdef __HBIDE__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 ) ) @@ -126,6 +133,7 @@ PROCEDURE Main( ... ) hb_rddadsRegister() ENDIF ENDIF +#endif oResource := QResource() oResource:registerResource_1( hbqtres_HbIde(), ":/resource" )