search

MonoGame / MonoGame.Dependencies

The MonoGame binary dependencies submodule.
38 stars 51 forks source link

Update OpenTK to 1.1.2 #14

Closed thefiddler closed 10 years ago

thefiddler commented 10 years ago

This release contains important fixes for MonoGame:

This PR is a prerequisite for https://github.com/mono/MonoGame/issues/2464, https://github.com/mono/MonoGame/issues/2422 and a number of other issues.

tomspilman commented 10 years ago

Merged!

totallyeviljake commented 10 years ago

Did someone update the dependencies submodule for these changes? When I try to build MG WindowsGL I get a bunch of errors from my OpenTK version 1.1 which specifically relate to the changes in this PR .. (Mouse.GetCursorState for instance)

totallyeviljake commented 10 years ago

My fork has GUID 16081bfb285e6449381dc1bfa704dea1a5e7efb2 for this module, but the latest head is not this GUID. Do we have to manually update the head on a submodule of a forked repo? hmmmm.

tomspilman commented 10 years ago

Did you do....

git submodule update

?

totallyeviljake commented 10 years ago

yeah, I did that and --init, and did it a few times, and then went to the GitHub.com repo and verified that MG is on a head that is not the same as the current, as far as I could tell. 16081bf is the most recent submodule head for depds.

totallyeviljake commented 10 years ago

ha! 16081bf is the May 18 version of dependencies, and May 19 was the Open TK 1.1.2 commit. :dancer:

totallyeviljake commented 10 years ago

I had to manually update the revision for the submodule in our fork. Weird.

tomspilman commented 10 years ago

Possibly you ran into a conflict at some point and didn't get the submodule update merged correctly. I've done this before myself... it is confusing.

totallyeviljake commented 10 years ago

Yeah, I think this may have been a carry over from a fiddler merge that had a conflict in it. crazy. grrrr