thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BACKENDS: Move OSX file browser into backend

Browse source
This commit is contained in:
SupSuper 2018-11-20 00:14:16 +00:00 • committed by Thierry Crozat
parent 952b12311c
commit 5fce1ae464
4 changed files with 2 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

0
gui/browser_osx.mm → backends/dialogs/macosx/macosx-dialogs.mm
View file

1
backends/module.mk
View file

@ -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 \

13
devtools/create_project/xcode.cpp
View file

@ -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++);
}
}

14
gui/module.mk
View file

@ -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 += \