From e17b782dffb7bdc3f2a470dda2649c6938b07a74 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 7 Jun 2024 14:27:59 -0300 Subject: [PATCH 1/4] up --- commandLine/src/projects/xcodeProject.cpp | 2 +- commandLine/src/projects/xcodeProject.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/commandLine/src/projects/xcodeProject.cpp b/commandLine/src/projects/xcodeProject.cpp index 572e393e..abc20dcf 100644 --- a/commandLine/src/projects/xcodeProject.cpp +++ b/commandLine/src/projects/xcodeProject.cpp @@ -784,7 +784,7 @@ bool xcodeProject::saveProjectFile(){ // debugCommands = true; addCommand("# ---- PG VERSION " + getPGVersion()); - addCommand("Add :_openFrameworksProjectGeneratorVersion string " + getPGVersion()); + addCommand("Add :a_OFProjectGeneratorVersion string " + getPGVersion()); fileProperties fp; // fp.isGroupWithoutFolder = true; diff --git a/commandLine/src/projects/xcodeProject.h b/commandLine/src/projects/xcodeProject.h index 38c27441..31773bb1 100644 --- a/commandLine/src/projects/xcodeProject.h +++ b/commandLine/src/projects/xcodeProject.h @@ -98,6 +98,7 @@ class xcodeProject : public baseProject { std::map extensionToFileType { { ".framework" , "wrapper.framework" }, + { ".xcframework" , "wrapper.framework" }, { ".dylib" , "compiled.mach-o.dylib" }, { ".cpp" , "sourcecode.cpp.cpp" }, From 7a81c642ce3c16bd30c7653a8eec22481514a74e Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 7 Jun 2024 14:30:04 -0300 Subject: [PATCH 2/4] up --- commandLine/src/projects/xcodeProject.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/commandLine/src/projects/xcodeProject.cpp b/commandLine/src/projects/xcodeProject.cpp index abc20dcf..a6d0ac0f 100644 --- a/commandLine/src/projects/xcodeProject.cpp +++ b/commandLine/src/projects/xcodeProject.cpp @@ -719,7 +719,8 @@ string xcodeProject::addFile(const fs::path & path, const fs::path & folder, con } if (fp.copyFilesBuildPhase) { - if (path.extension() == ".framework") { + // If we are going to add xcframeworks to copy files -> destination frameworks, we should include here + if (path.extension() == ".framework" || path.extension() == ".xcframework") { // copy to frameworks addCommand("# ---- copyPhase Frameworks " + buildUUID); addCommand("Add :objects:E4C2427710CC5ABF004149E2:files: string " + buildUUID); From dc9c2e5a864cb20ff15c78cb50bf0d6e6b7f1a78 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 7 Jun 2024 14:39:48 -0300 Subject: [PATCH 3/4] dan comments --- commandLine/src/projects/xcodeProject.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/commandLine/src/projects/xcodeProject.cpp b/commandLine/src/projects/xcodeProject.cpp index a6d0ac0f..9c4d6108 100644 --- a/commandLine/src/projects/xcodeProject.cpp +++ b/commandLine/src/projects/xcodeProject.cpp @@ -418,6 +418,7 @@ void xcodeProject::addXCFramework(const fs::path & path, const fs::path & folder addCommand("# ----- addXCFramework path=" + ofPathToString(path) + " folder=" + ofPathToString(folder)); + // FIXME: Hey Dan I've noticed this has the inverted logic of isSystemFramework in the function addFramework bool isSystemFramework = false; if (!folder.empty() && !ofIsStringInString(ofPathToString(path), "/System/Library/Frameworks") && target != "ios"){ @@ -438,6 +439,7 @@ void xcodeProject::addXCFramework(const fs::path & path, const fs::path & folder string parent { ofPathToString(path.parent_path()) }; for (auto & c : buildConfigs) { + // FIXME: Dan Maybe there is a typo here in XFRAMEWORK addCommand("Add :objects:" + c + ":buildSettings:XFRAMEWORK_SEARCH_PATHS: string " + parent); } } @@ -720,7 +722,9 @@ string xcodeProject::addFile(const fs::path & path, const fs::path & folder, con if (fp.copyFilesBuildPhase) { // If we are going to add xcframeworks to copy files -> destination frameworks, we should include here - if (path.extension() == ".framework" || path.extension() == ".xcframework") { +// if (path.extension() == ".framework" || path.extension() == ".xcframework") { + // This now includes both .framework and .xcframework + if (fileType == "wrapper.framework") { // copy to frameworks addCommand("# ---- copyPhase Frameworks " + buildUUID); addCommand("Add :objects:E4C2427710CC5ABF004149E2:files: string " + buildUUID); From d3e8a52327dcb820ed283a7b043f49967a7c4d32 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 7 Jun 2024 17:15:23 -0300 Subject: [PATCH 4/4] v bump --- commandLine/src/projects/baseProject.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commandLine/src/projects/baseProject.h b/commandLine/src/projects/baseProject.h index 6022ede4..97630e25 100644 --- a/commandLine/src/projects/baseProject.h +++ b/commandLine/src/projects/baseProject.h @@ -1,6 +1,6 @@ #pragma once -#define PG_VERSION "45" +#define PG_VERSION "46" #include "ofAddon.h" #include "pugixml.hpp"