From dd64b568d80af787ee4221443931b4bc479b637d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 29 Aug 2008 08:40:30 +0000 Subject: [PATCH] 2008-08-29 10:40 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + config/w32/mingwce.cf - config/w32/cemgw.cf * harbour-ce-spec * make_xmingwce.sh * bin/hb-mkslib.sh * bin/hb-func.sh * bin/postinst.sh * source/vm/Makefile * Renamed 'cemgw' HB_COMPILER name to 'mingwce' for consitency. --- harbour/ChangeLog | 12 ++++++++++++ harbour/bin/hb-func.sh | 10 +++++----- harbour/bin/hb-mkslib.sh | 2 +- harbour/bin/postinst.sh | 4 ++-- harbour/config/w32/{cemgw.cf => mingwce.cf} | 0 harbour/harbour-ce-spec | 4 ++-- harbour/make_xmingwce.sh | 4 ++-- harbour/source/vm/Makefile | 2 +- 8 files changed, 25 insertions(+), 13 deletions(-) rename harbour/config/w32/{cemgw.cf => mingwce.cf} (100%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 28b1529ef7..6288281166 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,18 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-08-29 10:40 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + + config/w32/mingwce.cf + - config/w32/cemgw.cf + * harbour-ce-spec + * make_xmingwce.sh + * bin/hb-mkslib.sh + * bin/hb-func.sh + * bin/postinst.sh + * source/vm/Makefile + * Renamed 'cemgw' HB_COMPILER name to 'mingwce' + for consitency. + 2008-08-29 10:35 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * ChangeLog ! Minor typo. diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh index 6abc649628..3d680c78dd 100755 --- a/harbour/bin/hb-func.sh +++ b/harbour/bin/hb-func.sh @@ -77,7 +77,7 @@ mk_hbgetlibs() if [ -z "$@" ] then libs="" - if [ "$HB_COMPILER" != "cemgw" ] + if [ "$HB_COMPILER" != "mingwce" ] then libs="$libs gtwin" fi @@ -94,7 +94,7 @@ mk_hbgetlibsctb() if [ -z "$@" ] then libs="" - if [ "$HB_COMPILER" = "cemgw" ] + if [ "$HB_COMPILER" = "mingwce" ] then libs="$libs gtwin" fi @@ -154,7 +154,7 @@ mk_hbtools() fi 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 + elif [ "${HB_COMPILER}" = "mingwce" ]; then HB_SYS_LIBS="${HB_SYS_LIBS} -lwininet -lws2 -lcommdlg -lcommctrl -luuid -lole32" elif [ "${HB_COMPILER}" = "djgpp" ]; then HB_SYS_LIBS="${HB_SYS_LIBS}" @@ -502,7 +502,7 @@ if [ "\${HB_COMPILER}" = "mingw32" ]; then elif [ "\${HB_MODE}" = "std" ]; then l="hbmainstd" fi -elif [ "\${HB_COMPILER}" = "cemgw" ]; then +elif [ "\${HB_COMPILER}" = "mingwce" ]; then if [ "\${HB_MODE}" = "std" ]; then l="hbmainstd" else @@ -518,7 +518,7 @@ l="hbfm" [ "\${HB_MT}" = "MT" ] && [ -f "\${HB_LIB_INSTALL}/lib\${l}mt.a" ] && l="\${l}mt" if [ -f "\${HB_LIB_INSTALL}/lib\${l}.a" ] && \\ ( [ -n "\${HB_FM_REQ}" ] || [ "\${HB_STATIC}" = "yes" ] ) && \\ - ( [ "\${HB_COMPILER}" != "cemgw" ] || [ "\${HB_FM_REQ}" = "STAT" ] ); then + ( [ "\${HB_COMPILER}" != "mingwce" ] || [ "\${HB_FM_REQ}" = "STAT" ] ); then if [ "\${HB_STATIC}" = "yes" ] && [ "\${HB_FM_REQ}" = "STAT" ]; then HARBOUR_LIBS="-l\${l} \${HARBOUR_LIBS}" else diff --git a/harbour/bin/hb-mkslib.sh b/harbour/bin/hb-mkslib.sh index adf4205837..b5e5c1fc46 100755 --- a/harbour/bin/hb-mkslib.sh +++ b/harbour/bin/hb-mkslib.sh @@ -127,7 +127,7 @@ if [ "${SLIB_EXT}" = ".dylib" ]; then ln -sf "${FULLNAME}" "${DSTDIR}${BASE}${SLIB_EXT}" elif [ "${SLIB_EXT}" = ".dll" ]; then FULLNAME="${LIB_NAME}${SLIB_EXT}" - if [ "$HB_COMPILER" = "cemgw" ]; then + if [ "$HB_COMPILER" = "mingwce" ]; then SYSLIBS=" -lwininet -lws2" else SYSLIBS="-luser32 -lwinspool -lgdi32 -lcomctl32 -lcomdlg32 -lole32" diff --git a/harbour/bin/postinst.sh b/harbour/bin/postinst.sh index 25d7b2f96c..b47574c509 100755 --- a/harbour/bin/postinst.sh +++ b/harbour/bin/postinst.sh @@ -41,7 +41,7 @@ fi . ${hb_root}/bin/hb-func.sh if [ "$HB_COMPILER" = "gcc" ] || [ "$HB_COMPILER" = "gpp" ] || \ - [ "$HB_COMPILER" = "mingw32" ] || [ "$HB_COMPILER" = "cemgw" ] || \ + [ "$HB_COMPILER" = "mingw32" ] || [ "$HB_COMPILER" = "mingwce" ] || \ [ "$HB_COMPILER" = "djgpp" ] then RANLIB="" @@ -78,7 +78,7 @@ then fi mk_hbtools "${HB_BIN_INSTALL}" "$@" if [ "$HB_COMPILER" = "gcc" ] || [ "$HB_COMPILER" = "gpp" ] || \ - [ "$HB_COMPILER" = "mingw32" ] || [ "$HB_COMPILER" = "cemgw" ]; then + [ "$HB_COMPILER" = "mingw32" ] || [ "$HB_COMPILER" = "mingwce" ]; then mk_hblibso "${hb_root}" fi # build hbfm lib with memory statistic diff --git a/harbour/config/w32/cemgw.cf b/harbour/config/w32/mingwce.cf similarity index 100% rename from harbour/config/w32/cemgw.cf rename to harbour/config/w32/mingwce.cf diff --git a/harbour/harbour-ce-spec b/harbour/harbour-ce-spec index 34346eedf2..f5d9f9973b 100644 --- a/harbour/harbour-ce-spec +++ b/harbour/harbour-ce-spec @@ -94,7 +94,7 @@ make -r export HB_HOST_BUILD=lib export HB_ARCHITECTURE=w32 -export HB_COMPILER=cemgw +export HB_COMPILER=mingwce mkdir -p source/pp/${HB_ARCHITECTURE}/${HB_COMPILER} ln -s ../../linux/gcc/hbpp source/pp/${HB_ARCHITECTURE}/${HB_COMPILER}/hbpp.exe @@ -141,7 +141,7 @@ export PATH="$CCPATH$PATH" export HB_HOST_BUILD=lib export HB_ARCHITECTURE=w32 -export HB_COMPILER=cemgw +export HB_COMPILER=mingwce export HB_MT=no export HB_XBUILD=wce export HB_GT_LIB=gtwvt diff --git a/harbour/make_xmingwce.sh b/harbour/make_xmingwce.sh index 613d37c478..13eb9915e2 100755 --- a/harbour/make_xmingwce.sh +++ b/harbour/make_xmingwce.sh @@ -18,7 +18,7 @@ UNAMEL=`echo "$UNAME"|tr A-Z a-z` UNAMEU=`echo "$UNAME"|tr a-z A-Z` export HB_ARCHITECTURE=w32 -export HB_COMPILER=cemgw +export HB_COMPILER=mingwce if [ "$OSTYPE" = "msdosdjgpp" ]; then HB_HOST_ARCH="dos" @@ -40,7 +40,7 @@ if [ "$HB_HOST_ARCH" != "w32" ]; then fi [ -z "$HB_INSTALL_PREFIX" ] && \ -export HB_INSTALL_PREFIX="/usr/local/arm-wince-cemgw-harbour" +export HB_INSTALL_PREFIX="/usr/local/arm-wince-mingwce-harbour" export CC_C_USR="" export C_USR="$CC_C_USR $C_USR" export CC_PRG_USR diff --git a/harbour/source/vm/Makefile b/harbour/source/vm/Makefile index 7536a5bd07..a65001cab1 100644 --- a/harbour/source/vm/Makefile +++ b/harbour/source/vm/Makefile @@ -9,7 +9,7 @@ ifeq ($(HB_ARCHITECTURE),w32) C_MAIN = mainwin.c DIRS = mainstd else - ifeq ($(HB_COMPILER),cemgw) + ifeq ($(HB_COMPILER),mingwce) C_MAIN = mainwin.c DIRS = mainstd mainwin else