Make resource file paths relative #862
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
These resource files support relative paths from their directory, so we should override the default paths for UNIX and WIN32 to act like APPLE, where relative paths are used by default. This should be a pretty safe thing to do because the absolute paths currently in these locations are actually to the staging in the project's build directory, which isn't available unless building from source. Signed-off-by: Scott K Logan <logans@cottsay.net>
|
I think we actually want the absolute paths in the header file - I'm going to move the patch a few lines later so that it only changes the uses we're interested in fixing. |
In that header, these absolute paths function as a fallback search location. It doesn't appear that OGRE can resolve the relative paths for any non-APPLE platforms, and I'm not sure it's worth the effort to make that work. Signed-off-by: Scott K Logan <logans@cottsay.net>
mjeronimo
approved these changes
Jun 11, 2022
|
@Mergifyio backport humble |
mergify bot
pushed a commit
that referenced
this pull request
Jun 13, 2022
These resource files support relative paths from their directory, so we should override the default paths for UNIX and WIN32 to act like APPLE, where relative paths are used by default. This should be a pretty safe thing to do because the absolute paths currently in these locations are actually to the staging in the project's build directory, which isn't available unless building from source. Signed-off-by: Scott K Logan <logans@cottsay.net> (cherry picked from commit 5c54f57)
✅ Backports have been created
|
ahcorde
pushed a commit
that referenced
this pull request
Sep 11, 2023
These resource files support relative paths from their directory, so we should override the default paths for UNIX and WIN32 to act like APPLE, where relative paths are used by default. This should be a pretty safe thing to do because the absolute paths currently in these locations are actually to the staging in the project's build directory, which isn't available unless building from source. Signed-off-by: Scott K Logan <logans@cottsay.net> (cherry picked from commit 5c54f57) Co-authored-by: Scott K Logan <logans@cottsay.net>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These resource files support relative paths from their directory, so we should override the default paths for UNIX and WIN32 to act like APPLE, where relative paths are used by default.
This should be a pretty safe thing to do because the absolute paths currently in these locations are actually to the staging in the project's build directory, which isn't available unless building from source.
Here is the official documentation which discusses relative path support for
resources.cfgandplugins.cfg: https://ogrecave.github.io/ogre/api/1.12/setup.html