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

2011-02-10 12:19 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbmysql/hbmysql.hbc
  * contrib/sddpg/sddpg.hbc
  * contrib/hbpgsql/hbpgsql.hbc
  * contrib/sddmy/sddmy.hbc
  * contrib/hbmagic/hbmagic.hbp
  * contrib/hbmagic/hbmagic.hbc
  * contrib/hbfimage/hbfimage.hbc
  * contrib/hbcairo/hbcairo.hbc
    + Added libpaths for darwin.
    + Added libmagic detection on darwin.

  * contrib/hbgd/hbgd.hbc
    ! Fixed libpath option for darwin.

  * utils/hbmk2/hbmk2.prg
    * Add watt lib path to path list only if exists.
    * Add -L and libpaths= values to path lists only if they exist.
    ! Fixed option order in dynlib libtool command for darwin.
This commit is contained in:
Viktor Szakats
2011-02-10 11:20:55 +00:00
parent fab0c1bad0
commit 19db5041b5
11 changed files with 52 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
harbour/ChangeLog
View File

@@ -16,6 +16,26 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-02-10 12:19 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbmysql/hbmysql.hbc
* contrib/sddpg/sddpg.hbc
* contrib/hbpgsql/hbpgsql.hbc
* contrib/sddmy/sddmy.hbc
* contrib/hbmagic/hbmagic.hbp
* contrib/hbmagic/hbmagic.hbc
* contrib/hbfimage/hbfimage.hbc
* contrib/hbcairo/hbcairo.hbc
+ Added libpaths for darwin.
+ Added libmagic detection on darwin.
* contrib/hbgd/hbgd.hbc
! Fixed libpath option for darwin.
* utils/hbmk2/hbmk2.prg
* Add watt lib path to path list only if exists.
* Add -L and libpaths= values to path lists only if they exist.
! Fixed option order in dynlib libtool command for darwin.
2011-02-10 09:38 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
+ switched to use libtool for lib assembly with all darwin

5
harbour/contrib/hbcairo/hbcairo.hbc
View File

@@ -6,5 +6,6 @@ incpaths=.
libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
{!unix}libs=cairo
{unix}ldflags="`pkg-config --libs cairo`"
{!unix|darwin}libs=cairo
{unix&!darwin}ldflags="`pkg-config --libs cairo`"
{darwin}libpaths=/opt/local/lib

2
harbour/contrib/hbfimage/hbfimage.hbc
View File

@@ -7,4 +7,6 @@ skip={dos}
incpaths=.
libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
libs=freeimage
{darwin}libpaths=/opt/local/lib

4
harbour/contrib/hbgd/hbgd.hbc
View File

@@ -5,10 +5,10 @@
incpaths=.
libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
{win}libs=bgd
{linux}libs=gd png jpeg freetype m
{darwin}libs=gd
{darwin}libpaths=/opt/local/lib
libs=../hbct/hbct.hbc
-L/opt/local/lib{darwin}

2
harbour/contrib/hbmagic/hbmagic.hbc
View File

@@ -5,4 +5,6 @@
incpaths=.
libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
{unix}libs=magic
{darwin}libpaths=/opt/local/lib

1
harbour/contrib/hbmagic/hbmagic.hbp
View File

@@ -12,6 +12,7 @@
-depkeyhead=libmagic:magic.h
-depcontrol=libmagic:${HB_WITH_LIBMAGIC}
-depincpath=libmagic:/usr/include
-depincpath=libmagic:/opt/local/include
-instfile=inc:hbmagic.ch
-instfile=inc:hbmagic.hbx

2
harbour/contrib/hbmysql/hbmysql.hbc
View File

@@ -5,5 +5,7 @@
incpaths=.
libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
{unix}libs=mysqlclient
{!unix}libs=libmysql
{darwin}libpaths=/opt/local/lib/mysql5/mysql

3
harbour/contrib/hbpgsql/hbpgsql.hbc
View File

@@ -5,5 +5,8 @@
incpaths=.
libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
{unix}libs=pq
{!unix}libs=libpq
{darwin}libpaths=/opt/local/lib/postgresql84
{darwin}libpaths=/opt/local/lib/postgresql83

2
harbour/contrib/sddmy/sddmy.hbc
View File

@@ -3,7 +3,9 @@
#
libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
{unix}libs=mysqlclient
{!unix}libs=libmysql
{darwin}libpaths=/opt/local/lib/mysql5/mysql
libs=../rddsql/rddsql.hbc

3
harbour/contrib/sddpg/sddpg.hbc
View File

@@ -3,7 +3,10 @@
#
libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
{unix}libs=pq
{!unix}libs=libpq
{darwin}libpaths=/opt/local/lib/postgresql84
{darwin}libpaths=/opt/local/lib/postgresql83
libs=../rddsql/rddsql.hbc

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

@@ -1969,7 +1969,9 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
CASE "djgpp" ; AAdd( hbmk[ _HBMK_aLIBUSERSYS ], "watt" ) ; EXIT
CASE "watcom" ; AAdd( hbmk[ _HBMK_aLIBUSERSYS ], "wattcpwf" ) ; EXIT
ENDSWITCH
AAdd( hbmk[ _HBMK_aLIBPATH ], PathSepToSelf( GetEnv( "WATT_ROOT" ) ) + hb_ps() + "lib" )
IF hb_DirExists( tmp := PathSepToSelf( GetEnv( "WATT_ROOT" ) ) + hb_ps() + "lib" )
AAdd( hbmk[ _HBMK_aLIBPATH ], tmp )
ENDIF
ENDIF
#endif
@@ -2430,7 +2432,10 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
cParam := MacroProc( hbmk, SubStr( cParam, 3 ), aParam[ _PAR_cFileName ] )
IF ! Empty( cParam )
AAdd( hbmk[ _HBMK_aLIBPATH ], DirDelPathSep( PathMakeAbsolute( PathSepToSelf( cParam ), aParam[ _PAR_cFileName ] ) ) )
cParam := DirDelPathSep( PathMakeAbsolute( PathSepToSelf( cParam ), aParam[ _PAR_cFileName ] ) )
IF ( _MACRO_LATE_PREFIX + _MACRO_OPEN ) $ cParam .OR. hb_DirExists( cParam )
AAdd( hbmk[ _HBMK_aLIBPATH ], cParam )
ENDIF
ENDIF
CASE Left( cParamL, Len( "-instfile=" ) ) == "-instfile="
@@ -3276,7 +3281,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
ENDIF
IF hbmk[ _HBMK_cPLAT ] == "darwin"
cBin_Dyn := cBin_Lib
cOpt_Dyn := "-dynamic -o {OD} {LO} -flat_namespace -undefined suppress -single_module {FD} {DL} {LS}" /* NOTE: -single_module is now the default in ld/libtool. */
cOpt_Dyn := "-dynamic -o {OD} -flat_namespace -undefined suppress -single_module {FD} {DL} {LO} {LS}" /* NOTE: -single_module is now the default in ld/libtool. */
ELSE
cBin_Dyn := cBin_CompC
cOpt_Dyn := "-shared -o {OD} {LO} {FD} {DL} {LS}"
@@ -9258,7 +9263,10 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
FOR EACH cItem IN hb_ATokens( cLine,, .T. )
cItem := MacroProc( hbmk, StrStripQuote( cItem ), cFileName )
IF ! Empty( cItem )
AAddNew( hbmk[ _HBMK_aLIBPATH ], DirDelPathSep( PathNormalize( PathMakeAbsolute( PathSepToSelf( cItem ), FNameDirGet( cFileName ) ) ) ) )
cItem := DirDelPathSep( PathNormalize( PathMakeAbsolute( PathSepToSelf( cItem ), FNameDirGet( cFileName ) ) ) )
IF ( _MACRO_LATE_PREFIX + _MACRO_OPEN ) $ cItem .OR. hb_DirExists( cItem )
AAddNew( hbmk[ _HBMK_aLIBPATH ], cItem )
ENDIF
ENDIF
NEXT