Skip to content

Commit 1de3efe

Browse files
authored
v44 (#517)
1 parent 5c23657 commit 1de3efe

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

commandLine/src/projects/baseProject.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#define PG_VERSION "43"
3+
#define PG_VERSION "44"
44

55
#include "ofAddon.h"
66
#include "pugixml.hpp"

commandLine/src/projects/xcodeProject.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@ string xcodeProject::getFolderUUID(const fs::path & folder, bool isFolder, fs::p
291291
base2 = base2.parent_path();
292292
}
293293

294+
294295
addCommand("Add :objects:"+thisUUID+":sourceTree string SOURCE_ROOT");
295296
addCommand("Add :objects:"+thisUUID+":path string " + ofPathToString(base2));
296297
} else {
@@ -302,7 +303,7 @@ string xcodeProject::getFolderUUID(const fs::path & folder, bool isFolder, fs::p
302303

303304
addCommand("Add :objects:"+thisUUID+":children array");
304305

305-
if (folder.begin()->string() == "addons") {
306+
if (folder.begin()->string() == "addons" || folder.begin()->string() == "src") {
306307
addCommand("Add :objects:"+thisUUID+":sourceTree string <group>");
307308
fs::path addonFolder { fs::path(fullPath).filename() };
308309
addCommand("Add :objects:"+thisUUID+":path string " + ofPathToString(addonFolder));
@@ -666,6 +667,7 @@ string xcodeProject::addFile(const fs::path & path, const fs::path & folder, con
666667
addCommand("Add :objects:"+UUID+":name string " + ofPathToString(path.filename()));
667668

668669
if (fp.absolute) {
670+
669671
addCommand("Add :objects:"+UUID+":sourceTree string SOURCE_ROOT");
670672
if (fs::exists( projectDir / path )) {
671673
addCommand("Add :objects:"+UUID+":path string " + ofPathToString(path));
@@ -786,7 +788,9 @@ bool xcodeProject::saveProjectFile(){
786788
// addFile("openFrameworks-Info.plist", "", fp);
787789
// addFile("of.entitlements", "", fp);
788790
// addFile("Project.xcconfig", "", fp);
789-
addFile("App.xcconfig", "", fp);
791+
if (fs::exists( projectDir / "App.xcconfig" )) {
792+
addFile("App.xcconfig", "", fp);
793+
}
790794
fp.absolute = true;
791795
// addFile("../../../libs/openframeworks", "", fp);
792796
addFile(fs::path{"bin"} / "data", "", fp);

0 commit comments

Comments
 (0)