From df01fb28ecb4107d1d919ec338d4ee8622b16d57 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 10 Nov 2012 14:37:54 +0000 Subject: [PATCH] 2012-11-10 15:33 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/hbpre.hbm * contrib/make.hb * avoid one internal make.hb macro completely. This comes with a 7 chars longer command line which might be a problem on MS-DOS systems, but .dlls are not typical there and projects with many dependencies will be long anyway. --- harbour/ChangeLog | 9 +++++++++ harbour/contrib/hbpre.hbm | 2 -- harbour/contrib/make.hb | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ff7c1319c6..60333f36af 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,15 @@ The license applies to all entries newer than 2009-04-28. */ +2012-11-10 15:33 UTC+0100 Viktor Szakats (harbour syenar.net) + * contrib/hbpre.hbm + * contrib/make.hb + * avoid one internal make.hb macro completely. This comes + with a 7 chars longer command line which might be a + problem on MS-DOS systems, but .dlls are not typical + there and projects with many dependencies will be + long anyway. + 2012-11-10 15:26 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/hbpost.hbm % synced back with utils/hbmk2/pkg_dynl.hbm, thus avoiding diff --git a/harbour/contrib/hbpre.hbm b/harbour/contrib/hbpre.hbm index 3965cfbf2c..98aa34121a 100644 --- a/harbour/contrib/hbpre.hbm +++ b/harbour/contrib/hbpre.hbm @@ -15,8 +15,6 @@ {(HB_BUILD_MODE='cpp')|(!HB_BUILD_MODE&allmsvc)}-cpp=yes {HB_BUILD_MODE='c'}-cpp=no -{_HB_BUILD_LIBDYN}-hbdyn - -c=iso90 # For cegcc Windows headers diff --git a/harbour/contrib/make.hb b/harbour/contrib/make.hb index 8412e3a631..efe92fd2b8 100755 --- a/harbour/contrib/make.hb +++ b/harbour/contrib/make.hb @@ -542,14 +542,14 @@ STATIC FUNCTION call_hbmk2( cProjectPath, cOptionsPre, cDynSuffix, cStdErr, cStd IF cDynSuffix != NIL hb_SetEnv( "_HB_DYNSUFF", cDynSuffix ) /* Request dll version of Harbour contrib dependencies (the implibs) to be linked (experimental) */ - hb_SetEnv( "_HB_BUILD_LIBDYN", "yes" ) + + cOptionsPre += " -hbdyn" IF hb_FileExists( hb_FNameExtSet( cProjectPath, ".hbc" ) ) cOptionsLibDyn += " " + hb_FNameExtSet( cProjectPath, ".hbc" ) ENDIF ELSE hb_SetEnv( "_HB_DYNSUFF" ) - hb_SetEnv( "_HB_BUILD_LIBDYN" ) ENDIF hb_SetEnv( "_HB_CONTRIB_SUBDIR", hb_FNameDir( hb_DirSepToOS( cProjectPath ) ) )