Skip to content

A couple of minor patches to Jamulus.pro #3010

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.

Sign up for GitHub

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

Merged
ann0see merged 2 commits into from
Feb 14, 2023
Merged

A couple of minor patches to Jamulus.pro #3010

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d88a40
Built-in MingW in QtCreator 5 needed this to find inet_pton
pljones Feb 13, 2023
200a0ae
Tools needed for actually making the distro also need including
pljones Feb 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion Jamulus.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ win32 {
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
Copy link
Copy Markdown
Member

@ann0see ann0see Feb 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this fixed with the Qt6 creator? If that's the case, I'd add it here.

Copy link
Copy Markdown
Collaborator Author

@pljones pljones Feb 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It all got too complicated to try... Ideally, both should work together.

LIBS += -lole32 \
-luser32 \
-ladvapi32 \
Expand Down Expand Up @@ -681,11 +682,23 @@ contains(QT_ARCH, armeabi-v7a) | contains(QT_ARCH, arm64-v8a) {
DEFINES_OPUS += OPUS_BUILD=1 USE_ALLOCA=1 OPUS_HAVE_RTCD=1 HAVE_LRINTF=1 HAVE_LRINT=1

DISTFILES += ChangeLog \
COMPILING.md \
COPYING \
CONTRIBUTING.md \
README.md \
SECURITY.md \
docs/JAMULUS_PROTOCOL.md \
docs/JSON-RPC.md \
docs/README.md \
docs/RELATED-PROJECTS.md \
docs/TRANSLATING.md \
linux/jamulus.desktop.in \
linux/jamulus-server.desktop.in \
mac/Info-make-legacy.plist \
mac/Info-make.plist \
mac/Info-xcode.plist \
mac/Jamulus.entitlements \
mac/deploy_mac.sh \
src/res/io.jamulus.jamulus.png \
src/res/io.jamulus.jamulus.svg \
src/res/io.jamulus.jamulusserver.svg \
Expand Down Expand Up @@ -1042,7 +1055,17 @@ DISTFILES += ChangeLog \
src/res/flags/yt.png \
src/res/flags/za.png \
src/res/flags/zm.png \
src/res/flags/zw.png
src/res/flags/zw.png \
tools/changelog-helper.sh \
tools/check-wininstaller-translations.sh \
tools/checkkeys.pl \
tools/create-translation-issues.sh \
tools/generate_json_rpc_docs.py \
tools/get_release_contributors.py \
tools/qt5-to-qt6-country-code-table.py \
tools/update-copyright-notices.sh \
windows/deploy_windows.ps1 \
windows/installer.nsi

DISTFILES_OPUS += libs/opus/AUTHORS \
libs/opus/ChangeLog \
Expand Down