Xcode fixes for copy/add for known and used types. (.modulemap. .bundle, .tdb, .swift, .plist)

Swift added set flagged  with c++ swift interop 5.9 (C++ can be used)
Added auto compile flags for non-arc terms (search for non-arc commands in .mm.cpp.m)
Added auto objective-c++ flag for .cpp if obj-c commands
Added function for checking file for objc++
VS fixed up exclusions for Apple types for projects / cross
xcode kept default type for addSrc flag to disable add phases - test

Author: danoli3

commandLine/src/projects/visualStudioProject.cpp

@@ -260,8 +260,27 @@ void visualStudioProject::addSrc(const fs::path & srcFile, const fs::path & fold
 			nodeAdded.append_attribute("Include").set_value(srcFile.c_str());
 			nodeAdded.append_child("Filter").append_child(pugi::node_pcdata).set_value(folder.c_str());*/
 
-		} else if (ext == ".storyboard" || ext == ".mm" || ext == ".m" || ext == ".swift" || ext == ".java" || ext == ".kotlin") {
+		} else if (ext == ".java" || ext == ".kotlin") {
 			// Do not add files for other platforms
+		} else if (
+			ext == ".storyboard" ||   // Xcode Interface Builder files
+			ext == ".xib" ||          // Xcode Interface Builder files
+			ext == ".xcassets" ||     // Xcode Asset catalogs
+			ext == ".xcconfig" ||     // Xcode build configuration files
+			ext == ".entitlements" || // Code signing entitlements (Apple-specific)
+			ext == ".plist" ||        // Property List files (Info.plist, macOS/iOS config)
+			ext == ".mm" ||           // Objective-C++
+			ext == ".m" ||            // Objective-C
+			ext == ".swift" ||        // Swift language files
+			ext == ".modulemap" ||    // Clang module definition (Xcode/Clang-specific)
+			ext == ".metal" ||        // Metal Shading Language (Apple GPU API)
+			ext == ".tbd" ||          // Text-based dynamic libraries (Apple SDKs)
+			ext == ".dylib" ||        // Dynamic libraries (macOS/iOS equivalent of .dll)
+			ext == ".framework" ||
+			ext == ".bundle" ||
+			ext == ".app" ||
+			ext == ".xcworkspace" ||
+			ext == ".xcodeproj") {
 		} else{
 			appendValue(doc, "ClCompile", "Include", srcFileString);
 

commandLine/src/projects/xcodeProject.cpp

@@ -420,11 +420,7 @@ void xcodeProject::addSrc(const fs::path & srcFile, const fs::path & folder, Src
 	fp.addToBuildPhase = true;
 	fp.isSrc = true;
 
-//	if( type == DEFAULT ){
-	if( target == "ios" ){
-		fp.addToBuildPhase	= true;
-		fp.addToResources = true;
-	}
+if( type == DEFAULT ){
 
 	if (ext == ".h" || ext == ".hpp"){
 		fp.addToBuildPhase = false;
@@ -450,44 +446,93 @@ void xcodeProject::addSrc(const fs::path & srcFile, const fs::path & folder, Src
 		fp.addToBuildPhase	= false;
 		fp.copyBundleResources = true;
 	}
+	else if( ext == ".plist" ){
+		fp.addToBuildPhase	= true;
+		fp.copyBundleResources = true;
+	}
+	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");
+			// mark all Swift files as C++ interop available :)
+		}
+	}
+	else if (ext == ".xcassets"){
+		fp.addToBuildResource = true;
+		fp.addToResources = true;
+	}
+	else if (ext == ".modulemap") {
+		fp.addToBuildPhase = false;
+	}
+	else if (ext == ".bundle") {
+		fp.addToBuildResource = true;
+		fp.addToResources = true;
+	}
+	else if (ext == ".tbd") {
+		fp.linkBinaryWithLibraries = true;
+	}
 
 
-	//	}
-
-
+}
 	string UUID {
 		addFile(srcFile, folder, fp)
 	};
 
 	if (ext == ".mm" || ext == ".m") {
 		addCompileFlagsForMMFile(srcFile);
+	} else if (ext == ".cpp") {
+		if (containsObjectiveCPlusPlus(srcFile)) {
+			addCompileFlagsForMMFile(srcFile);
+		}
 	}
 }
 
 void xcodeProject::addCompileFlagsForMMFile(const fs::path & srcFile) {
 
-	// This requires a moro thorough inspection on how to deal with these files, and determine if these need the -fno-objc-arc flag.
-	// This flag should be added on a file by file basis, rather than the way it is done below where these are added globally, as such messes up other things.
+	std::ifstream file(srcFile);
+	if (!file.is_open()) return;
 
-//	std::ifstream file(srcFile);
-//	std::string line;
-//	bool containsARCFunctions = false;
-//#if __APPLE__
-//	std::regex arcRegex(R"(\b(alloc|dealloc)\b)");
-//
-//	while (std::getline(file, line)) {
-//		if (std::regex_search(line, arcRegex)) {
-//			containsARCFunctions = true;
-//			break;
-//		}
-//	}
-//#endif
-//	if (containsARCFunctions) {
-//		for (auto & c : buildConfigs) {
-//			addCommand("Add :objects:"+c+":buildSettings:OTHER_CPLUSPLUSFLAGS: string -fno-objc-arc");
-//		}
-//	}
+		bool requiresNoARC = false;
+
+		// Named regex for detecting ARC-related function calls in Objective-C++
+		const std::regex arcFunctionRegex(R"(\b(alloc|dealloc|retain|release|autorelease)\b)");
+
+		for (std::string line; std::getline(file, line); ) {
+			if (std::regex_search(line, arcFunctionRegex)) {
+				requiresNoARC = true;
+				break;
+			}
+		}
+
+		// Tag file as Objective-C++ in Xcode build settings
+		for (auto & c : buildConfigs) {
+			addCommand("Add :objects:" + c + ":buildSettings:OTHER_CPLUSPLUSFLAGS: string -x objective-c++");
+			
+			if (requiresNoARC) {
+				addCommand("Add :objects:" + c + ":buildSettings:OTHER_CPLUSPLUSFLAGS: string -fno-objc-arc");
+			}
+		}
+
+}
+
+bool xcodeProject::containsObjectiveCPlusPlus(const fs::path &filePath) {
+	std::ifstream file(filePath);
+	if (!file.is_open()) return false;
 
+	// Objective-C++ specific keywords to check -- this will fix the really hard to debug objc++ linking obiguous
+	std::vector<std::string> objcKeywords = {
+		"#import", "@interface", "@implementation", "@property",
+		"@synthesize", "@end"
+	};
+
+	for (std::string line; std::getline(file, line); ) {
+		for (const auto &keyword : objcKeywords) {
+			if (line.find(keyword) != std::string::npos) {
+				return true;
+			}
+		}
+	}
+	return false;
 }
 
 

commandLine/src/projects/xcodeProject.h

@@ -3,6 +3,10 @@
 #include "baseProject.h"
 //#include <unordered_map>
 #include <map>
+#include <fstream>
+#include <string>
+#include <vector>
+#include <regex>
 using std::string;
 
 class xcodeProject : public baseProject {
@@ -53,6 +57,8 @@ class xcodeProject : public baseProject {
 	void addFramework(const fs::path & path, const fs::path & folder, bool isRelativeToSDK = false) override;
 	void addXCFramework(const fs::path & path, const fs::path & folder);
 	void addDylib(const fs::path & path, const fs::path & folder);
+	
+	bool containsObjectiveCPlusPlus(const fs::path &filePath);
 
 	void saveScheme();
 	void renameProject();