diff options
-rw-r--r-- | docs/CREDITS | 1 | ||||
-rwxr-xr-x | tools/rockboxdev.sh | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/docs/CREDITS b/docs/CREDITS index a162e21262..1c400b30b3 100644 --- a/docs/CREDITS +++ b/docs/CREDITS | |||
@@ -313,6 +313,7 @@ Charles Voelger | |||
313 | Gerritt Gonzales | 313 | Gerritt Gonzales |
314 | Dieter Pellkofer | 314 | Dieter Pellkofer |
315 | Evgeniy Kachalin | 315 | Evgeniy Kachalin |
316 | Lenny Koepsell | ||
316 | The libmad team | 317 | The libmad team |
317 | The wavpack team | 318 | The wavpack team |
318 | The ffmpeg team | 319 | The ffmpeg team |
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh index 7bfd7840c9..a927afef99 100755 --- a/tools/rockboxdev.sh +++ b/tools/rockboxdev.sh | |||
@@ -23,6 +23,11 @@ else | |||
23 | make="make" | 23 | make="make" |
24 | fi | 24 | fi |
25 | 25 | ||
26 | # Alternate detection for Mac OS X/Darwin | ||
27 | if [ "`uname`" == "Darwin" ] && which gmake | grep -q '^no'; then | ||
28 | make="make" | ||
29 | fi | ||
30 | |||
26 | # If detection fails, override the value of make manually: | 31 | # If detection fails, override the value of make manually: |
27 | # make="make" | 32 | # make="make" |
28 | 33 | ||