Skip to content

v46 xcframeworks #520

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

Closed
wants to merge 4 commits into from
Closed

v46 xcframeworks #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e17b782
up
dimitre Jun 7, 2024
7a81c64
up
dimitre Jun 7, 2024
dc9c2e5
dan comments
dimitre Jun 7, 2024
d3e8a52
v bump
dimitre Jun 7, 2024
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/projects/baseProject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#define PG_VERSION "45"
#define PG_VERSION "46"

#include "ofAddon.h"
#include "pugixml.hpp"
Expand Down
9 changes: 7 additions & 2 deletions commandLine/src/projects/xcodeProject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,7 @@ void xcodeProject::addXCFramework(const fs::path & path, const fs::path & folder

addCommand("# ----- addXCFramework path=" + ofPathToString(path) + " folder=" + ofPathToString(folder));

// FIXME: Hey Dan I've noticed this has the inverted logic of isSystemFramework in the function addFramework
bool isSystemFramework = false;
if (!folder.empty() && !ofIsStringInString(ofPathToString(path), "/System/Library/Frameworks")
&& target != "ios"){
Expand All @@ -438,6 +439,7 @@ void xcodeProject::addXCFramework(const fs::path & path, const fs::path & folder
string parent { ofPathToString(path.parent_path()) };

for (auto & c : buildConfigs) {
// FIXME: Dan Maybe there is a typo here in XFRAMEWORK
addCommand("Add :objects:" + c + ":buildSettings:XFRAMEWORK_SEARCH_PATHS: string " + parent);
}
}
Expand Down Expand Up @@ -719,7 +721,10 @@ string xcodeProject::addFile(const fs::path & path, const fs::path & folder, con
}

if (fp.copyFilesBuildPhase) {
if (path.extension() == ".framework") {
// If we are going to add xcframeworks to copy files -> destination frameworks, we should include here
// if (path.extension() == ".framework" || path.extension() == ".xcframework") {
// This now includes both .framework and .xcframework
if (fileType == "wrapper.framework") {
// copy to frameworks
addCommand("# ---- copyPhase Frameworks " + buildUUID);
addCommand("Add :objects:E4C2427710CC5ABF004149E2:files: string " + buildUUID);
Expand Down Expand Up @@ -784,7 +789,7 @@ bool xcodeProject::saveProjectFile(){
// debugCommands = true;

addCommand("# ---- PG VERSION " + getPGVersion());
addCommand("Add :_openFrameworksProjectGeneratorVersion string " + getPGVersion());
addCommand("Add :a_OFProjectGeneratorVersion string " + getPGVersion());

fileProperties fp;
// fp.isGroupWithoutFolder = true;
Expand Down
1 change: 1 addition & 0 deletions commandLine/src/projects/xcodeProject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ class xcodeProject : public baseProject {

std::map<fs::path, string> extensionToFileType {
{ ".framework" , "wrapper.framework" },
{ ".xcframework" , "wrapper.framework" },
{ ".dylib" , "compiled.mach-o.dylib" },

{ ".cpp" , "sourcecode.cpp.cpp" },
Expand Down