Skip to content
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

Frameworks path in local_addons fix #343

Merged
merged 26 commits into from
Apr 15, 2023
Merged

Frameworks path in local_addons fix #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
004e869
changes
dimitre Apr 13, 2023
3f07966
updates
dimitre Apr 13, 2023
a9c53c4
up
dimitre Apr 13, 2023
1e15b15
u
dimitre Apr 13, 2023
a35f44c
updates
dimitre Apr 13, 2023
e331657
update
dimitre Apr 13, 2023
a04320a
before changes
dimitre Apr 13, 2023
9f71efb
updates
dimitre Apr 13, 2023
53f1bb6
check if directory exists and is dir
dimitre Apr 14, 2023
1e2f047
almost there
dimitre Apr 15, 2023
06ce0fe
Merge branch 'openframeworks:master' into local
dimitre Apr 15, 2023
0cd980f
more more updates
dimitre Apr 15, 2023
2885729
more updates after broken
dimitre Apr 15, 2023
9204618
ok, needs cleanup
dimitre Apr 15, 2023
9c2187e
remove cxxopts
dimitre Apr 15, 2023
588fb42
ok
dimitre Apr 15, 2023
66360bf
ok
dimitre Apr 15, 2023
3eeda29
ok
dimitre Apr 15, 2023
bff9399
more conversion to fs::path
dimitre Apr 15, 2023
f6ffbe3
getOFRoot / setOFRoot to fs
dimitre Apr 15, 2023
77dc34b
templatesFolder to FS
dimitre Apr 15, 2023
5c61178
listAvailableTemplates
dimitre Apr 15, 2023
1ea15d4
renames
dimitre Apr 15, 2023
15e2ccb
renames
dimitre Apr 15, 2023
619eb3a
ok
dimitre Apr 15, 2023
2bb0f0e
emplace_back
dimitre Apr 15, 2023
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: 1 addition & 3 deletions commandLine/commandLine.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cp \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\" \"$TARGET_BUILD_DIR/projectGenerator\";\t\n";
showEnvVarsInLog = 0;
shellScript = "rm \"$TARGET_BUILD_DIR/projectGenerator\"\ncp \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\" \"$TARGET_BUILD_DIR/projectGenerator\";\t\n";
};
E42962A92163ECCD00A6A9E2 /* Run Script - Compile OF */ = {
isa = PBXShellScriptBuildPhase;
Expand Down Expand Up @@ -320,7 +319,6 @@
baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = NONE;
Expand Down
33 changes: 22 additions & 11 deletions commandLine/commandLine.xcodeproj/xcshareddata/xcschemes/commandLine Debug.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,10 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
Expand All @@ -38,17 +36,21 @@
ReferencedContainer = "container:commandLine.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugDocumentVersioning = "NO"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
Expand All @@ -57,16 +59,25 @@
ReferencedContainer = "container:commandLine.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
<CommandLineArguments>
<CommandLineArgument
argument = "-o&quot;/Volumes/tool/ofw&quot;"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument
argument = "/Volumes/tool/ofw/apps/WerkApps/TestSurface "
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
</LaunchAction>
<ProfileAction
buildConfiguration = "Debug"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
Expand Down
10 changes: 10 additions & 0 deletions commandLine/commandLine.xcodeproj/xcshareddata/xcschemes/commandLine Release.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,16 @@
ReferencedContainer = "container:commandLine.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
<CommandLineArgument
argument = "-o&quot;/Volumes/tool/ofw&quot;"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument
argument = "/Volumes/tool/ofw/apps/WerkApps/TestSurface "
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
Loading