diff options
| author | SupSuper | 2018-11-20 00:14:16 +0000 |
|---|---|---|
| committer | Thierry Crozat | 2018-12-16 10:48:13 +0000 |
| commit | 5fce1ae46400576c7d65a9ea63ff1c00952cf71c (patch) | |
| tree | 4ecce2728f2589d85b79305b45fe757d312f5b63 | |
| parent | 952b12311cfbdc48ddae0dbc7b960cd17c8e2b1e (diff) | |
| download | scummvm-rg350-5fce1ae46400576c7d65a9ea63ff1c00952cf71c.tar.gz scummvm-rg350-5fce1ae46400576c7d65a9ea63ff1c00952cf71c.tar.bz2 scummvm-rg350-5fce1ae46400576c7d65a9ea63ff1c00952cf71c.zip | |
BACKENDS: Move OSX file browser into backend
| -rw-r--r-- | backends/dialogs/macosx/macosx-dialogs.mm (renamed from gui/browser_osx.mm) | 0 | ||||
| -rw-r--r-- | backends/module.mk | 1 | ||||
| -rw-r--r-- | devtools/create_project/xcode.cpp | 13 | ||||
| -rw-r--r-- | gui/module.mk | 14 |
4 files changed, 2 insertions, 26 deletions
diff --git a/gui/browser_osx.mm b/backends/dialogs/macosx/macosx-dialogs.mm index ffb64ee96a..ffb64ee96a 100644 --- a/gui/browser_osx.mm +++ b/backends/dialogs/macosx/macosx-dialogs.mm diff --git a/backends/module.mk b/backends/module.mk index f7d6ad21dc..ad02481bfa 100644 --- a/backends/module.mk +++ b/backends/module.mk @@ -179,6 +179,7 @@ endif ifdef MACOSX MODULE_OBJS += \ audiocd/macosx/macosx-audiocd.o \ + dialogs/macosx/macosx-dialogs.o \ midi/coreaudio.o \ midi/coremidi.o \ updates/macosx/macosx-updates.o \ diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp index a04d250a3e..ed6baf6963 100644 --- a/devtools/create_project/xcode.cpp +++ b/devtools/create_project/xcode.cpp @@ -391,14 +391,6 @@ void XcodeProvider::writeFileListToProject(const FileNode &dir, std::ofstream &p // for folders, we shouldn't add folders as file references, obviously. if (node->children.empty()) { group->addChildFile(node->name); - - // HACK: Also add browser_osx.mm, since browser.cpp is added for - // iOS and browser_osx.mm for macOS, and create_project cannot - // deal with two competing exclusive ifdefs in module.mk going - // into one project - if (filePrefix.find("/gui/") == filePrefix.size() - 5 && node->name == "browser.cpp") { - group->addChildFile("browser_osx.mm"); - } } // Process child nodes if (!node->children.empty()) @@ -1121,11 +1113,6 @@ void XcodeProvider::setupAdditionalSources(std::string targetName, Property &fil if (targetIsIOS(targetName)) { const std::string absoluteCatalogPath = _projectRoot + "/dists/ios7/Images.xcassets"; ADD_SETTING_ORDER_NOVALUE(files, getHash(absoluteCatalogPath), "Image Asset Catalog", order++); - } else { - // HACK: browser_osx.mm needs to be added - const std::string browserPath = "gui/browser_osx.mm"; - const std::string comment = "browser_osx.mm in Sources"; - ADD_SETTING_ORDER_NOVALUE(files, getHash(browserPath), comment, order++); } } diff --git a/gui/module.mk b/gui/module.mk index 0218e082b4..87f8dec3b2 100644 --- a/gui/module.mk +++ b/gui/module.mk @@ -2,6 +2,7 @@ MODULE := gui MODULE_OBJS := \ about.o \ + browser.o \ chooser.o \ console.o \ debugger.o \ @@ -38,19 +39,6 @@ MODULE_OBJS := \ widgets/scrollcontainer.o \ widgets/tab.o -ifdef IPHONE -MODULE_OBJS += \ - browser.o -else -ifdef MACOSX -MODULE_OBJS += \ - browser_osx.o -else -MODULE_OBJS += \ - browser.o -endif -endif - ifdef USE_CLOUD ifdef USE_LIBCURL MODULE_OBJS += \ |