From eec2a93fb09f99c540e34ca0f9cc15d67d3b6ad6 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Fri, 21 Dec 2007 09:56:08 +0000 Subject: [PATCH] 2007-12-21 10:55 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/bin/hb-func.sh * added system libraries necessary for linking some of harbour contrib libs in WinCE * minor cleanup * harbour/source/rtl/gtxwc/gtxwc.c * added missing 'const' in declaration --- harbour/ChangeLog | 9 +++++++++ harbour/bin/hb-func.sh | 6 +++--- harbour/source/rtl/gtxwc/gtxwc.c | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 82811bbbd4..b732eb2d17 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,15 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-12-21 10:55 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/bin/hb-func.sh + * added system libraries necessary for linking some of harbour + contrib libs in WinCE + * minor cleanup + + * harbour/source/rtl/gtxwc/gtxwc.c + * added missing 'const' in declaration + 2007-12-21 10:05 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/bin/hb-func.sh * respect -fPIC used to create Harbour binaries in default diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh index 5edda5c99e..b193e5e4d3 100755 --- a/harbour/bin/hb-func.sh +++ b/harbour/bin/hb-func.sh @@ -141,7 +141,7 @@ mk_hbtools() if [ "${HB_COMPILER}" = "mingw32" ]; then HB_SYS_LIBS="${HB_SYS_LIBS} -luser32 -lwinspool -lgdi32 -lcomctl32 -lcomdlg32 -lole32 -loleaut32 -luuid -lwsock32 -lws2_32" elif [ "${HB_COMPILER}" = "cemgw" ]; then - HB_SYS_LIBS="${HB_SYS_LIBS} -lwininet -lws2" + HB_SYS_LIBS="${HB_SYS_LIBS} -lwininet -lws2 -lcommdlg -lcommctrl -luuid -lole32" elif [ "${HB_COMPILER}" = "djgpp" ]; then HB_SYS_LIBS="${HB_SYS_LIBS}" else @@ -287,7 +287,7 @@ while [ \$n -lt \${#P[@]} ]; do -o*) d="\${v#-o}"; p="\${v}" if [ -d "\${d}" ]; then - DIROUT="\${d%}" + DIROUT="\${d%/}" elif [ -d "\${d%/*}" ]; then DIROUT="\${d%/*}"; FILEOUT="\${d##*/}"; p="-o\${d}" [ \${HB} = "cc" ] || p="-o\${d%.*}" @@ -380,7 +380,7 @@ fi if [ "\${HB_STATIC}" = "full" ]; then if [ "\${HB_ARCHITECTURE}" = "linux" ]; then - SYSTEM_LIBS="\${SYSTEM_LIBS} -ldl -lpthread" + SYSTEM_LIBS="\${SYSTEM_LIBS} -lpthread" fi LN_OPT="\${LN_OPT} -static" HB_STATIC="yes" diff --git a/harbour/source/rtl/gtxwc/gtxwc.c b/harbour/source/rtl/gtxwc/gtxwc.c index 481cc17785..6e00fcf7cb 100644 --- a/harbour/source/rtl/gtxwc/gtxwc.c +++ b/harbour/source/rtl/gtxwc/gtxwc.c @@ -272,7 +272,7 @@ static const UnixBoxChar boxTranslate[] ={ #endif /* these are standard PC console colors in RGB */ -static char *rgb_colors[] = { +static const char *rgb_colors[] = { "rgb:00/00/00", /* black */ "rgb:00/00/AA", /* blue */ "rgb:00/AA/00", /* green */