[Scummvm-cvs-logs] scummvm master -> a6fe4d2499cdc8f7c13bce795616e2ae08bc9473

[bSr43]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a6fe4d2499 CREATE_TOOL: Renames static libraries used for iOS target


Commit: a6fe4d2499cdc8f7c13bce795616e2ae08bc9473
    https://github.com/scummvm/scummvm/commit/a6fe4d2499cdc8f7c13bce795616e2ae08bc9473
Author: Vincent Bénony (bsr43 at hopperapp.com)
Date: 2016-01-11T16:33:36+01:00

Commit Message:
CREATE_TOOL: Renames static libraries used for iOS target

Changed paths:
    devtools/create_project/xcode.cpp



diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 8274875..be7b5ff 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");
 	}