A couple of minor patches to Jamulus.pro#3010
Merged
ann0see merged 2 commits intojamulussoftware:mainfrom Feb 14, 2023
Merged
Conversation
ann0see
reviewed
Feb 13, 2023
| DEFINES += NOMINMAX # solves a compiler error in qdatetime.h (Qt5) | ||
| RC_FILE = src/res/win-mainicon.rc | ||
| mingw* { | ||
| DEFINES += _WIN32_WINNT=0x0600 # solves missing inet_pton in CSocket::SendPacket |
Member
There was a problem hiding this comment.
Is this fixed with the Qt6 creator? If that's the case, I'd add it here.
Collaborator
Author
There was a problem hiding this comment.
It all got too complicated to try... Ideally, both should work together.
ann0see
approved these changes
Feb 14, 2023
Member
|
Approved on the base that it's an improvement in a non critical area (doesn't seem to break the CI which uses a different process) |
Collaborator
Author
|
@ann0see once the JACK build is green, can you force the merge if you're okay to do it? (Rather than me forcing my own change...) |
Member
|
I have the feeling that something is wrong on the JACK side. At least it seems as if it hangs now, even though it didn't two weeks ago. |
pljones
force-pushed
the
patch/jamulus-pro-fixes
branch
from
b0f6f88 to
200a0ae
Compare
Member
|
Now the JACK build is ok. |
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
2 participants
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.
Short description of changes
_WIN32_WINNT=0x0600to getinet_ptonto work.DIST_FILES(so they don't appear as "part of the project" to Qt Creator)CHANGELOG: Internal: Improve Qt Creator 5 compliance of Jamulus.pro
Context: Fixes an issue?
Minor developer issue with development tooling.
Does this change need documentation? What needs to be documented and how?
No.
Status of this Pull Request
I had to make the changes to get my fresh new Qt Creator install working fully.
What is missing until this pull request can be merged?
Review.
Checklist