From 646909eec0bf3e19360fad3e517d1f8b5d2e6fd0 Mon Sep 17 00:00:00 2001 From: Dan Rosser Date: Tue, 4 Mar 2025 13:37:44 +1100 Subject: [PATCH 1/5] GREMLINS! (cherry picked from commit e4412d562965c314e31d4dd21694096920580623) --- commandLine/src/projects/xcodeProject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commandLine/src/projects/xcodeProject.cpp b/commandLine/src/projects/xcodeProject.cpp index 34aa69b0..f51fefc4 100644 --- a/commandLine/src/projects/xcodeProject.cpp +++ b/commandLine/src/projects/xcodeProject.cpp @@ -696,7 +696,7 @@ void xcodeProject::addAddonFrameworks(const ofAddon& addon){ allFrameworks.reserve( addon.frameworks.size() + addon.xcframeworks.size() ); allFrameworks.insert( allFrameworks.end(), addon.frameworks.begin(), addon.frameworks.end() ); -// allFrameworks.insert( allFrameworks.end(), addon.xcframeworks.begin(), addon.xcframeworks.end() ); + allFrameworks.insert( allFrameworks.end(), addon.xcframeworks.begin(), addon.xcframeworks.end() ); for (auto & f : allFrameworks) { // for (auto & f : addon.frameworks) { From 49405daccd45866d3686f23336d7fcc45a09d6c1 Mon Sep 17 00:00:00 2001 From: Dan Rosser Date: Tue, 4 Mar 2025 13:51:08 +1100 Subject: [PATCH 2/5] fix mm -x (cherry picked from commit c3611ddd3fa64b1f5a3e8d66d4938f963743e964) --- commandLine/src/projects/xcodeProject.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/commandLine/src/projects/xcodeProject.cpp b/commandLine/src/projects/xcodeProject.cpp index f51fefc4..22ba3eca 100644 --- a/commandLine/src/projects/xcodeProject.cpp +++ b/commandLine/src/projects/xcodeProject.cpp @@ -453,7 +453,7 @@ if( type == DEFAULT ){ else if (ext == ".swift"){ fp.addToBuildPhase = true; for (auto &c : buildConfigs) { - addCommand("Add :objects:" + c + ":buildSettings:OTHER_SWIFT_FLAGS: string -cxx-interoperability-mode=swift-5.9"); + addCommand("Add :objects:" + c + ":buildSettings:OTHER_SWIFT_FLAGS: string " + "-cxx-interoperability-mode=swift-5.9"); // mark all Swift files as C++ interop available :) } } @@ -506,10 +506,10 @@ void xcodeProject::addCompileFlagsForMMFile(const fs::path & srcFile) { // Tag file as Objective-C++ in Xcode build settings for (auto & c : buildConfigs) { - addCommand("Add :objects:" + c + ":buildSettings:OTHER_CPLUSPLUSFLAGS: string -x objective-c++"); +// addCommand("Add :objects:" + c + ":buildSettings:OTHER_CPLUSPLUSFLAGS: string " + "-xobjective-c++"); if (requiresNoARC) { - addCommand("Add :objects:" + c + ":buildSettings:OTHER_CPLUSPLUSFLAGS: string -fno-objc-arc"); + addCommand("Add :objects:" + c + ":buildSettings:OTHER_CPLUSPLUSFLAGS: string " + "-fno-objc-arc"); } } From 1ce90af354eadfed12739acad2e659434c777b6c Mon Sep 17 00:00:00 2001 From: Dan Rosser Date: Tue, 4 Mar 2025 13:58:40 +1100 Subject: [PATCH 3/5] version++ --- commandLine/src/defines.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commandLine/src/defines.h b/commandLine/src/defines.h index a78714b2..11413c0c 100644 --- a/commandLine/src/defines.h +++ b/commandLine/src/defines.h @@ -1,5 +1,5 @@ #define OFPROJECTGENERATOR_MAJOR_VERSION "0" -#define OFPROJECTGENERATOR_MINOR_VERSION "89" +#define OFPROJECTGENERATOR_MINOR_VERSION "90" #define OFPROJECTGENERATOR_PATCH_VERSION "0" #define PG_VERSION (OFPROJECTGENERATOR_MAJOR_VERSION "." OFPROJECTGENERATOR_MINOR_VERSION "." OFPROJECTGENERATOR_PATCH_VERSION) From bff3c1c92106c79f37d608491a492da42a9857a7 Mon Sep 17 00:00:00 2001 From: Dan Rosser Date: Tue, 4 Mar 2025 14:01:53 +1100 Subject: [PATCH 4/5] remove flags for code rather than uniquie file --- commandLine/src/projects/xcodeProject.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/commandLine/src/projects/xcodeProject.cpp b/commandLine/src/projects/xcodeProject.cpp index 22ba3eca..e37d8c53 100644 --- a/commandLine/src/projects/xcodeProject.cpp +++ b/commandLine/src/projects/xcodeProject.cpp @@ -508,9 +508,9 @@ void xcodeProject::addCompileFlagsForMMFile(const fs::path & srcFile) { for (auto & c : buildConfigs) { // addCommand("Add :objects:" + c + ":buildSettings:OTHER_CPLUSPLUSFLAGS: string " + "-xobjective-c++"); - if (requiresNoARC) { - addCommand("Add :objects:" + c + ":buildSettings:OTHER_CPLUSPLUSFLAGS: string " + "-fno-objc-arc"); - } +// if (requiresNoARC) { +// addCommand("Add :objects:" + c + ":buildSettings:OTHER_CPLUSPLUSFLAGS: string " + "-fno-objc-arc"); +// } } } From d52f3da11ed9a943547d70d1fd28852e70cb8df3 Mon Sep 17 00:00:00 2001 From: Dan Rosser Date: Tue, 4 Mar 2025 14:54:01 +1100 Subject: [PATCH 5/5] Release --- commandLine/commandLine.xcodeproj/project.pbxproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/commandLine/commandLine.xcodeproj/project.pbxproj b/commandLine/commandLine.xcodeproj/project.pbxproj index 7822ac2b..fdcf0285 100644 --- a/commandLine/commandLine.xcodeproj/project.pbxproj +++ b/commandLine/commandLine.xcodeproj/project.pbxproj @@ -297,6 +297,8 @@ isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 2147483647; + files = ( + ); name = "Run Script"; runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -491,7 +493,7 @@ OTHER_LDFLAGS = ( "$(OF_CORE_LIBS)", "$(OF_CORE_FRAMEWORKS)", - "$(LIB_OF)", + "$(LIB_OF_RELEASE)", ); PROVISIONING_PROFILE_SPECIFIER = ""; baseConfigurationReference = E4EB6923138AFD0F00A09F29;