Skip to content

VS remove the check for including folders #616

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

Merged
merged 2 commits into from
Mar 6, 2025
+11 −32
Merged

VS remove the check for including folders #616

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ea48cf
VS remove the check for including folders
dimitre Mar 5, 2025
509681a
Merge branch 'openframeworks:master' into v94
dimitre Mar 6, 2025
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
2 changes: 1 addition & 1 deletion commandLine/src/defines.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define OFPROJECTGENERATOR_MAJOR_VERSION "0"
#define OFPROJECTGENERATOR_MINOR_VERSION "93"
#define OFPROJECTGENERATOR_MINOR_VERSION "94"
#define OFPROJECTGENERATOR_PATCH_VERSION "0"

#define PG_VERSION (OFPROJECTGENERATOR_MAJOR_VERSION "." OFPROJECTGENERATOR_MINOR_VERSION "." OFPROJECTGENERATOR_PATCH_VERSION)
10 changes: 3 additions & 7 deletions commandLine/src/projects/visualStudioProject.cpp
View file
Original file line number Diff line number Diff line change
@@ -669,13 +669,9 @@ void visualStudioProject::addAddonIncludePaths(const ofAddon& addon) {
addInclude(dir.string());
} else{
fs::path normalizedDir = normalizePath(dir);
if (containsSourceFiles(normalizedDir)) {
normalizedDir = makeRelative(projectDir, dir);
ofLogVerbose() << "[vsproject]-uniqueIncludeDirs] contains src - Adding dir:: [" << normalizedDir.string() << "]";
addInclude(normalizedDir);
} else {
ofLogVerbose() << "[vsproject]-uniqueIncludeDirs] no src - not adding [" << normalizedDir.string() << "]";
}
normalizedDir = makeRelative(projectDir, dir);
ofLogVerbose() << "[vsproject]-uniqueIncludeDirs] Adding dir:: [" << normalizedDir.string() << "]";
addInclude(normalizedDir);
}
}
}
31 changes: 7 additions & 24 deletions commandLine/src/projects/xcodeProject.cpp
View file
Original file line number Diff line number Diff line change
@@ -825,32 +825,15 @@ string xcodeProject::addFile(const fs::path & path, const fs::path & folder, con
}
}

// needed or the same?
// if (fp.linkBinaryWithLibraries) { // Link Binary With Libraries
// addCommand("# --- linkBinaryWithLibraries");
// addCommand("Add :objects:" + uuidMap["linkBinaryWithLibraries"] + ":files: string " + buildUUID);
// alert (commands.back(), 95);
// }

// if (fp.frameworksBuildPhase) { // Link Binary With Libraries
if (fp.linkBinaryWithLibraries) { // Link Binary With Libraries
auto tempUUID = generateUUID(ofPathToString(path) + "-InFrameworks");
addCommand("Add :objects:" + tempUUID + ":fileRef string " + UUID);
addCommand("Add :objects:" + tempUUID + ":isa string PBXBuildFile");
addCommand("# --- linkBinaryWithLibraries PBXFrameworksBuildPhase");
// uuidMap["linkBinaryWithLibraries"] = "E4B69B590A3A1756003C02F2";
addCommand("Add :objects:" + uuidMap["linkBinaryWithLibraries"] + ":files: string " + tempUUID);
alert (commands.back(), 96);
auto tempUUID = generateUUID(ofPathToString(path) + "-InFrameworks");
addCommand("Add :objects:" + tempUUID + ":fileRef string " + UUID);
addCommand("Add :objects:" + tempUUID + ":isa string PBXBuildFile");
addCommand("# --- linkBinaryWithLibraries PBXFrameworksBuildPhase");
// uuidMap["linkBinaryWithLibraries"] = "E4B69B590A3A1756003C02F2";
addCommand("Add :objects:" + uuidMap["linkBinaryWithLibraries"] + ":files: string " + tempUUID);
alert (commands.back(), 96);
}


// if ( path.extension() == ".framework" || path.extension() == ".xcframework" ) {
// addCommand("# ---- Frameworks Folder " + UUID);
// addCommand("Add :objects:901808C02053638E004A7774:children: string " + UUID);

// addCommand("# ---- PBXFrameworksBuildPhase " + buildUUID);
// addCommand("Add :objects:1D60588F0D05DD3D006BFB54:files: string " + buildUUID);
// }
}
return UUID;
}