reconcile Linux, Docker and multi-OS support from DreamingRaven #13
Conversation
This file contains hidden or 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
updated project files
Porta fix
glut bins
Tutorial 4 boost fix
We do not use X11 in this tutorial thus far, and removing it makes it work in docker containers as they have no X11 session.
I have added fish inside the container to help people especially new people to get around
Now to get boost into the docker
Now dockerfile will work with boost, for tutorial 4
They do not appear to be 100% necessary but I am adding them for the sake of completion.
boundary checking in atomic scan
It should be noted you cant pop-up view images from within docker as its terminal only. So it will error when running as there is no screen to pop-up to. But as long as you are aware of that it works as expected.
This will simplify the subsequent merge.
…rials into DreamingRaven-master
|
Holy smokes batman. I was not expecting to see this! It's like when you see an old photo of yourself and think, wow, that hair was not doing me any favours! |
This allows for external automation to call scripts as benchmarks.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
This PR does a couple of things:
masterandmulti_osThe base branch for the PR currently is
multi_osbut can also cleanly merge intomaster. cmake should be able to generate Windows project files as well.I've resolved all merged conflicts and aligned the directory structure.
Caveats:
multi_osandmasterfiles for OpenCL as well as C++I am not sure which ones would be correct; but can easily make them to amend this PR.