Skip to content

Bugfix/visual studio defines #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Bugfix/visual studio defines #168

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e5b43d
seems to work, needs testing
armadillu Aug 30, 2017
1e9f08c
seems to work, needs testing
armadillu Aug 30, 2017
c27f360
Merge commit '1e9f08c' into bugfix/visualStudioDefines
armadillu Aug 31, 2017
90766d4
no debug print
armadillu Aug 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions ofxProjectGenerator/src/projects/visualStudioProject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,26 +355,35 @@ 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() << "_______________________________________________________________________________________________________________________";
}
}

Expand Down Expand Up @@ -448,4 +457,4 @@ void visualStudioProject::addAddon(ofAddon & addon){
addDefine(addon.defines[i], RELEASE_LIB);
addDefine(addon.defines[i], DEBUG_LIB);
}
}
}