diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-10-25 15:21:01 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-10-25 15:21:01 +0000 |
| commit | 38c2a5225455acca57f72649460b4a5d12d61ca1 (patch) | |
| tree | cbdee96ca1d85812ee55fdb2b0df94bf54e89ada /nuttx/tools | |
| parent | 5b0d579d3cd42d64ff748683297657821ab353ab (diff) | |
| download | nuttx-38c2a5225455acca57f72649460b4a5d12d61ca1.tar.gz nuttx-38c2a5225455acca57f72649460b4a5d12d61ca1.tar.bz2 nuttx-38c2a5225455acca57f72649460b4a5d12d61ca1.zip | |
Fix some errors in 8-bit color conversion macros; Fix tools/incdir.sh when g++ is used; Fix bad cast that caused problems with the background window is released
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4064 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/tools')
| -rwxr-xr-x | nuttx/tools/incdir.sh | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/nuttx/tools/incdir.sh b/nuttx/tools/incdir.sh index 76f767e83..be6a1d07a 100755 --- a/nuttx/tools/incdir.sh +++ b/nuttx/tools/incdir.sh @@ -2,7 +2,7 @@ # tools/incdir.sh # # Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -111,27 +111,29 @@ fi os=`uname -o 2>/dev/null || echo "Other"` -# Let's assume that all GCC compiler paths contain the string gcc and -# no non-GCC compiler pathes include this substring +# Let's assume that all GCC compiler paths contain the string gcc or +# g++ and no non-GCC compiler pathes include these substrings gcc=`echo $ccpath | grep gcc` +if [ -z "${gcc}" ]; then + gcc=`echo $ccpath | grep g++` +fi + sdcc=`echo $ccpath | grep sdcc` if [ "X$os" = "XCygwin" ]; then # We can treat Cygwin native toolchains just like Linux native # toolchains in the Linux. Let's assume: # 1. GCC or SDCC are the only possible Cygwin native compilers - # 2. If this is a Window native GCC version, then -w provided - # on the command line (wintool=y) + # 2. If this is a Window native GCC version, then -w must be + # provided on the command line (wintool=y) if [ -z "$gcc" -a -z "$sdcc" ]; then - # Not GCC or SDCC, must be Windows native windows=yes compiler=`cygpath -u "$ccpath"` else if [ "X$wintool" == "Xy" ]; then - # It is a native GCC or SDCC compiler windows=yes compiler=`cygpath -u "$ccpath"` |