From 8f35a2af670336c5bf967d9c9843a1820901e73f Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 10 Aug 2008 15:32:50 +0000 Subject: [PATCH] 2008-08-10 17:32 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * make_xmingwce.sh * make_xmingw.sh ! Fixed to use full uppercase for script generated __PLATFORM__ macros too. Przemek pls check me. --- harbour/ChangeLog | 6 ++++++ harbour/make_xmingw.sh | 3 ++- harbour/make_xmingwce.sh | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bc3fad79b0..43a3cd645b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-08-10 17:32 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * make_xmingwce.sh + * make_xmingw.sh + ! Fixed to use full uppercase for script generated __PLATFORM__ + macros too. Przemek pls check me. + 2008-08-10 16:18 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * config/rules.cf * make_b32.mak diff --git a/harbour/make_xmingw.sh b/harbour/make_xmingw.sh index 575eadc26f..444eaf7bb0 100755 --- a/harbour/make_xmingw.sh +++ b/harbour/make_xmingw.sh @@ -15,6 +15,7 @@ cleanup() UNAME=`uname` UNAMEL=`echo "$UNAME"|tr A-Z a-z` +UNAMEU=`echo "$UNAME"|tr a-z A-Z` export HB_ARCHITECTURE=w32 export HB_COMPILER=mingw32 @@ -22,7 +23,7 @@ export HB_COMPILER=mingw32 [ -z "$HB_INSTALL_PREFIX" ] && export HB_INSTALL_PREFIX=/usr/local/mingw32-harbour export CC_C_USR="" export C_USR="$CC_C_USR $C_USR" -export CC_PRG_USR="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__$UNAME" +export CC_PRG_USR="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__$UNAMEU" export PRG_USR="$CC_PRG_USR $PRG_USR" # try to detect MinGW cross-compiler location diff --git a/harbour/make_xmingwce.sh b/harbour/make_xmingwce.sh index 75a46f131c..b3a60a6d25 100755 --- a/harbour/make_xmingwce.sh +++ b/harbour/make_xmingwce.sh @@ -17,6 +17,7 @@ export HB_ARCHITECTURE=w32 export HB_COMPILER=cemgw UNAME=`uname -s | tr -d "[-]" 2>/dev/null` +UNAMEU=`echo "$UNAME"|tr a-z A-Z` if [ "$OSTYPE" = "msdosdjgpp" ]; then HB_HOST_ARCH="dos" @@ -34,7 +35,7 @@ fi CC_PRG_USR="-D__PLATFORM__WINCE" if [ "$HB_HOST_ARCH" != "w32" ]; then - CC_PRG_USR="$CC_PRG_USR -D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__$UNAME" + CC_PRG_USR="$CC_PRG_USR -D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__$UNAMEU" fi [ -z "$HB_INSTALL_PREFIX" ] && \