Enhanced CMake support#42
Open
cdglove wants to merge 2 commits into
Open
Conversation
- Add platform support - Add option to copy built files to win32 directory - Switch to freeglut (adds win64 support) - Fix a bug where cmake include paths weren't correctly setup in demo exes. - Add new win32 binaries built againt freeglut. - Add x64 support to timing.cpp
|
Is there a way I can get your commits without the author merging? |
Author
|
Yes, just pull from my repository: |
|
I pulled this request locally, but got an error when run CMake: |
Contributor
|
You could try at line 11:
and likewise for line 15. I haven't tested this but this is how I usually copy files in CMake. |
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
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.
Enhanced @Amorph initial CMake support with support for other platforms. Also added x64 support to timing.cpp
I recommend deleting the current build files and using only cmake. I will prbably make that change and submit another PR.