diff options
| author | Colin Snover | 2017-09-10 20:26:46 -0500 |
|---|---|---|
| committer | Colin Snover | 2017-09-10 22:17:14 -0500 |
| commit | 3c5440add702f404ac9b0eac25c2655b7b23b884 (patch) | |
| tree | 282d7e50f8914dd4fa2dcd04e38b26be3d725e98 /gui | |
| parent | 9db0c9c60707eb3e999dfb1408950a0b17c85105 (diff) | |
| download | scummvm-rg350-3c5440add702f404ac9b0eac25c2655b7b23b884.tar.gz scummvm-rg350-3c5440add702f404ac9b0eac25c2655b7b23b884.tar.bz2 scummvm-rg350-3c5440add702f404ac9b0eac25c2655b7b23b884.zip | |
CREATE_PROJECT: Move browser_osx.mm hack to Xcode generator
c19c10d548b2867bc4fd003fb29ac0017b2bd29d fixed the bad parsing of
module.mk which meant the Xcode generator broke. For the moment,
just move the hack for browser_osx.mm into the generator, until
there is a more elegant solution to this problem (if ever).
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/module.mk | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/gui/module.mk b/gui/module.mk index 5b32689a82..171b3aa0e9 100644 --- a/gui/module.mk +++ b/gui/module.mk @@ -37,14 +37,6 @@ MODULE_OBJS := \ widgets/scrollcontainer.o \ widgets/tab.o -# HACK: create_project's XCode generator relies on the following ifdef -# structure to pick up the right browser implementations for iOS and Mac OS X. -# Please keep it like this or XCode project generation will be broken. -# FIXME: This only works because of a bug in how we handle ifdef statements in -# create_project's module.mk parser. create_project will think that both -# browser.o and browser_osx.o is built when both IPHONE and MACOSX is set. -# When we do proper ifdef handling, only browser.o will be picked up, breaking -# XCode generation. ifdef IPHONE MODULE_OBJS += \ browser.o @@ -52,9 +44,6 @@ else ifdef MACOSX MODULE_OBJS += \ browser_osx.o -else -MODULE_OBJS += \ - browser.o endif endif |