Allow building MainNoGUI and MainGUI simultaneously #755
+94
−97
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
| main_frame->m_XRRConfig->AddResolutions(retlist); | ||
| std::vector<std::string> resos; | ||
| main_frame->m_XRRConfig->AddResolutions(resos); | ||
| for (auto res = resos.begin(); res < resos.end(); res++) |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
|
Needs a "remove silly comments" commit ;-) |
We want to have two build targets: Main and MainNoGUI, and this code will be linked against in both cases, so the ifdef isn't enough for this case. Just append to a vector of strings, and then convert it after the fact.
Restructure our build system so we have multiple targets. Right now we only build MainNoGUI if we are using X11, since that's the only truly supported backend: the OS X code actually doesn't compile, according to comments made on IRC.
|
Looks good to me |
|
Can't vouch for the CMake spaghetti but lgtm overall. |
lioncash
added a commit
that referenced
this pull request
Aug 7, 2014
Allow building MainNoGUI and MainGUI simultaneously
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.
Do some cleanups to allow this to happen. I'm going to be considerably revamping the interface here, and in order to do that, I need to make sure it's tested properly.