[Scummvm-git-logs] scummvm master -> f0fd0869481505ee0bec5a45ff3b99f1bb43b1a4

[SupSuper]

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:
f0fd086948 CREATE_PROJECT: Fix enabling fluidlite


Commit: f0fd0869481505ee0bec5a45ff3b99f1bb43b1a4
    https://github.com/scummvm/scummvm/commit/f0fd0869481505ee0bec5a45ff3b99f1bb43b1a4
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-07-24T22:02:38+01:00

Commit Message:
CREATE_PROJECT: Fix enabling fluidlite

Changed paths:
    devtools/create_project/create_project.cpp
    devtools/create_project/xcode.cpp


diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 00d4c0b544..179c7a55fe 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -411,6 +411,8 @@ int main(int argc, char *argv[]) {
 				setup.defines.push_back("USE_SPARKLE");
 			else if (backendWin32 && !strcmp(i->name, "libcurl"))
 				setup.defines.push_back("CURL_STATICLIB");
+			else if (!strcmp(i->name, "fluidlite"))
+				setup.defines.push_back("USE_FLUIDSYNTH");
 		}
 	}
 
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index dc237ad679..cf7784bb2f 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -459,15 +459,14 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
 	if (CONTAINS_DEFINE(setup.defines, "USE_FLAC")) {
 		DEF_LOCALLIB_STATIC("libFLAC");
 	}
-	if (CONTAINS_DEFINE(setup.defines, "USE_FLUIDSYNTH")) {
+	if (CONTAINS_DEFINE(setup.defines, "USE_FLUIDLITE")) {
+		DEF_LOCALLIB_STATIC("libfluidlite");
+	} else if (CONTAINS_DEFINE(setup.defines, "USE_FLUIDSYNTH")) {
 		DEF_LOCALLIB_STATIC("libfluidsynth");
 		DEF_LOCALLIB_STATIC("libffi");
 		DEF_LOCALLIB_STATIC("libglib-2.0");
 		DEF_SYSTBD("libffi");
 	}
-	if (CONTAINS_DEFINE(setup.defines, "USE_FLUIDLITE")) {
-		DEF_LOCALLIB_STATIC("libfluidlite");
-	}
 	if (CONTAINS_DEFINE(setup.defines, "USE_FREETYPE2")) {
 		DEF_LOCALLIB_STATIC("libfreetype");
 	}
@@ -601,7 +600,8 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
 	if (CONTAINS_DEFINE(setup.defines, "USE_FRIBIDI")) {
 		frameworks_iOS.push_back("libfribidi.a");
 	}
-	if (CONTAINS_DEFINE(setup.defines, "USE_FLUIDSYNTH")) {
+	if (CONTAINS_DEFINE(setup.defines, "USE_FLUIDSYNTH") &&
+		!CONTAINS_DEFINE(setup.defines, "USE_FLUIDLITE")) {
 		frameworks_iOS.push_back("libfluidsynth.a");
 		frameworks_iOS.push_back("libglib-2.0.a");
 		frameworks_iOS.push_back("libffi.a");
@@ -667,7 +667,8 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
 	if (CONTAINS_DEFINE(setup.defines, "USE_FLAC")) {
 		frameworks_osx.push_back("libFLAC.a");
 	}
-	if (CONTAINS_DEFINE(setup.defines, "USE_FLUIDSYNTH")) {
+	if (CONTAINS_DEFINE(setup.defines, "USE_FLUIDSYNTH") &&
+		!CONTAINS_DEFINE(setup.defines, "USE_FLUIDLITE")) {
 		frameworks_osx.push_back("libfluidsynth.a");
 		frameworks_osx.push_back("libglib-2.0.a");
 		frameworks_osx.push_back("libffi.tbd");