Skip to content

Addon lib fix and update npm dependencies #516

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 2 commits into from
Jun 5, 2024
Merged

Addon lib fix and update npm dependencies #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b53a1b8
Project Generator NPM Vulnerability fixes - Updates sub-dependancies
danoli3 Jun 5, 2024
dde0d37
Addon libs - Fix XCFrameworks not linking correctly
danoli3 Jun 5, 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
23 changes: 17 additions & 6 deletions commandLine/Project.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,26 @@ MACOSX_DEPLOYMENT_TARGET = 10.15
// App Settings
PRODUCT_NAME = $(TARGET_NAME)
PRODUCT_NAME[config=Debug] = $(TARGET_NAME)Debug
PRODUCT_BUNDLE_IDENTIFIER = cc.openFrameworks.$(TARGET_NAME)
PRODUCT_BUNDLE_IDENTIFIER = cc.openFrameworks.${TARGET_NAME:rfc1034identifier}
//PRODUCT_BUNDLE_IDENTIFIER[config=Debug] = cc.openFrameworks.$(TARGET_NAME)Debug
DEVELOPMENT_LANGUAGE = English
CODE_SIGN_IDENTITY = -
INFOPLIST_FILE = openFrameworks-Info.plist
GENERATE_INFOPLIST_FILE = YES

// set application category to games, this is required to enable Game mode
// note: this sets the initial value in the Xcode UI
INFOPLIST_KEY_LSApplicationCategoryType = public.app-category.games

// VERSIONING - overridden if changed in Xcode UI

// this is "Version" in the Xcode target Identity UI
// suggested to use semantic versioning format ala #.#.#
MARKETING_VERSION = 0.1.0

// If users upgrade project to recommended settings it enables script sandboxing which breaks our post build script
ENABLE_USER_SCRIPT_SANDBOXING=NO

// this is "Build" in the Xcode target Identity UI, an incremental build number
// important for the App Store as new build submissions need a diff number even
// if MARKETING_VERSION is the same
Expand All @@ -49,11 +57,6 @@ ICON_FILE = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/$(ICON_NAME)
// ex. change ICON_FILE_PATH = bin/data/ -> ICON_FILE = bin/data/$(ICON_NAME) &
// in a custom openFrameworks-Info.plist, set CFBundleIconFile to ICON_NAME

//FOR AV ENGINE SOUND PLAYER UNCOMMENT TWO LINES BELOW
//OF_NO_FMOD=1
//USER_PREPROCESSOR_DEFINITIONS="OF_NO_FMOD=1"
GCC_PREPROCESSOR_DEFINITIONS=$(inherited)$(USER_PREPROCESSOR_DEFINITIONS)

//APPSTORE, uncomment next lines to bundle data folder and code sign
//OF_CODESIGN = 1
//OF_BUNDLE_DATA_FOLDER = 1
Expand All @@ -66,9 +69,17 @@ GCC_PREPROCESSOR_DEFINITIONS=$(inherited)$(USER_PREPROCESSOR_DEFINITIONS)
//OF_CORE_LIBS = $(inherited) $(LIB_BOOST_FS) $(LIB_BOOST_SYSTEM)
//OF_CORE_HEADERS = $(inherited) $(HEADER_BOOST)

HIGH_RESOLUTION_CAPABLE = NO

// Optional include to keep any permanent settings as CODE_SIGN_IDENTITY.
#include? "App.xcconfig"

//FOR AV ENGINE SOUND PLAYER UNCOMMENT THREE LINES BELOW
//OF_NO_FMOD=1
//USER_PREPROCESSOR_DEFINITIONS="OF_NO_FMOD=1"
//LIB_FMOD=""
GCC_PREPROCESSOR_DEFINITIONS=$(inherited) $(USER_PREPROCESSOR_DEFINITIONS)

OTHER_CFLAGS = $(OF_CORE_CFLAGS)
OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OF_CORE_FRAMEWORKS)
HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS)
20 changes: 20 additions & 0 deletions commandLine/commandLine.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
"7F2BBCD1-F22D-454A-9100-33D1C12BEA70" /* androidStudioProject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = "FFD740F7-8E04-4563-A856-D4E402AF9C0E" /* androidStudioProject.cpp */; };
"B07B8E19-F9DE-4E97-8833-859CD9267D30" /* LibraryBinary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = "1EFA4702-B4F3-4556-9C12-4FE21FD503D0" /* LibraryBinary.cpp */; };
"BCE6F361-0F3D-41FF-978D-B5ED6676D90B" /* LICENSE in Sources */ = {isa = PBXBuildFile; fileRef = "C97ACCE3-5F0E-4BEC-8BA9-2A532D9EA2E3" /* LICENSE */; };
BF879F5D2C0F7CEB00200951 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF879F5C2C0F7CEB00200951 /* AVFoundation.framework */; };
BF879F5F2C0F7ED500200951 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF879F5E2C0F7ED500200951 /* Foundation.framework */; };
BF879F642C0F801100200951 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF879F632C0F801100200951 /* SystemConfiguration.framework */; };
"C2428661-BDEC-41D7-8150-C9BA5EE86C0C" /* visualStudioProject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = "7BB75687-3F31-4D10-BE6A-C7918D1A678D" /* visualStudioProject.cpp */; };
"DBD7E2AC-672A-4FD9-B0A4-DF24111D17FB" /* xcodeProject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = "4CC7F503-61FC-435C-BA93-F9C1E6D46ABE" /* xcodeProject.cpp */; };
E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; };
Expand Down Expand Up @@ -72,6 +75,9 @@
"9314E210-0C9D-4025-9840-CD8122E2DC3D" /* LibraryBinary.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = LibraryBinary.h; path = src/utils/LibraryBinary.h; sourceTree = SOURCE_ROOT; };
"9FAE80C7-5F2A-4E9D-9487-9E2667DE93DA" /* Utils.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = Utils.h; path = src/utils/Utils.h; sourceTree = SOURCE_ROOT; };
"AB662ACC-8DC1-4C81-A360-52F4CBF8DFF9" /* App.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = App.xcconfig; sourceTree = "<group>"; };
BF879F5C2C0F7CEB00200951 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
BF879F5E2C0F7ED500200951 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
BF879F632C0F801100200951 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
"C0FADDD2-1DFA-4DC4-AC81-5877E59E42BF" /* ofAddon.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofAddon.h; path = src/addons/ofAddon.h; sourceTree = SOURCE_ROOT; };
"C5A3016A-B663-4FE7-B6E6-421C5F168447" /* qtcreatorproject.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = qtcreatorproject.cpp; path = src/projects/qtcreatorproject.cpp; sourceTree = SOURCE_ROOT; };
"C97ACCE3-5F0E-4BEC-8BA9-2A532D9EA2E3" /* LICENSE */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 4; name = LICENSE; path = src/uuidxx/license/LICENSE; sourceTree = SOURCE_ROOT; };
Expand All @@ -92,6 +98,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
BF879F642C0F801100200951 /* SystemConfiguration.framework in Frameworks */,
BF879F5F2C0F7ED500200951 /* Foundation.framework in Frameworks */,
BF879F5D2C0F7CEB00200951 /* AVFoundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -173,6 +182,16 @@
path = ../../../addons;
sourceTree = "<group>";
};
BF879F5B2C0F7CEB00200951 /* Frameworks */ = {
isa = PBXGroup;
children = (
BF879F632C0F801100200951 /* SystemConfiguration.framework */,
BF879F5E2C0F7ED500200951 /* Foundation.framework */,
BF879F5C2C0F7CEB00200951 /* AVFoundation.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
"C833E973-D2D2-4055-A99B-34CB61CC572D" /* uuidxx */ = {
isa = PBXGroup;
children = (
Expand All @@ -194,6 +213,7 @@
BB4B014C10F69532006C3DED /* addons */,
E4B69B5B0A3A1756003C02F2 /* commandLineDebug.app */,
"AB662ACC-8DC1-4C81-A360-52F4CBF8DFF9" /* App.xcconfig */,
BF879F5B2C0F7CEB00200951 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down
13 changes: 12 additions & 1 deletion commandLine/src/projects/xcodeProject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,16 @@ string xcodeProject::getFolderUUID(const fs::path & folder, bool isFolder, fs::p
}

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

if (folder.begin()->string() == "addons") {
addCommand("Add :objects:"+thisUUID+":sourceTree string <group>");
fs::path addonFolder { fs::path(fullPath).filename() };
addCommand("Add :objects:"+thisUUID+":path string " + ofPathToString(addonFolder));
// alert ("group " + folder.string() + " : " + base.string() + " : " + addonFolder.string(), 32);
} else {
addCommand("Add :objects:"+thisUUID+":sourceTree string SOURCE_ROOT");
}


// Add this new folder to its parent, projRootUUID if root
addCommand("Add :objects:"+lastFolderUUID+":children: string " + thisUUID);
Expand Down Expand Up @@ -357,6 +367,7 @@ void xcodeProject::addSrc(const fs::path & srcFile, const fs::path & folder, Src
fp.addToResources = true;
}
}


string UUID {
addFile(srcFile, folder, fp)
Expand Down Expand Up @@ -423,7 +434,7 @@ void xcodeProject::addXCFramework(const fs::path & path, const fs::path & folder
string parent { ofPathToString(path.parent_path()) };

for (auto & c : buildConfigs) {
addCommand("Add :objects:" + c + ":buildSettings:FRAMEWORK_SEARCH_PATHS: string " + parent);
addCommand("Add :objects:" + c + ":buildSettings:XFRAMEWORK_SEARCH_PATHS: string " + parent);
}
}

Expand Down
Loading