diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d8b79cd440..ad57569ab2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-09-17 18:04 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * make_gcc.sh + * contrib/make_gcc_all.sh + ! cyg to w32 architecture conversion got uncommented. + 2008-09-17 17:32 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * bin/hb-mkslib.sh * make_gcc.sh diff --git a/harbour/contrib/make_gcc_all.sh b/harbour/contrib/make_gcc_all.sh index d9f6ddfc18..e53c32dd0e 100755 --- a/harbour/contrib/make_gcc_all.sh +++ b/harbour/contrib/make_gcc_all.sh @@ -50,10 +50,10 @@ esac # Revert Cygwin architecture to w32. # After all it's under Windows OS. -#if [ "$HB_ARCHITECTURE" == "cyg" ] -#then -# export HB_ARCHITECTURE=w32 -#fi +if [ "$HB_ARCHITECTURE" == "cyg" ] +then + export HB_ARCHITECTURE=w32 +fi if [ "${HB_INC_ALLEGRO}" != "" ]; then _HB_DIRS="${_HB_DIRS} gtalleg"; fi; if [ "${HB_INC_APOLLO}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbapollo"; fi; diff --git a/harbour/make_gcc.sh b/harbour/make_gcc.sh index 685143739e..3bd992edd8 100755 --- a/harbour/make_gcc.sh +++ b/harbour/make_gcc.sh @@ -192,10 +192,10 @@ mkdir -p obj/$HB_CC_NAME lib/$HB_CC_NAME bin/$HB_CC_NAME # Revert Cygwin architecture to w32. # After all it's under Windows OS. -#if [ "$HB_ARCHITECTURE" == "cyg" ] -#then -# export HB_ARCHITECTURE=w32 -#fi +if [ "$HB_ARCHITECTURE" == "cyg" ] +then + export HB_ARCHITECTURE=w32 +fi sed -e 's/;/ /g' \ -e 's!\\\(.\)!/\1!g' \