From a66396010956d43c6f91e10f0ce40034b5bbd407 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 20 Feb 2009 12:26:01 +0000 Subject: [PATCH] 2009-02-20 13:08 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * bin/hb-func.sh + Added generation of hbmkcfg.hbp. gt override, cflags, ldflags and slang/curses libs are currently added. ; TODO: Add this file to distro packages. * utils/hbmk2/hbmk2.prg ! Fixed handling of -DHB_EXT_ZLIB. ! Fixed handling of -DHB_PCRE_REGEX. + Added support for -DHB_POSIX_REGEX. ! Removed -mconsole from *nix gccs too. + Added new Linux targets mingw and mingwce for future cross compiling support. + Added remaining system libs for linux, sunos and hpux. + Added a more complete set of win system libs for mingw. TODO: Some more generic solution needs to be developed because currently the win systems libs add by our tools are pretty much random across the different supported compilers. + Added system lib list for mingwce. + Path separator translation for mingwce. --- harbour/ChangeLog | 23 ++++++++++++++ harbour/bin/hb-func.sh | 22 ++++++++++++- harbour/utils/hbmk2/hbmk2.prg | 58 +++++++++++++++++++++++------------ 3 files changed, 83 insertions(+), 20 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3635b75a71..c5817fc63d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,29 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-20 13:08 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * bin/hb-func.sh + + Added generation of hbmkcfg.hbp. + gt override, cflags, ldflags and slang/curses libs are + currently added. + ; TODO: Add this file to distro packages. + + * utils/hbmk2/hbmk2.prg + ! Fixed handling of -DHB_EXT_ZLIB. + ! Fixed handling of -DHB_PCRE_REGEX. + + Added support for -DHB_POSIX_REGEX. + ! Removed -mconsole from *nix gccs too. + + Added new Linux targets mingw and mingwce for future + cross compiling support. + + Added remaining system libs for linux, sunos and hpux. + + Added a more complete set of win system libs for mingw. + TODO: Some more generic solution needs to be developed + because currently the win systems libs add by our + tools are pretty much random across the different + supported compilers. + + Added system lib list for mingwce. + + Path separator translation for mingwce. + 2009-02-20 13:18 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/vm/classes.c * cleanup comment diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh index 867c8e8ae0..831d43284b 100755 --- a/harbour/bin/hb-func.sh +++ b/harbour/bin/hb-func.sh @@ -108,7 +108,7 @@ mk_hbgetlibsctb() mk_hbtools() { - local name hb_pref hb_tool hb_libs hb_libsc + local name hb_pref hb_tool hb_libs hb_libsc hb_hbmkcfg name=`get_solibname` hb_pref="$4" @@ -221,6 +221,26 @@ mk_hbtools() CC_HB_USER_CFLAGS="${CC_HB_USER_CFLAGS} -fpic" fi + hb_hbmkcfg="$1/hbmkcfg.hbp" + echo "Generating ${hb_hbmkcfg}... " + echo "# Harbour Make configuration"> ${hb_hbmkcfg} + echo "# Generated by Harbour build process">> ${hb_hbmkcfg} + if [ -n "${HB_GT_LIB}" ]; then + echo "gt=${HB_GT_LIB}">> ${hb_hbmkcfg} + fi + if [ -n "${CC_HB_USER_CFLAGS}" ]; then + echo "cflags=${CC_HB_USER_CFLAGS}">> ${hb_hbmkcfg} + fi + if [ -n "${CC_HB_USER_LDFLAGS}" ]; then + echo "ldflags=${CC_HB_USER_LDFLAGS}">> ${hb_hbmkcfg} + fi + if [ -n "${HB_CRS_LIB}" ]; then + echo "libs=${HB_CRS_LIB}">> ${hb_hbmkcfg} + fi + if [ -n "${HB_SLN_LIB}" ]; then + echo "libs=${HB_SLN_LIB}">> ${hb_hbmkcfg} + fi + echo "Generating ${hb_tool}... " cat > ${hb_tool} < values for each supported value:" ,; - " linux : gcc, gpp, owatcom" ,; + " linux : gcc, gpp, owatcom, mingw, mingwce" ,; " darwin : gcc" ,; " win : gcc, mingw, msvc, bcc32, owatcom, pocc, pocc64," ,; " dmc, rsxnt, xcc, icc" ,; /* poccce, mingwce, msvcce */