From e883b1facd7f2799b61c266c7a2338c90e4a4378 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 19 Jun 2009 19:57:32 +0000 Subject: [PATCH] 2009-06-19 21:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg + Enabled 'comp' subdir for embedded C compiler storage (on Windows / DOS / possibly OS/2). --- harbour/ChangeLog | 5 +++++ harbour/utils/hbmk2/hbmk2.prg | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 78a92476f6..b47b600e35 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,11 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-19 21:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + + Enabled 'comp' subdir for embedded C compiler storage + (on Windows / DOS / possibly OS/2). + 2009-06-19 21:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/gtwvg/wvgscrlb.prg * contrib/gtwvg/wvgclass.prg diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 7d46549a54..c040d4c2d3 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -174,7 +174,7 @@ REQUEST hbmk_KEYW #define _HBMK_NEST_MAX 10 #define _HBMK_HEAD_NEST_MAX 10 -#define _COMPEMBED_BASE_ "" /* ( "comp" + hb_osPathSeparator() ) */ +#define _COMPEMBED_BASE_ ( "comp" + hb_osPathSeparator() ) #define _WORKDIR_BASE_ ".hbmk" #define _WORKDIR_DEF_ ( _WORKDIR_BASE_ + hb_osPathSeparator() + hbmk[ _HBMK_cARCH ] + hb_osPathSeparator() + hbmk[ _HBMK_cCOMP ] ) @@ -188,8 +188,7 @@ REQUEST hbmk_KEYW #define HB_ISFIRSTIDCHAR( c ) ( HB_ISALPHA( c ) .OR. ( c ) == '_' ) #define HB_ISNEXTIDCHAR( c ) ( HB_ISFIRSTIDCHAR(c) .OR. IsDigit( c ) ) -/* This requires Set( _SET_EXACT, .F. ) */ -#define LEFTEQUAL( l, r ) ( l = r ) +#define LEFTEQUAL( l, r ) ( l = r ) /* NOTE: This requires Set( _SET_EXACT, .F. ) */ #define _HBMK_lQuiet 1 #define _HBMK_lInfo 2