Skip to content

Commit f05175d

Browse files
dimitredimitre
authored
ensureDllDirectoriesExist fix (#496)
1 parent a720202 commit f05175d

4 files changed

Lines changed: 26 additions & 24 deletions

File tree

‎commandLine/src/addons/ofAddon.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,11 +355,11 @@ void ofAddon::preParseConfig(){
355355

356356
// found Variable
357357
if (line.find("=") != string::npos){
358-
bool addToValue = false;
358+
// bool addToValue = false;
359359
string variable, value;
360360
vector<string> varValue;
361361
if (line.find("+=") != string::npos) {
362-
addToValue = true;
362+
// addToValue = true;
363363
varValue = ofSplitString(line, "+=");
364364
} else {
365365
varValue = ofSplitString(line, "=");

‎commandLine/src/projects/baseProject.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ bool baseProject::save(){
280280
}
281281
// replace this section with our external paths
282282
else if( extSrcPaths.size() && str.rfind("# PROJECT_EXTERNAL_SOURCE_PATHS =", 0) == 0 ){
283-
for(int d = 0; d < extSrcPaths.size(); d++){
283+
for(std::size_t d = 0; d < extSrcPaths.size(); d++){
284284
ofLog(OF_LOG_VERBOSE) << " adding PROJECT_EXTERNAL_SOURCE_PATHS to config" << extSrcPaths[d].generic_string() << std::endl;
285285
saveConfig << "PROJECT_EXTERNAL_SOURCE_PATHS" << (d == 0 ? " = " : " += ") << extSrcPaths[d].generic_string() << std::endl;
286286
}

‎commandLine/src/projects/visualStudioProject.cpp‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ void visualStudioProject::addSrc(const fs::path & srcFile, const fs::path & fold
180180
// FIXME: Convert to FS::path
181181
std::vector < string > folderSubNames = ofSplitString(folderString, "\\");
182182
string folderName = "";
183-
for (int i = 0; i < folderSubNames.size(); i++){
183+
for (std::size_t i = 0; i < folderSubNames.size(); i++){
184184
if (i != 0) folderName += "\\";
185185
folderName += folderSubNames[i];
186186
appendFilter(folderName);
@@ -335,9 +335,10 @@ void visualStudioProject::addProps(fs::path propsFile){
335335
string path = propsFile.string();
336336
fixSlashOrder(path);
337337
pugi::xpath_node_set items = doc.select_nodes("//ImportGroup");
338-
for (int i = 0; i < items.size(); i++) {
338+
for (auto & item : items) {
339+
// FIXME: needed?
339340
pugi::xml_node additionalOptions;
340-
items[i].node().append_child("Import").append_attribute("Project").set_value(path.c_str());
341+
item.node().append_child("Import").append_attribute("Project").set_value(path.c_str());
341342
}
342343
// auto check = doc.select_nodes("//ImportGroup/Import/Project");
343344
}
@@ -389,20 +390,21 @@ void visualStudioProject::addLibrary(const LibraryBinary & lib) {
389390

390391
void visualStudioProject::addCFLAG(string cflag, LibType libType){
391392
pugi::xpath_node_set items = doc.select_nodes("//ItemDefinitionGroup");
392-
for(int i=0;i<items.size();i++){
393+
// FIXME: iterator
394+
for (auto & item : items) {
393395
pugi::xml_node additionalOptions;
394396
bool found=false;
395-
string condition(items[i].node().attribute("Condition").value());
397+
string condition(item.node().attribute("Condition").value());
396398
if (libType == RELEASE_LIB && condition.find("Release") != string::npos) {
397-
additionalOptions = items[i].node().child("ClCompile").child("AdditionalOptions");
399+
additionalOptions = item.node().child("ClCompile").child("AdditionalOptions");
398400
found = true;
399401
}else if(libType==DEBUG_LIB && condition.find("Debug") != string::npos){
400-
additionalOptions = items[i].node().child("ClCompile").child("AdditionalOptions");
402+
additionalOptions = item.node().child("ClCompile").child("AdditionalOptions");
401403
found = true;
402404
}
403405
if(!found) continue;
404406
if(!additionalOptions){
405-
items[i].node().child("ClCompile").append_child("AdditionalOptions").append_child(pugi::node_pcdata).set_value(cflag.c_str());
407+
item.node().child("ClCompile").append_child("AdditionalOptions").append_child(pugi::node_pcdata).set_value(cflag.c_str());
406408
}else{
407409
additionalOptions.set_value((string(additionalOptions.value()) + " " + cflag).c_str());
408410
}
@@ -412,20 +414,20 @@ void visualStudioProject::addCFLAG(string cflag, LibType libType){
412414

413415
void visualStudioProject::addCPPFLAG(string cppflag, LibType libType){
414416
pugi::xpath_node_set items = doc.select_nodes("//ItemDefinitionGroup");
415-
for(int i=0;i<items.size();i++){
417+
for (auto & item : items) {
416418
pugi::xml_node additionalOptions;
417419
bool found=false;
418-
string condition(items[i].node().attribute("Condition").value());
420+
string condition(item.node().attribute("Condition").value());
419421
if(libType==RELEASE_LIB && condition.find("Debug") != string::npos){
420-
additionalOptions = items[i].node().child("ClCompile").child("AdditionalOptions");
422+
additionalOptions = item.node().child("ClCompile").child("AdditionalOptions");
421423
found = true;
422424
}else if(libType==DEBUG_LIB && condition.find("Release") != string::npos){
423-
additionalOptions = items[i].node().child("ClCompile").child("AdditionalOptions");
425+
additionalOptions = item.node().child("ClCompile").child("AdditionalOptions");
424426
found = true;
425427
}
426428
if(!found) continue;
427429
if(!additionalOptions){
428-
items[i].node().child("ClCompile").append_child("AdditionalOptions").append_child(pugi::node_pcdata).set_value(cppflag.c_str());
430+
item.node().child("ClCompile").append_child("AdditionalOptions").append_child(pugi::node_pcdata).set_value(cppflag.c_str());
429431
}else{
430432
additionalOptions.set_value((string(additionalOptions.value()) + " " + cppflag).c_str());
431433
}
@@ -435,21 +437,21 @@ void visualStudioProject::addCPPFLAG(string cppflag, LibType libType){
435437

436438
void visualStudioProject::addDefine(string define, LibType libType) {
437439
pugi::xpath_node_set items = doc.select_nodes("//ItemDefinitionGroup");
438-
for (int i = 0; i<items.size(); i++) {
440+
for (auto & item : items) {
439441
pugi::xml_node additionalOptions;
440442
bool found = false;
441-
string condition(items[i].node().attribute("Condition").value());
443+
string condition(item.node().attribute("Condition").value());
442444
if (libType == RELEASE_LIB && condition.find("Debug") != string::npos) {
443-
additionalOptions = items[i].node().child("ClCompile").child("AdditionalOptions");
445+
additionalOptions = item.node().child("ClCompile").child("AdditionalOptions");
444446
found = true;
445447
}
446448
else if (libType == DEBUG_LIB && condition.find("Release") != string::npos) {
447-
additionalOptions = items[i].node().child("ClCompile").child("AdditionalOptions");
449+
additionalOptions = item.node().child("ClCompile").child("AdditionalOptions");
448450
found = true;
449451
}
450452
if (!found) continue;
451453
if (!additionalOptions) {
452-
items[i].node().child("ClCompile").append_child("PreprocessorDefinitions").append_child(pugi::node_pcdata).set_value(define.c_str());
454+
item.node().child("ClCompile").append_child("PreprocessorDefinitions").append_child(pugi::node_pcdata).set_value(define.c_str());
453455
}
454456
else {
455457
additionalOptions.set_value((string(additionalOptions.value()) + " " + define).c_str());
@@ -458,7 +460,7 @@ void visualStudioProject::addDefine(string define, LibType libType) {
458460
}
459461

460462
void visualStudioProject::ensureDllDirectoriesExist() {
461-
std::vector<std::string> dirs = { "dll\\x64", "dll\\ARM64", "dll\\ARM64EC" };
463+
std::vector<fs::path> dirs { "dll/x64", "dll/ARM64", "dll/ARM64EC" };
462464
for (const auto & dir : dirs) {
463465
fs::path dirPath = projectDir / dir;
464466
if (!fs::exists(dirPath)) {

‎commandLine/src/projects/xcodeProject.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ string xcodeProject::getFolderUUID(const fs::path & folder, bool isFolder, fs::p
246246
string lastFolderUUID = projRootUUID;
247247

248248
if (folders.size()){
249-
for (int a=0; a<folders.size(); a++) {
249+
for (std::size_t a=0; a<folders.size(); a++) {
250250
vector <string> joinFolders;
251251
joinFolders.assign(folders.begin(), folders.begin() + (a+1));
252252
string fullPath = ofJoinString(joinFolders, "/");
@@ -683,7 +683,7 @@ bool xcodeProject::saveProjectFile(){
683683
}
684684
j[p].emplace_back(cols[3]);
685685

686-
} catch (std::exception e) {
686+
} catch (std::exception & e) {
687687
cout << "json error " << endl;
688688
cout << e.what() << endl;
689689
}

0 commit comments

Comments
 (0)