aboutsummaryrefslogtreecommitdiff
path: root/devtools
diff options
context:
space:
mode:
authorVincent Bénony2016-01-11 16:33:36 +0100
committerVincent Bénony2016-01-11 16:33:36 +0100
commita6fe4d2499cdc8f7c13bce795616e2ae08bc9473 (patch)
treeb3350c235c483709b56717b1ac9b1a4b859b6637 /devtools
parent440cc502246bd52cd7b3e700110e4818caef4902 (diff)
downloadscummvm-rg350-a6fe4d2499cdc8f7c13bce795616e2ae08bc9473.tar.gz
scummvm-rg350-a6fe4d2499cdc8f7c13bce795616e2ae08bc9473.tar.bz2
scummvm-rg350-a6fe4d2499cdc8f7c13bce795616e2ae08bc9473.zip
CREATE_TOOL: Renames static libraries used for iOS target
Diffstat (limited to 'devtools')
-rw-r--r--devtools/create_project/xcode.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 8274875ec5..be7b5ffd22 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -467,14 +467,15 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
absoluteOutputDir = "lib";
#endif
- DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libFLACiOS.a", "libFLACiOS", true);
- DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libFreetype2.a", "libFreetype2", true);
+ DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libFLAC.a", "libFLAC", true);
+ DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libfreetype.a", "libfreetype", true);
DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libogg.a", "libogg", true);
DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libpng.a", "libpng", true);
DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libvorbis.a", "libvorbis", true);
DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libmad.a", "libmad", true);
DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libfluidsynth.a", "libfluidsynth", true);
- DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libglib.a", "libglib", true);
+ DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libglib.a", "libglib", true);
+ DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libffi.a", "libffi", true);
frameworksGroup->_properties["children"] = children;
_groups.add(frameworksGroup);
@@ -508,10 +509,10 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
frameworks_iOS.push_back("OpenGLES.framework");
if (CONTAINS_DEFINE(setup.defines, "USE_FLAC")) {
- frameworks_iOS.push_back("libFLACiOS.a");
+ frameworks_iOS.push_back("libFLAC.a");
}
if (CONTAINS_DEFINE(setup.defines, "USE_FREETYPE2")) {
- frameworks_iOS.push_back("libFreetype2.a");
+ frameworks_iOS.push_back("libfreetype.a");
}
if (CONTAINS_DEFINE(setup.defines, "USE_PNG")) {
frameworks_iOS.push_back("libpng.a");
@@ -525,7 +526,8 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
}
if (CONTAINS_DEFINE(setup.defines, "USE_FLUIDSYNTH")) {
frameworks_iOS.push_back("libfluidsynth.a");
- frameworks_iOS.push_back("libglib.a");
+ frameworks_iOS.push_back("libglib.a");
+ frameworks_iOS.push_back("libffi.a");
frameworks_iOS.push_back("CoreMIDI.framework");
frameworks_iOS.push_back("libiconv.tbd");
}