Merge pull request #592 from roymacdonald/vscodefix

properly fixing vscode project. plus some extra comments.
openframeworks · Nov 16, 2024 · 4d5b2a7 · 4d5b2a7
2 parents 2e354a7 + 9092742
commit 4d5b2a7
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 26 deletions.
diff --git a/commandLine/src/projects/VSCodeProject.cpp b/commandLine/src/projects/VSCodeProject.cpp
@@ -131,9 +131,8 @@ bool VSCodeProject::loadProjectFile(){
 	cppProperties.load();
 	return true;
 }
-
-
-void VSCodeProject::addAddon(ofAddon & addon) {
+
+void VSCodeProject::addAddonBegin(const ofAddon& addon) {
 //	alert("VSCodeProject::addAddon() " + addon.name, 35);
 
 	workspace.addPath(addon.addonPath);

diff --git a/commandLine/src/projects/VSCodeProject.h b/commandLine/src/projects/VSCodeProject.h
@@ -28,7 +28,7 @@ class VSCodeProject: public baseProject {
     void addDefine(const std::string& define, LibType libType = RELEASE_LIB) override {}
 
 
-	void addAddon(ofAddon & addon) override;
+    void addAddonBegin(const ofAddon& addon) override;
 
 	static std::string LOG_NAME;
 

diff --git a/commandLine/src/projects/android2024.h b/commandLine/src/projects/android2024.h
@@ -17,7 +17,7 @@ class android2024Project : public baseProject {
     void addDefine(const std::string& define, LibType libType = RELEASE_LIB) override {}
 
 
-
+    //TODO: not sure if the following function should return false. as it will stop the further execution in  baseProject::create and make it to return as it had failed.
 	bool loadProjectFile() override { return false; };
     bool saveProjectFile() override { return false; };
 	static std::string LOG_NAME;

diff --git a/commandLine/src/projects/androidStudioProject.h b/commandLine/src/projects/androidStudioProject.h
@@ -16,7 +16,7 @@ class AndroidStudioProject : public baseProject {
     void addAfterRule(const std::string& script) override {}
     void addDefine(const std::string& define, LibType libType = RELEASE_LIB) override {}
 
-
+    //TODO: not sure if the following function should return false. as it will stop the further execution in  baseProject::create and make it to return as it had failed.
 	bool loadProjectFile() override { return false; };
 	bool saveProjectFile() override { return false; };
 	static std::string LOG_NAME;

diff --git a/commandLine/src/projects/baseProject.cpp b/commandLine/src/projects/baseProject.cpp
@@ -517,8 +517,6 @@ void baseProject::addAddonDllsToCopy(ofAddon& addon){
 }
 
 
-// MARK: - This function is only called by addon dependencies, when one addon is asking for another one to be included.
-// this is only invoked by XCode and visualStudioProject, and I don't understand why as they are similar
 void baseProject::addAddon(ofAddon & addon){
 //	alert("baseProject::addAddon ofAddon & addon :: " + addon.name);
 

diff --git a/commandLine/src/projects/baseProject.h b/commandLine/src/projects/baseProject.h
@@ -70,7 +70,7 @@ class baseProject {
 
 
     void addAddon(const std::string& addon);
-	virtual void addAddon(ofAddon & addon);
+    void addAddon(ofAddon & addon);
 	virtual void addSrcRecursively(const fs::path & srcPath);
 
 	virtual void restoreBackup(const fs::path & srcPath){};

diff --git a/commandLine/src/projects/qtcreatorproject.cpp b/commandLine/src/projects/qtcreatorproject.cpp
@@ -144,10 +144,10 @@ bool QtCreatorProject::saveProjectFile(){
 }
 
 
-void QtCreatorProject::addAddon(ofAddon & addon){
-	// FIXME: I think this is unneded since this function here is triggered by baseclass::addAddon(string) which already checked if exists.
-//	for (auto & a : addons) {
-//		if (a.name == addon.name) return;
-//	}
-	addons.emplace_back(addon);
-}
+//void QtCreatorProject::addAddon(ofAddon & addon){
+//	// FIXME: I think this is unneded since this function here is triggered by baseclass::addAddon(string) which already checked if exists.
+////	for (auto & a : addons) {
+////		if (a.name == addon.name) return;
+////	}
+//	addons.emplace_back(addon);
+//}
diff --git a/commandLine/src/projects/qtcreatorproject.h b/commandLine/src/projects/qtcreatorproject.h
@@ -19,7 +19,6 @@ class QtCreatorProject : public baseProject {
     void addAfterRule(const std::string& script) override {}
     void addDefine(const std::string& define, LibType libType = RELEASE_LIB) override {}
 
-	void addAddon(ofAddon & addon) override;
 
 	bool loadProjectFile() override;
 	bool saveProjectFile() override;

diff --git a/commandLine/src/projects/xcodeProject.cpp b/commandLine/src/projects/xcodeProject.cpp
@@ -602,15 +602,7 @@ void xcodeProject::addAfterRule(const string& rule){
 	addCommand("Add :objects:"+buildConfigurationListUUID+":buildPhases: string " + afterPhaseUUID);
 }
 
-// void xcodeProject::addAddon(ofAddon & addon){
-    // 
-	//	alert("xcodeProject addAddon string :: " + addon.name, 31);
 
-	// Files listed alphabetically on XCode navigator.
-
-	// std::sort(addon.srcFiles.begin(), addon.srcFiles.end(), [](const fs::path & a, const fs::path & b) {
-	// 	return a.string() < b.string();
-	// });
 void xcodeProject::addAddonLibs(const ofAddon& addon){
     for (auto & e : addon.libs) {
         ofLogVerbose() << "adding addon libs: " << e.path;

diff --git a/commandLine/src/projects/xcodeProject.h b/commandLine/src/projects/xcodeProject.h
@@ -55,7 +55,6 @@ class xcodeProject : public baseProject {
 	void addXCFramework(const fs::path & path, const fs::path & folder);
 	void addDylib(const fs::path & path, const fs::path & folder);
 
-//	void addAddon(ofAddon & addon);
 	void saveScheme();
 	void renameProject();