Enable relocatable linux builds #3247
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
| @@ -147,6 +147,8 @@ std::string GetBundleDirectory(); | |||
|
|
|||
| #ifdef _WIN32 | |||
| std::string &GetExeDirectory(); | |||
| #else | |||
| std::string &GetExeDirectory(); | |||
| #endif | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
|
@dolphin-emu-bot rebuild I believe you could squash a few of those commits, but other than that I guess its ready. |
- Change the path of the Sys folder to the executable's location - Add LINUX_LOCAL_DEV flag to use relocatable version on Linux - Add CMake definition for relocatable build
| # Add an option to build relocatable binaries on Linux | ||
| # The Sys folder will need to be copied to the Binaries folder. | ||
| if(UNIX) | ||
| add_definitions(-DLINUX_LOCAL_DEV=0) |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
|
LGTM |
degasus
added a commit
that referenced
this pull request
Nov 11, 2015
Enable relocatable linux builds
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.
This patch allows to build Dolphin on Linux so that it will look for the "Sys" folder where the executable is located, making it possible to run it from anywhere in the filesystem.
For this functionality to work, the LINUX_LOCAL_DEV flag has to be set, otherwise it will keep the default behavior.