fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-06-02 19:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    + Added information about standard header locations (as comment yet).
    * Minor change: HBMK2_HAS_* -> HBMK_HAS_*
This commit is contained in:
Viktor Szakats
2010-06-02 17:01:12 +00:00
parent 324e27ef99
commit 83a01da182
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -17,6 +17,11 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-06-02 19:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
+ Added information about standard header locations (as comment yet).
* Minor change: HBMK2_HAS_* -> HBMK_HAS_*
2010-06-02 18:52 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/pp/pplib.c
* harbour/src/vm/estack.c

22
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -210,6 +210,9 @@ REQUEST hbmk_KEYW
#define _HBMK_CFG_NAME "hbmk.cfg"
#define _HBMK_AUTOHBM_NAME "hbmk.hbm"
#define _HBMK_WITH_PREF "HBMK_WITH_"
#define _HBMK_HAS_PREF "HBMK_HAS_"
#define _HBMK_NEST_MAX 10
#define _HBMK_HEAD_NEST_MAX 10
@@ -2392,6 +2395,23 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
ENDIF
IF ! lStopAfterInit .AND. ! lStopAfterHarbour
/*
/boot/common/include (beos)
/boot/develop/headers/3rdparty (beos)
/opt/local/include (darwin MacPorts)
/sw/include (darwin Fink)
/Library/Frameworks/<pkg>.framework/Headers (darwin)
/usr/<pkg>/include (FHS)
/usr/include (FHS)
/opt/<pkg>/include (FHS)
/opt/include (FHS)
/usr/local/<pkg>/include (FHS)
/usr/local/include (FHS)
*/
/* Process any package requirements */
FOR EACH tmp IN hbmk[ _HBMK_aREQPKG ]
pkg_try_detection( hbmk, tmp )
@@ -5928,7 +5948,7 @@ STATIC FUNCTION pkg_try_detection( hbmk, cName )
IF Empty( cIncludeDir )
cIncludeDir := "(system)"
ENDIF
cDefine := "HBMK2_HAS_" + StrToDefine( cNameFlavour )
cDefine := _HBMK_HAS_PREF + StrToDefine( cNameFlavour )
IF hbmk[ _HBMK_lInfo ]
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Autodetected package '%1$s' (%2$s) at '%3$s', defining '%4$s'." ), cNameFlavour, cVersion, cIncludeDir, cDefine ) )
ENDIF