Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Windows OpenGL Functions #271

Closed
wants to merge 3 commits into from

Conversation

kc7bfi
Copy link
Contributor

@kc7bfi kc7bfi commented Oct 2, 2013

I don't understand why it wants to update the entire files. I re-forked and edited without re-indenting. Maybe it is a CR/NL thing. Not sure how to get around this. Any thoughts?

@dblock
Copy link
Member

dblock commented Oct 2, 2013

This is because of your editor settings, they are not the same as the original file. You're inserting tabs where there were spaces before or vice-versa.

A local git diff should show you the same before you commit.

@kc7bfi
Copy link
Contributor Author

kc7bfi commented Oct 2, 2013

I ran WinMerge and it showed only the changes I was making. I turned off automatic re-indentation in Eclipse but it still showed a full replace of all files I modified, even CHAMGELOG.md

@dblock
Copy link
Member

dblock commented Oct 2, 2013

You may be right that the problem is actually CR/LF. Git can be configured to keep things "as is" or replace CR/LF with something. Is that's what's going on?

@dblock
Copy link
Member

dblock commented Oct 2, 2013

If you can't figure it out, I'll be happy to do the merge and fix it on my side. So don't spend your life on it.

@kc7bfi
Copy link
Contributor Author

kc7bfi commented Oct 2, 2013

Thanks for understanding. BTY, I love JNA!!! It seems there is nothing I cannot do with it. I also use a Java-to-VLC interface class that uses JNA to expose the VLC core library. Thanks for the great code!

@dblock
Copy link
Member

dblock commented Oct 2, 2013

Is that open-source? Should be, makes a good story, too.

@kc7bfi
Copy link
Contributor Author

kc7bfi commented Oct 2, 2013

Yes, but has a commercial license for commercial use, which is how we license it. It is called vlcj. David

@kc7bfi
Copy link
Contributor Author

kc7bfi commented Oct 3, 2013

Removed the W32APIOptions.ASCII_OPTIONS from the class per your recent e-mail

@dblock
Copy link
Member

dblock commented Oct 6, 2013

Reopened as #280.

@dblock dblock closed this Oct 6, 2013
dblock added a commit that referenced this pull request Oct 7, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants