From 5e5b43d5741470d8d5ddaf77ad7d34a82cf84eee Mon Sep 17 00:00:00 2001
From: Oriol Ferrer Mesia <oriol@uri.cat>
Date: Wed, 30 Aug 2017 17:48:36 -0400
Subject: [PATCH 1/3] seems to work, needs testing

---
 .../src/projects/visualStudioProject.cpp      | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/ofxProjectGenerator/src/projects/visualStudioProject.cpp b/ofxProjectGenerator/src/projects/visualStudioProject.cpp
index ffc6a5e5..67ef5892 100644
--- a/ofxProjectGenerator/src/projects/visualStudioProject.cpp
+++ b/ofxProjectGenerator/src/projects/visualStudioProject.cpp
@@ -355,26 +355,36 @@ void visualStudioProject::addCPPFLAG(string cppflag, LibType libType){
 
 void visualStudioProject::addDefine(std::string define, LibType libType)
 {
+	ofLogNotice() << "add define: " << define;
 	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());
+
+		ofLogNotice() << "**************************************";
+		items[i].node().print(std::cout);
+		ofLogNotice() << "**************************************";
+
+
 		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) {
+		pugi::xml_node preprocessorDefinitionsNode = items[i].node().child("ClCompile").child("PreprocessorDefinitions");
+		if (!preprocessorDefinitionsNode) {
 			items[i].node().child("ClCompile").append_child("PreprocessorDefinitions").append_child(pugi::node_pcdata).set_value(define.c_str());
+		}else{
+			string accumDef = string(items[i].node().child("ClCompile").child("PreprocessorDefinitions").text().get()) + ";" + define;
+			items[i].node().child("ClCompile").child("PreprocessorDefinitions").first_child().set_value(accumDef.c_str());
 		}
-		else {
-			additionalOptions.set_value((string(additionalOptions.value()) + " " + define).c_str());
-		}
+
+		ofLogNotice() << "_______________________________________________________________________________________________________________________";
+		items[i].node().print(std::cout);
+		ofLogNotice() << "_______________________________________________________________________________________________________________________";
 	}
 }
 
@@ -448,4 +458,4 @@ void visualStudioProject::addAddon(ofAddon & addon){
 		addDefine(addon.defines[i], RELEASE_LIB);
 		addDefine(addon.defines[i], DEBUG_LIB);
 	}
-}
\ No newline at end of file
+}

From 1e9f08c98e022420523c5b725b13e149583cdac0 Mon Sep 17 00:00:00 2001
From: Oriol Ferrer Mesia <oriol@uri.cat>
Date: Wed, 30 Aug 2017 17:48:36 -0400
Subject: [PATCH 2/3] seems to work, needs testing

---
 .../src/projects/visualStudioProject.cpp      | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/ofxProjectGenerator/src/projects/visualStudioProject.cpp b/ofxProjectGenerator/src/projects/visualStudioProject.cpp
index ffc6a5e5..67ef5892 100644
--- a/ofxProjectGenerator/src/projects/visualStudioProject.cpp
+++ b/ofxProjectGenerator/src/projects/visualStudioProject.cpp
@@ -355,26 +355,36 @@ void visualStudioProject::addCPPFLAG(string cppflag, LibType libType){
 
 void visualStudioProject::addDefine(std::string define, LibType libType)
 {
+	ofLogNotice() << "add define: " << define;
 	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());
+
+		ofLogNotice() << "**************************************";
+		items[i].node().print(std::cout);
+		ofLogNotice() << "**************************************";
+
+
 		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) {
+		pugi::xml_node preprocessorDefinitionsNode = items[i].node().child("ClCompile").child("PreprocessorDefinitions");
+		if (!preprocessorDefinitionsNode) {
 			items[i].node().child("ClCompile").append_child("PreprocessorDefinitions").append_child(pugi::node_pcdata).set_value(define.c_str());
+		}else{
+			string accumDef = string(items[i].node().child("ClCompile").child("PreprocessorDefinitions").text().get()) + ";" + define;
+			items[i].node().child("ClCompile").child("PreprocessorDefinitions").first_child().set_value(accumDef.c_str());
 		}
-		else {
-			additionalOptions.set_value((string(additionalOptions.value()) + " " + define).c_str());
-		}
+
+		ofLogNotice() << "_______________________________________________________________________________________________________________________";
+		items[i].node().print(std::cout);
+		ofLogNotice() << "_______________________________________________________________________________________________________________________";
 	}
 }
 
@@ -448,4 +458,4 @@ void visualStudioProject::addAddon(ofAddon & addon){
 		addDefine(addon.defines[i], RELEASE_LIB);
 		addDefine(addon.defines[i], DEBUG_LIB);
 	}
-}
\ No newline at end of file
+}

From 90766d4f3a58a1cdd8d618ef3e9b4d55f59ae886 Mon Sep 17 00:00:00 2001
From: Oriol Ferrer Mesia <oriol@uri.cat>
Date: Thu, 31 Aug 2017 14:14:20 -0400
Subject: [PATCH 3/3] no debug print

---
 .../src/projects/visualStudioProject.cpp          | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/ofxProjectGenerator/src/projects/visualStudioProject.cpp b/ofxProjectGenerator/src/projects/visualStudioProject.cpp
index 67ef5892..0345ad1a 100644
--- a/ofxProjectGenerator/src/projects/visualStudioProject.cpp
+++ b/ofxProjectGenerator/src/projects/visualStudioProject.cpp
@@ -355,17 +355,16 @@ void visualStudioProject::addCPPFLAG(string cppflag, LibType libType){
 
 void visualStudioProject::addDefine(std::string define, LibType libType)
 {
-	ofLogNotice() << "add define: " << define;
+	//ofLogNotice() << "add define: " << define;
 	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());
 
-		ofLogNotice() << "**************************************";
-		items[i].node().print(std::cout);
-		ofLogNotice() << "**************************************";
-
+		//ofLogNotice() << "**************************************";
+		//items[i].node().print(std::cout);
+		//ofLogNotice() << "**************************************";
 
 		if (libType == RELEASE_LIB && condition.find("Debug") != std::string::npos) {
 			found = true;
@@ -382,9 +381,9 @@ void visualStudioProject::addDefine(std::string define, LibType libType)
 			items[i].node().child("ClCompile").child("PreprocessorDefinitions").first_child().set_value(accumDef.c_str());
 		}
 
-		ofLogNotice() << "_______________________________________________________________________________________________________________________";
-		items[i].node().print(std::cout);
-		ofLogNotice() << "_______________________________________________________________________________________________________________________";
+		//ofLogNotice() << "_______________________________________________________________________________________________________________________";
+		//items[i].node().print(std::cout);
+		//ofLogNotice() << "_______________________________________________________________________________________________________________________";
 	}
 }