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

2012-06-18 21:12 UTC+0200 Viktor Szakats (harbour syenar.net)

Browse Source 
* utils/hbmk2/hbmk2.prg
    - do not include Harbour bin dir in linker libpath on non-*nix
      systems. In could cause some compilers (f.e. mingw) to link
      to .dlls stored there (f.e. 3rd party dynamic dlls enabled
      with HB_INSTALL_3RDDYN), not letting user supplied libpaths
      to kick in. If you for some reason want to include Harbour
      bin dir in libpath, use: -L${HB_LIB} option, or to include
      dynamic lib dir (emulating old behavior on non-*nix), use
      -L${HB_DYN}
    ! fixed -env option processing after 2012-06-14 12:01 UTC+0200
This commit is contained in:
Viktor Szakats
2012-06-18 19:12:49 +00:00
parent 1c9109cd99
commit f1a837228b
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -16,6 +16,18 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-06-18 21:12 UTC+0200 Viktor Szakats (harbour syenar.net)
* utils/hbmk2/hbmk2.prg
- do not include Harbour bin dir in linker libpath on non-*nix
systems. In could cause some compilers (f.e. mingw) to link
to .dlls stored there (f.e. 3rd party dynamic dlls enabled
with HB_INSTALL_3RDDYN), not letting user supplied libpaths
to kick in. If you for some reason want to include Harbour
bin dir in libpath, use: -L${HB_LIB} option, or to include
dynamic lib dir (emulating old behavior on non-*nix), use
-L${HB_DYN}
! fixed -env option processing after 2012-06-14 12:01 UTC+0200
2012-06-18 20:06 UTC+0200 Viktor Szakats (harbour syenar.net)
* INSTALL
+ use win-make in primary build example except mingw32-make,

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

@@ -1053,7 +1053,9 @@ STATIC PROCEDURE hbmk_harbour_dirlayout_init( hbmk, l_cHB_INSTALL_PREFIX )
AAddNotEmpty( hbmk[ _HBMK_aLIBPATH ], hbmk[ _HBMK_cHB_INSTALL_LIB ] )
/* Locally hosted 3rd party binary libraries */
AAddNotEmpty( hbmk[ _HBMK_aLIBPATH ], hbmk[ _HBMK_cHB_INSTALL_LI3 ] )
IF ! Empty( hbmk[ _HBMK_cHB_INSTALL_DYN ] ) .AND. !( hbmk[ _HBMK_cHB_INSTALL_DYN ] == hbmk[ _HBMK_cHB_INSTALL_LIB ] )
IF ! Empty( hbmk[ _HBMK_cHB_INSTALL_DYN ] ) .AND. ;
!( hbmk[ _HBMK_cHB_INSTALL_DYN ] == hbmk[ _HBMK_cHB_INSTALL_LIB ] ) .AND. ;
! HBMK_ISPLAT( "win|wce|os2|dos|cygwin" )
AAddNotEmpty( hbmk[ _HBMK_aLIBPATH ], hbmk[ _HBMK_cHB_INSTALL_DYN ] )
ENDIF
@@ -2245,9 +2247,11 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel )
/* Simply ignore. They were already processed in the first pass. */
/* -env options used inside makefiles */
CASE Left( cParamL, 5 ) == "-env:" .AND. ! Empty( aParam[ _PAR_cFileName ] )
CASE Left( cParamL, 5 ) == "-env:"
ProcEnvOption( SubStr( cParam, 6 ) )
IF ! Empty( aParam[ _PAR_cFileName ] )
ProcEnvOption( SubStr( cParam, 6 ) )
ENDIF
CASE cParamL == "-quiet" ; hbmk[ _HBMK_lQuiet ] := .T. ; hbmk[ _HBMK_lInfo ] := .F.
CASE cParamL == "-quiet-"