-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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
Fix Apache License naming as requested by issue #673. #674
Merged
bhamail
merged 9 commits into
java-native-access:master
from
bhamail:ApacheLicense-naming
Jul 5, 2016
Merged
Fix Apache License naming as requested by issue #673. #674
bhamail
merged 9 commits into
java-native-access:master
from
bhamail:ApacheLicense-naming
Jul 5, 2016
Conversation
This file contains 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
@@ -1,4 +1,4 @@ | |||
NOTE: as of JNA 4.0, JNA is now dual-licensed under LGPL and ASL (see LICENSE). | |||
NOTE: as of JNA 4.0, JNA is now dual-licensed under LGPL and AL (see LICENSE). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be better to use "AL 2.0" here
Without this modification the jnidispatch.dll (when built by MSVC) is dynamicly linked against msvcr100.dll. This requires the corresponding runtime libraries to be installed. Closes: #636
Hopefully better now? |
Looks fine now, thanks! |
Staticly link the windows jnidispatch.dll when build with MSVC compiler
…eLicense-naming # Conflicts: # CHANGES.md
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.
No description provided.