Skip to content

Commit

Permalink
CREATE_PROJECT: Fix some compilation issues for iOS
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
criezy committed Oct 12, 2017
1 parent 3e19536 commit 0fde977
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions devtools/create_project/xcode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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");
}
Expand Down

0 comments on commit 0fde977

Please sign in to comment.