Closed harry-cpp closed 8 years ago
Ok.... merged!
@tomspilman In order for https://github.com/mono/MonoGame/pull/4554 to be mergable you have to do one of 2 things:
1) Rebase replace_opentk branch to develop
git checkout replace_opentk
git rebase origin/develop
* fix stuff
git add .
git rebase --continue
* last 2 thing will need to be repeated several times
git push --force
2) Delete replace_opentk branch and use my changes for it
git checkout develop
git branch -D replace_opentk
git push origin --delete replace_opentk
git remote add crazy https://github.com/cra0zy/MonoGame.git
git checkout crazy/SDL2Win
git branch replace_opentk
git push -u origin replace_opentk
The SDL2Win branch is updated with everything: https://github.com/cra0zy/MonoGame/tree/SDL2Win
Side note, maybe we should use my fork for replace_opentk... I am doing most of the job anyway and it's gonna be easier for me to keep it maintained. Later once it's done we submit it back to develop like in the original plan.
We will need to work this out with @dellis1972 and anyone else working on the SDL2 path. As long as they are good with it then I am.
@cra0zy @tomspilman I am working on ripping out all of the OpenGL/AL calls from OpenTK to our own binding. Its a large job. I haven't pushed anything yet so we can rebase without a problem. I
After the rebase, I'll be glad to help on the AL front. I haven't worked on it yet.
Just read that. :+1:
:D
Needed so https://github.com/mono/MonoGame/pull/4554 can also be rebased.