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

CREATE_PROJECT: Fix some compilation issues for iOS

Browse source 
Note that this still doesn't compile with the library package provided
by bSr43 because this package is missing libvorbisfile.a and has a
non standard name for libglib-2.0.a. But it would probably be better
to fix the package than maintain non-standard packages.
This commit is contained in:
Thierry Crozat 2017-10-11 22:59:47 +01:00
parent 3e195361db
commit 0fde977ad2
1 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
devtools/create_project/xcode.cpp
View file

@ -467,6 +467,7 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
} }
if (CONTAINS_DEFINE(setup.defines, "USE_FLUIDSYNTH")) { if (CONTAINS_DEFINE(setup.defines, "USE_FLUIDSYNTH")) {
DEF_LOCALLIB_STATIC("libfluidsynth"); DEF_LOCALLIB_STATIC("libfluidsynth");
DEF_LOCALLIB_STATIC("libffi");
DEF_LOCALLIB_STATIC("libglib-2.0"); DEF_LOCALLIB_STATIC("libglib-2.0");
DEF_SYSTBD("libffi"); DEF_SYSTBD("libffi");
} }
@ -505,16 +506,6 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
DEF_LOCALLIB_STATIC("libSDL"); DEF_LOCALLIB_STATIC("libSDL");
} }
std::string absoluteOutputDir;
#ifdef POSIX
char *c_path = realpath(setup.outputDir.c_str(), NULL);
absoluteOutputDir = c_path;
absoluteOutputDir += "/lib";
free(c_path);
#else
absoluteOutputDir = "lib";
#endif
frameworksGroup->_properties["children"] = children; frameworksGroup->_properties["children"] = children;
_groups.add(frameworksGroup); _groups.add(frameworksGroup);
// Force this to be added as a sub-group in the root. // Force this to be added as a sub-group in the root.
@ -569,7 +560,7 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
if (CONTAINS_DEFINE(setup.defines, "USE_FLUIDSYNTH")) { if (CONTAINS_DEFINE(setup.defines, "USE_FLUIDSYNTH")) {
frameworks_iOS.push_back("libfluidsynth.a"); frameworks_iOS.push_back("libfluidsynth.a");
frameworks_iOS.push_back("libglib-2.0.a"); frameworks_iOS.push_back("libglib-2.0.a");
frameworks_iOS.push_back("libffi.tbd"); frameworks_iOS.push_back("libffi.a");
frameworks_iOS.push_back("CoreMIDI.framework"); frameworks_iOS.push_back("CoreMIDI.framework");
frameworks_iOS.push_back("libiconv.tbd"); frameworks_iOS.push_back("libiconv.tbd");
} }