diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e20cd913c3..f2f86242d4 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,17 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-09-24 12:47 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * harbour-ce-spec + * harbour-w32-spec + * harbour.spec + * make_xmingwce.sh + % Some remaining explicit GT defaultings removed. Relying on + RTL source code. + + * include/hbsetup.h + ! Disabled HB_MT_VM for HB_WINCE. + 2008-09-24 12:31 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/vm/vmmt/Makefile ! Possible fix for mingw build error: diff --git a/harbour/harbour-ce-spec b/harbour/harbour-ce-spec index 820a11da60..4433f402ec 100644 --- a/harbour/harbour-ce-spec +++ b/harbour/harbour-ce-spec @@ -112,7 +112,6 @@ export CCPREFIX="%{hb_ccpref}" export PATH="$CCPATH$PATH" export HB_XBUILD=wce -export HB_GT_LIB=gtwvt export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/%{name} export HB_LIB_INSTALL=%{_libdir}/%{name} @@ -142,7 +141,6 @@ export HB_HOST_BUILD=lib export HB_ARCHITECTURE=w32 export HB_COMPILER=mingwce export HB_XBUILD=wce -export HB_GT_LIB=gtwvt export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/%{name} export HB_LIB_INSTALL=%{_libdir}/%{name} diff --git a/harbour/harbour-w32-spec b/harbour/harbour-w32-spec index 77c217279b..f5060ac455 100644 --- a/harbour/harbour-w32-spec +++ b/harbour/harbour-w32-spec @@ -112,7 +112,6 @@ export CCPREFIX="%{hb_ccpref}" export PATH="$CCPATH$PATH" export HB_XBUILD=w32 -export HB_GT_LIB=gtwin export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/%{name} export HB_LIB_INSTALL=%{_libdir}/%{name} @@ -142,7 +141,6 @@ export HB_HOST_BUILD=lib export HB_ARCHITECTURE=w32 export HB_COMPILER=mingw export HB_XBUILD=w32 -export HB_GT_LIB=gtwin export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/%{name} export HB_LIB_INSTALL=%{_libdir}/%{name} diff --git a/harbour/harbour.spec b/harbour/harbour.spec index b5f96a1210..382888ad36 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -69,7 +69,6 @@ %define hb_cc export HB_COMPILER=gcc %define hb_cflag export C_USR="-O3 -DHB_FM_STATISTICS_OFF" %define hb_lflag export L_USR="${CC_L_USR} %{?_with_static:-static}" -%define hb_gt export HB_GT_LIB=gttrm %define hb_defgt export HB_GT_DEFAULT="${HB_GT_DEFAULT}" %define hb_gpm export HB_GPM_MOUSE=%{!?_without_gpm:yes} %define hb_crs export HB_WITHOUT_GTCRS=%{?_without_gtcrs:yes} @@ -80,7 +79,7 @@ %define hb_ldir export HB_LIB_INSTALL=%{_libdir}/%{name} %define hb_cmrc export HB_COMMERCE=%{?_without_gpllib:yes} %define hb_ctrb export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmsql hbmzip hbsqlit3 hbtip hbtpathy hbvpdf hbziparc xhb %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_hbhpdf:hbhpdf} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" -%define hb_env %{hb_arch} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_gt} ; %{hb_defgt} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_ctrb} ; %{hb_cmrc} +%define hb_env %{hb_arch} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_defgt} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_ctrb} ; %{hb_cmrc} %define hb_host www.harbour-project.org %define readme README.RPM ###################################################################### diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h index 8557af79f0..202d276cf9 100644 --- a/harbour/include/hbsetup.h +++ b/harbour/include/hbsetup.h @@ -381,6 +381,10 @@ #endif #endif +#if defined(HB_WINCE) && defined(HB_MT_VM) + #undef HB_MT_VM +#endif + /* *********************************************************************** * See also the following files for task specific definitions/settings * diff --git a/harbour/make_xmingwce.sh b/harbour/make_xmingwce.sh index 45d4365e73..efd220e8d4 100755 --- a/harbour/make_xmingwce.sh +++ b/harbour/make_xmingwce.sh @@ -70,7 +70,6 @@ export CCPATH="${CCPATH}:" export HB_TOOLS_PREF="hbce" export HB_XBUILD="wce" [ "${HB_HOST_BUILD}" = "all" ] || export HB_HOST_BUILD="lib" -export HB_GT_LIB="gtwvt" export HB_BIN_COMPILE="/tmp/hb-${CCPREFIX}-$$" rm -fR "${HB_BIN_COMPILE}"