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

2013-08-27 01:55 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* config/global.mk
    * disabled HB_BUILD_CONTRIB_DYN in default non MS-Windows builds

  * utils/hbmk2/hbmk2.prg
    * formatting
This commit is contained in:
Przemysław Czerpak
2013-08-27 01:55:43 +02:00
parent f9362d3d4d
commit bc02c9b89d
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog.txt
View File

@@ -10,6 +10,13 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2013-08-27 01:55 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* config/global.mk
* disabled HB_BUILD_CONTRIB_DYN in default non MS-Windows builds
* utils/hbmk2/hbmk2.prg
* formatting
2013-08-26 20:56 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/compiler/hbdbginf.c
! fixed module names generated for debugger line info when user compiles

6
config/global.mk
View File

@@ -387,8 +387,10 @@ ifeq ($(HB_HOST_PLAT),)
endif
endif
ifeq ($(HB_BUILD_CONTRIB_DYN),)
export HB_BUILD_CONTRIB_DYN := yes
ifneq ($(filter $(HB_HOST_PLAT),win),)
ifeq ($(HB_BUILD_CONTRIB_DYN),)
export HB_BUILD_CONTRIB_DYN := yes
endif
endif
ifneq ($(filter $(HB_HOST_PLAT),win wce dos os2),)

6
utils/hbmk2/hbmk2.prg
View File

@@ -2406,14 +2406,14 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit
ENDSWITCH
AAdd( hbmk[ _HBMK_aLIBUSERSYS ], "hbpmcom" )
IF !Empty( tmp )
IF ! Empty( tmp )
#if defined( HB_HAS_WATT )
AAdd( hbmk[ _HBMK_aLIBUSERSYSPRE ], tmp )
IF hb_DirExists( tmp1 := hb_DirSepToOS( GetEnv( "WATT_ROOT" ) ) + hb_ps() + "lib" )
AAdd( hbmk[ _HBMK_aLIBPATH ], tmp1 )
ENDIF
#else
IF hb_DirExists( tmp1 := hb_DirSepToOS( GetEnv( "WATT_ROOT" ) ) + hb_ps() + "lib" ) .and. ;
IF hb_DirExists( tmp1 := hb_DirSepToOS( GetEnv( "WATT_ROOT" ) ) + hb_ps() + "lib" ) .AND. ;
hb_FileExists( tmp1 + hb_ps() + cLibLibPrefix + tmp + cLibExt )
AAdd( hbmk[ _HBMK_aLIBPATH ], tmp1 )
AAdd( hbmk[ _HBMK_aLIBUSERSYSPRE ], tmp )
@@ -6785,7 +6785,7 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit
aThreads := {}
FOR EACH aTO_DO IN ArraySplit( l_aCGEN_TO_DO, l_nJOBS )
IF hb_mtvm() .AND. Len( aTO_DO:__enumBase() ) > 1
AAdd( aThreads, hb_threadStart( @CompileCLoop(), hbmk, aTO_DO, cBin_CompCGEN, cOpt_CompCPass, hb_hClone( hReplace ), cObjExt, nOpt_Esc, nOpt_FNF, aTO_DO:__enumIndex(), Len( aTO_DO:__enumBase() ) ) )
AAdd( aThreads, hb_threadStart( @CompileCLoop(), hbmk, aTO_DO, cBin_CompCGEN, cOpt_CompCPass, hb_HClone( hReplace ), cObjExt, nOpt_Esc, nOpt_FNF, aTO_DO:__enumIndex(), Len( aTO_DO:__enumBase() ) ) )
ELSE
IF ! CompileCLoop( hbmk, aTO_DO, cBin_CompCGEN, cOpt_CompCPass, hReplace, cObjExt, nOpt_Esc, nOpt_FNF, 0, 0 )
IF ! hbmk[ _HBMK_lIGNOREERROR ]