removed ADDON_PREPROCESSOR_DEFINES and use ADDON_DEFINES instead

openframeworks · Aug 29, 2019 · 3ff92b5 · 3ff92b5
1 parent b1ef172
commit 3ff92b5
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 32 deletions.
diff --git a/ofxProjectGenerator/src/addons/ofAddon.cpp b/ofxProjectGenerator/src/addons/ofAddon.cpp
@@ -140,7 +140,7 @@ bool ofAddon::checkCorrectVariable(string variable, ConfigParseState state){
 				variable == "ADDON_DATA" ||
 				variable == "ADDON_LIBS_EXCLUDE" || variable == "ADDON_SOURCES_EXCLUDE" || variable == "ADDON_INCLUDES_EXCLUDE" ||
 				variable == "ADDON_DLLS_TO_COPY" ||
-				variable == "ADDON_DEFINES" || variable == "ADDON_PREPROCESSOR_DEFINITIONS");
+				variable == "ADDON_DEFINES");
 	case Unknown:
 	default:
 		return false;

diff --git a/ofxProjectGenerator/src/projects/visualStudioProject.cpp b/ofxProjectGenerator/src/projects/visualStudioProject.cpp
@@ -367,31 +367,6 @@ void visualStudioProject::addDefine(std::string define, LibType libType)
 {
 	pugi::xpath_node_set items = doc.select_nodes("//ItemDefinitionGroup");
 	for (int i = 0; i<items.size(); i++) {
-		pugi::xml_node additionalOptions;
-		bool found = false;
-		std::string condition(items[i].node().attribute("Condition").value());
-		if (libType == RELEASE_LIB && condition.find("Debug") != std::string::npos) {
-			additionalOptions = items[i].node().child("ClCompile").child("AdditionalOptions");
-			found = true;
-		}
-		else if (libType == DEBUG_LIB && condition.find("Release") != std::string::npos) {
-			additionalOptions = items[i].node().child("ClCompile").child("AdditionalOptions");
-			found = true;
-		}
-		if (!found) continue;
-		if (!additionalOptions) {
-			items[i].node().child("ClCompile").append_child("PreprocessorDefinitions").append_child(pugi::node_pcdata).set_value(define.c_str());
-		}
-		else {
-			additionalOptions.first_child().set_value((std::string(additionalOptions.first_child().value()) + " " + define).c_str());
-		}
-	}
-}
-
-void visualStudioProject::addPreprocessorDefinitions(std::string define, LibType libType)
-{
-	pugi::xpath_node_set items = doc.select_nodes("//ItemDefinitionGroup");
-	for (int i = 0; i < items.size(); i++) {
 		pugi::xml_node additionalOptions;
 		bool found = false;
 		std::string condition(items[i].node().attribute("Condition").value());
@@ -491,9 +466,4 @@ void visualStudioProject::addAddon(ofAddon & addon){
 		addDefine(addon.defines[i], DEBUG_LIB);
 	}
 
-	for (int i = 0; i < (int)addon.preprocessorDefinitions.size(); i++) {
-		ofLogVerbose() << "adding addon preprocessorDefinitions: " << addon.preprocessorDefinitions[i];
-		addPreprocessorDefinitions(addon.preprocessorDefinitions[i], RELEASE_LIB);
-		addPreprocessorDefinitions(addon.preprocessorDefinitions[i], DEBUG_LIB);
-	}
 }
diff --git a/ofxProjectGenerator/src/projects/visualStudioProject.h b/ofxProjectGenerator/src/projects/visualStudioProject.h
@@ -22,7 +22,6 @@ class visualStudioProject : public baseProject {
     void addCFLAG(std::string cflag, LibType libType = RELEASE_LIB); // C
     void addCPPFLAG(std::string cppflag, LibType libType = RELEASE_LIB); // C++
 	void addDefine(std::string define, LibType libType = RELEASE_LIB);
-	void addPreprocessorDefinitions(std::string define, LibType libType = RELEASE_LIB);
 
     void addAddon(ofAddon & addon);