Fix PG macOS (#609)

* GREMLINS!

(cherry picked from commit e4412d5)

* fix mm -x

(cherry picked from commit c3611dd)

* version++

* remove flags for code rather than uniquie file

* Release

Author: danoli3

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;

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)

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,11 +506,11 @@ 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");
-			}
+//			if (requiresNoARC) {
+//				addCommand("Add :objects:" + c + ":buildSettings:OTHER_CPLUSPLUSFLAGS: string " + "-fno-objc-arc");
+//			}
 		}
 
 }
@@ -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) {