From 19db5041b5b3348c30a6ae75e25d2f351819c834 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 10 Feb 2011 11:20:55 +0000 Subject: [PATCH] 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. --- harbour/ChangeLog | 20 ++++++++++++++++++++ harbour/contrib/hbcairo/hbcairo.hbc | 5 +++-- harbour/contrib/hbfimage/hbfimage.hbc | 2 ++ harbour/contrib/hbgd/hbgd.hbc | 4 ++-- harbour/contrib/hbmagic/hbmagic.hbc | 2 ++ harbour/contrib/hbmagic/hbmagic.hbp | 1 + harbour/contrib/hbmysql/hbmysql.hbc | 2 ++ harbour/contrib/hbpgsql/hbpgsql.hbc | 3 +++ harbour/contrib/sddmy/sddmy.hbc | 2 ++ harbour/contrib/sddpg/sddpg.hbc | 3 +++ harbour/utils/hbmk2/hbmk2.prg | 16 ++++++++++++---- 11 files changed, 52 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a26979ba6b..895a46582f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -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 diff --git a/harbour/contrib/hbcairo/hbcairo.hbc b/harbour/contrib/hbcairo/hbcairo.hbc index d9da232f44..6619184e13 100644 --- a/harbour/contrib/hbcairo/hbcairo.hbc +++ b/harbour/contrib/hbcairo/hbcairo.hbc @@ -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 diff --git a/harbour/contrib/hbfimage/hbfimage.hbc b/harbour/contrib/hbfimage/hbfimage.hbc index cdc4d638c8..00d63e2ad0 100644 --- a/harbour/contrib/hbfimage/hbfimage.hbc +++ b/harbour/contrib/hbfimage/hbfimage.hbc @@ -7,4 +7,6 @@ skip={dos} incpaths=. libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} + libs=freeimage +{darwin}libpaths=/opt/local/lib diff --git a/harbour/contrib/hbgd/hbgd.hbc b/harbour/contrib/hbgd/hbgd.hbc index 9ccc0a483c..dbd2c8c0d6 100644 --- a/harbour/contrib/hbgd/hbgd.hbc +++ b/harbour/contrib/hbgd/hbgd.hbc @@ -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} diff --git a/harbour/contrib/hbmagic/hbmagic.hbc b/harbour/contrib/hbmagic/hbmagic.hbc index 0b27558f6d..8ef8cb4086 100644 --- a/harbour/contrib/hbmagic/hbmagic.hbc +++ b/harbour/contrib/hbmagic/hbmagic.hbc @@ -5,4 +5,6 @@ incpaths=. libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} + {unix}libs=magic +{darwin}libpaths=/opt/local/lib diff --git a/harbour/contrib/hbmagic/hbmagic.hbp b/harbour/contrib/hbmagic/hbmagic.hbp index 22569a16da..6a055adf19 100644 --- a/harbour/contrib/hbmagic/hbmagic.hbp +++ b/harbour/contrib/hbmagic/hbmagic.hbp @@ -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 diff --git a/harbour/contrib/hbmysql/hbmysql.hbc b/harbour/contrib/hbmysql/hbmysql.hbc index 30fbece519..27d9a8e477 100644 --- a/harbour/contrib/hbmysql/hbmysql.hbc +++ b/harbour/contrib/hbmysql/hbmysql.hbc @@ -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 diff --git a/harbour/contrib/hbpgsql/hbpgsql.hbc b/harbour/contrib/hbpgsql/hbpgsql.hbc index a24db7476a..3e8b5d1b2e 100644 --- a/harbour/contrib/hbpgsql/hbpgsql.hbc +++ b/harbour/contrib/hbpgsql/hbpgsql.hbc @@ -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 diff --git a/harbour/contrib/sddmy/sddmy.hbc b/harbour/contrib/sddmy/sddmy.hbc index c48292bab8..d8f60af348 100644 --- a/harbour/contrib/sddmy/sddmy.hbc +++ b/harbour/contrib/sddmy/sddmy.hbc @@ -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 diff --git a/harbour/contrib/sddpg/sddpg.hbc b/harbour/contrib/sddpg/sddpg.hbc index e5b9b9f70f..5d28d6bef5 100644 --- a/harbour/contrib/sddpg/sddpg.hbc +++ b/harbour/contrib/sddpg/sddpg.hbc @@ -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 diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 5ce9ab1924..96cf68e59b 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -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