aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorMax Horn2005-05-09 21:21:21 +0000
committerMax Horn2005-05-09 21:21:21 +0000
commit52bbc867979b1453f98191718c3eca726cc9ff8e (patch)
tree4bf1084cc670b2fff715916420c604684fa81135 /gui
parent1c6788797ee3a5f4790ae1e42fa9321478f62c60 (diff)
downloadscummvm-rg350-52bbc867979b1453f98191718c3eca726cc9ff8e.tar.gz
scummvm-rg350-52bbc867979b1453f98191718c3eca726cc9ff8e.tar.bz2
scummvm-rg350-52bbc867979b1453f98191718c3eca726cc9ff8e.zip
Patch #1181544 (AmigaOS 4 changes)
svn-id: r18011
Diffstat (limited to 'gui')
-rw-r--r--gui/credits.h4
-rw-r--r--gui/options.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/gui/credits.h b/gui/credits.h
index 2b17d4c68a..465c10ca5b 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -42,6 +42,8 @@ static const char *credits[] = {
"\\L\\c2"" MT-32 emulator",
"\\L\\c0"" Jochen Hoenicke",
"\\L\\c2"" Speaker & PCjr sound support, Adlib work",
+"\\L\\c0"" Hans-Jorg Frieden",
+"\\L\\c2"" Port: AmigaOS 4",
"\\L\\c0""",
"\\C\\c1""Retired Team Members:",
"\\L\\c0"" Ralph Brorsen",
@@ -101,6 +103,8 @@ static const char *credits[] = {
"\\L\\c2"" SDL-based OpenGL renderer",
"\\L\\c0"" Tim ???",
"\\L\\c2"" Initial MI1 CD music support",
+"\\L\\c0"" Juha Niemimaki",
+"\\L\\c2"" AmigaOS 4 port maintaining",
"\\L\\c0""",
"\\L\\c0""And to all the contributors, users, and beta",
"\\L\\c0""testers we've missed. Thanks!",
diff --git a/gui/options.cpp b/gui/options.cpp
index e35c11fd09..9384c97b50 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -33,7 +33,7 @@
#include "sound/mididrv.h"
#include "sound/mixer.h"
-#if (!( defined(__PALM_OS__) || defined(__DC__) || defined(__GP32__)) && !defined(_MSC_VER))
+#if (!( defined(__PALM_OS__) || defined(__DC__) || defined(__GP32__) || defined(__amigaos4__) ) && !defined(_MSC_VER))
#include <sys/param.h>
#include <unistd.h>
#endif