Skip to content

Fix PG macOS #609

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
danoli3 merged 5 commits into from
Mar 4, 2025
Merged

Fix PG macOS #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
646909e
GREMLINS!
danoli3 Mar 4, 2025
49405da
fix mm -x
danoli3 Mar 4, 2025
1ce90af
version++
danoli3 Mar 4, 2025
bff3c1c
remove flags for code rather than uniquie file
danoli3 Mar 4, 2025
d52f3da
Release
danoli3 Mar 4, 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
4 changes: 3 additions & 1 deletion commandLine/commandLine.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,8 @@
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
name = "Run Script";
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down Expand Up @@ -491,7 +493,7 @@
OTHER_LDFLAGS = (
"$(OF_CORE_LIBS)",
"$(OF_CORE_FRAMEWORKS)",
"$(LIB_OF)",
"$(LIB_OF_RELEASE)",
);
PROVISIONING_PROFILE_SPECIFIER = "";
baseConfigurationReference = E4EB6923138AFD0F00A09F29;
Expand Down
2 changes: 1 addition & 1 deletion commandLine/src/defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define OFPROJECTGENERATOR_MAJOR_VERSION "0"
#define OFPROJECTGENERATOR_MINOR_VERSION "89"
#define OFPROJECTGENERATOR_MINOR_VERSION "90"
#define OFPROJECTGENERATOR_PATCH_VERSION "0"

#define PG_VERSION (OFPROJECTGENERATOR_MAJOR_VERSION "." OFPROJECTGENERATOR_MINOR_VERSION "." OFPROJECTGENERATOR_PATCH_VERSION)
Expand Down
12 changes: 6 additions & 6 deletions commandLine/src/projects/xcodeProject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ if( type == DEFAULT ){
else if (ext == ".swift"){
fp.addToBuildPhase = true;
for (auto &c : buildConfigs) {
addCommand("Add :objects:" + c + ":buildSettings:OTHER_SWIFT_FLAGS: string -cxx-interoperability-mode=swift-5.9");
addCommand("Add :objects:" + c + ":buildSettings:OTHER_SWIFT_FLAGS: string " + "-cxx-interoperability-mode=swift-5.9");
// mark all Swift files as C++ interop available :)
}
}
Expand Down Expand Up @@ -506,11 +506,11 @@ void xcodeProject::addCompileFlagsForMMFile(const fs::path & srcFile) {

// Tag file as Objective-C++ in Xcode build settings
for (auto & c : buildConfigs) {
addCommand("Add :objects:" + c + ":buildSettings:OTHER_CPLUSPLUSFLAGS: string -x objective-c++");
// addCommand("Add :objects:" + c + ":buildSettings:OTHER_CPLUSPLUSFLAGS: string " + "-xobjective-c++");

if (requiresNoARC) {
addCommand("Add :objects:" + c + ":buildSettings:OTHER_CPLUSPLUSFLAGS: string -fno-objc-arc");
}
// if (requiresNoARC) {
// addCommand("Add :objects:" + c + ":buildSettings:OTHER_CPLUSPLUSFLAGS: string " + "-fno-objc-arc");
// }
}

}
Expand Down Expand Up @@ -696,7 +696,7 @@ void xcodeProject::addAddonFrameworks(const ofAddon& addon){

allFrameworks.reserve( addon.frameworks.size() + addon.xcframeworks.size() );
allFrameworks.insert( allFrameworks.end(), addon.frameworks.begin(), addon.frameworks.end() );
// allFrameworks.insert( allFrameworks.end(), addon.xcframeworks.begin(), addon.xcframeworks.end() );
allFrameworks.insert( allFrameworks.end(), addon.xcframeworks.begin(), addon.xcframeworks.end() );

for (auto & f : allFrameworks) {
// for (auto & f : addon.frameworks) {
Expand Down