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

2009-05-23 11:13 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/bin/hb-func.sh
    * reduce the scope of default options in hbmk.cfg to given platform
      and compiler {arch&comp}. Viktor please verify it.
This commit is contained in:
Przemyslaw Czerpak
2009-05-23 09:04:55 +00:00
parent 9be6fe5940
commit e08c112c2d
2 changed files with 16 additions and 10 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 these authors: Viktor Szakats.
*/
2009-05-23 11:13 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/bin/hb-func.sh
* reduce the scope of default options in hbmk.cfg to given platform
and compiler {arch&comp}. Viktor please verify it.
2009-05-22 22:28 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk2/hbmk2.prg
% mingw tool extensions now again have ".exe" extension, but

21
harbour/bin/hb-func.sh
View File

@@ -119,7 +119,7 @@ mk_hbgetlibsctb()
mk_hbtools()
{
local name hb_pref hb_tool hb_libs hb_libsc hb_hbmkcfg hb_gt_ori
local name hb_pref hb_tool hb_libs hb_libsc hb_hbmkcfg hb_mkdef hb_gt_ori
name=`get_solibname`
hb_pref="$4"
@@ -238,34 +238,35 @@ mk_hbtools()
fi
hb_hbmkcfg="$1/hbmk.cfg"
hb_mkdef="{${HB_ARCHITECTURE}&${HB_COMPILER}}"
echo "Generating ${hb_hbmkcfg}... "
echo "# Harbour Make configuration"> ${hb_hbmkcfg}
echo "# Generated by Harbour build process">> ${hb_hbmkcfg}
echo "arch=${HB_ARCHITECTURE}">> ${hb_hbmkcfg}
echo "comp=${HB_COMPILER}">> ${hb_hbmkcfg}
echo "comp={${HB_ARCHITECTURE}}${HB_COMPILER}">> ${hb_hbmkcfg}
if [ -n "${hb_gt_ori}" ]; then
echo "gtdef=${hb_gt_ori}">> ${hb_hbmkcfg}
echo "gtdef=${hb_mkdef}${hb_gt_ori}">> ${hb_hbmkcfg}
fi
if [ -n "${CC_HB_USER_CFLAGS}" ]; then
echo "cflags=${CC_HB_USER_CFLAGS}">> ${hb_hbmkcfg}
echo "cflags=${hb_mkdef}${CC_HB_USER_CFLAGS}">> ${hb_hbmkcfg}
fi
if [ -n "${CC_HB_USER_LDFLAGS}" ]; then
echo "ldflags=${CC_HB_USER_LDFLAGS}">> ${hb_hbmkcfg}
echo "ldflags=${hb_mkdef}${CC_HB_USER_LDFLAGS}">> ${hb_hbmkcfg}
fi
if [ -n "${CC_HB_USER_LIBS}" ]; then
echo "libs=${CC_HB_USER_LIBS}">> ${hb_hbmkcfg}
echo "libs=${hb_mkdef}${CC_HB_USER_LIBS}">> ${hb_hbmkcfg}
fi
if [ "${HB_GPM_MOUSE}" = "yes" ]; then
echo "libs=gpm">> ${hb_hbmkcfg}
echo "libs=${hb_mkdef}gpm">> ${hb_hbmkcfg}
fi
if [ "${HB_WITHOUT_X11}" != "yes" ]; then
echo "libdynhas=gtxwc">> ${hb_hbmkcfg}
echo "libdynhas=${hb_mkdef}gtxwc">> ${hb_hbmkcfg}
fi
if [ "${HB_WITHOUT_GTCRS}" != "yes" ] && [ -n "${HB_CRS_LIB}" ]; then
echo "libdynhas=gtcrs">> ${hb_hbmkcfg}
echo "libdynhas=${hb_mkdef}gtcrs">> ${hb_hbmkcfg}
fi
if [ "${HB_WITHOUT_GTSLN}" != "yes" ] && [ -n "${HB_SLN_LIB}" ]; then
echo "libdynhas=gtsln">> ${hb_hbmkcfg}
echo "libdynhas=${hb_mkdef}gtsln">> ${hb_hbmkcfg}
fi
echo "Generating ${hb_tool}... "