diff options
| author | Thierry Crozat | 2017-10-11 22:59:47 +0100 |
|---|---|---|
| committer | Thierry Crozat | 2017-10-12 18:59:53 +0100 |
| commit | 0fde977ad26b7f19b10073c0100f396483c53c5e (patch) | |
| tree | fd8b0257481619ec2fd5e2690485f53b62a56e30 /devtools | |
| parent | 3e195361db1dde52e0fc61dca3cc0d134360f354 (diff) | |
| download | scummvm-rg350-0fde977ad26b7f19b10073c0100f396483c53c5e.tar.gz scummvm-rg350-0fde977ad26b7f19b10073c0100f396483c53c5e.tar.bz2 scummvm-rg350-0fde977ad26b7f19b10073c0100f396483c53c5e.zip | |
CREATE_PROJECT: Fix some compilation issues for iOS
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.
Diffstat (limited to 'devtools')
| -rw-r--r-- | devtools/create_project/xcode.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp index da4e69860f..dcf75c5895 100644 --- a/devtools/create_project/xcode.cpp +++ b/devtools/create_project/xcode.cpp @@ -467,6 +467,7 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) { } if (CONTAINS_DEFINE(setup.defines, "USE_FLUIDSYNTH")) { DEF_LOCALLIB_STATIC("libfluidsynth"); + DEF_LOCALLIB_STATIC("libffi"); DEF_LOCALLIB_STATIC("libglib-2.0"); DEF_SYSTBD("libffi"); } @@ -505,16 +506,6 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) { 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; _groups.add(frameworksGroup); // 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")) { frameworks_iOS.push_back("libfluidsynth.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("libiconv.tbd"); } |