diff options
| author | Johannes Schickel | 2016-01-07 10:38:31 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2016-01-07 10:38:31 +0100 |
| commit | bd1039b93ef3cb1541e9df91879c704aa894ddd9 (patch) | |
| tree | 06aad88a939836932c53c27681507283376ad159 /gui | |
| parent | cf5856492c6ce1820339dd76f9d3175f9f457215 (diff) | |
| parent | b5ef98637c54a453a6f0ac0ca8c501ceb59924d5 (diff) | |
| download | scummvm-rg350-bd1039b93ef3cb1541e9df91879c704aa894ddd9.tar.gz scummvm-rg350-bd1039b93ef3cb1541e9df91879c704aa894ddd9.tar.bz2 scummvm-rg350-bd1039b93ef3cb1541e9df91879c704aa894ddd9.zip | |
Merge pull request #630 from bSr43/ios-fix
IOS: Fixes the iOS port
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/credits.h | 4 | ||||
| -rw-r--r-- | gui/module.mk | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/gui/credits.h b/gui/credits.h index 72fe3fa951..b084935cbb 100644 --- a/gui/credits.h +++ b/gui/credits.h @@ -351,8 +351,10 @@ static const char *credits[] = { "C1""GPH Devices (GP2X, GP2XWiz & Caanoo)", "C0""John Willis", "", -"C1""iPhone", +"C1""iPhone / iPad", "C0""Oystein Eftevaag", +"A0""Vincent Benony", +"C0""Vincent B\351nony", "", "C1""LinuxMoto", "C0""Lubomyr Lisen", diff --git a/gui/module.mk b/gui/module.mk index e355212620..fb7c968c34 100644 --- a/gui/module.mk +++ b/gui/module.mk @@ -32,6 +32,15 @@ MODULE_OBJS := \ widgets/scrollbar.o \ widgets/tab.o +# HACK: Even if it seems redundant, please keep these directives in that order! +# This is needed by the "create_project" tool, for the OS X / iOS Xcode project. +# The main problem is that the create_project tool scans the files for both OS X, and iOS targets. +# It must be able to collect all the files for both targets, so that the backend can later filter +# them for its own targets (in the Xcode terminology) +ifdef IPHONE +MODULE_OBJS += \ + browser.o +else ifdef MACOSX MODULE_OBJS += \ browser_osx.o @@ -39,6 +48,7 @@ else MODULE_OBJS += \ browser.o endif +endif ifdef ENABLE_EVENTRECORDER MODULE_OBJS += \ |