Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/autobuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
with:
tag_name: ${{ steps.get-build-vars.outputs.RELEASE_TAG }}
release_name: ${{ steps.get-build-vars.outputs.RELEASE_TITLE }}
body_path: ${{ github.workspace }}/autoLatestChangelog.md
body_path: autoLatestChangelog.md
prerelease: ${{ steps.get-build-vars.outputs.IS_PRERELEASE }}
draft: false

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ Jamulus.xcodeproj
jamulus_plugin_import.cpp
autoLatestChangelog.md
debian/
src/Generated/
Comment thread
ann0see marked this conversation as resolved.
obj/
104 changes: 103 additions & 1 deletion Jamulus.pro
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,81 @@ contains(CONFIG, "headless") {
QT += widgets
}

LRELEASE_DIR = src/res/translation
#########################################
# Automatic build (sub)folder assignment:
#########################################

equals(OUT_PWD, $$_PRO_FILE_PWD_) {
# default enable Automatic build (sub)folder assignment if the generated makefile
# is in the same folder as the Jamulus.pro file (normal qmake run)
# unless specifically requested not to

!no_auto_builddir:CONFIG *= auto_builddir
!no_auto_buildsubdirs:CONFIG *= auto_buildsubdirs
}


auto_builddir {
isEmpty(BUILD_DIR) BUILD_DIR = build

# separate subdir for visual studio builds
equals(TEMPLATE, "vcapp") BUILD_DIR = $${BUILD_DIR}/vs

# BUILD_DIR_BASE: base for BUID_DIR subfolders to prevent accessing root if BUILD_DIR is not set.
isEmpty(BUILD_DIR) {
BUILD_DIR_BASE=
} else {
BUILD_DIR_BASE= $$BUILD_DIR/
}
}

debug_and_release {
# debug/release build subfolders
CONFIG(debug, debug|release) {
DR_SUBDIR = debug/
} else {
DR_SUBDIR = release/
}
} else {
unset(DR_SUBDIR)
}

auto_buildsubdirs {
android {
# android is an exeption because it is a multi-target built

# QT_ARCH: Another undocumented variable that is set during make.
# This one is needed for the multi-target android build
# use '$$QT_ARCH' (in single quotes!) to use the achitecture name in the created make file.


DESTDIR = $${BUILD_DIR_BASE}$${DR_SUBDIR}lib # libJamulus_<ARCH>.so files are put here
UI_DIR = $${BUILD_DIR_BASE}$${DR_SUBDIR}ui # ui_*.h files are put here
MOC_DIR = $${BUILD_DIR_BASE}$${DR_SUBDIR}moc/'$$QT_ARCH' # moc_*.cpp files must be in ABI subdirs !
RCC_DIR = $${BUILD_DIR_BASE}$${DR_SUBDIR}rcc/'$$QT_ARCH' # qrc_*.cpp files must be in ABI subdirs !
OBJECTS_DIR = $${BUILD_DIR_BASE}$${DR_SUBDIR}obj/'$$QT_ARCH' # OBJ files must be in ABI subdirs !
LRELEASE_DIR = $${BUILD_DIR_BASE}$${DR_SUBDIR}translation # This folder will automatically have ABI subdirs generated by lrelease !
QM_DIR = $$LRELEASE_DIR/'$$QT_ARCH'/ # So for android builds we have to pass expanding of (the undocumented) $$QT_ARCH to the makefile creation by single quoting it

} else {

DESTDIR = $${BUILD_DIR_BASE}$${DR_SUBDIR}
UI_DIR = $${BUILD_DIR_BASE}$${DR_SUBDIR}ui
MOC_DIR = $${BUILD_DIR_BASE}$${DR_SUBDIR}moc
RCC_DIR = $${BUILD_DIR_BASE}$${DR_SUBDIR}rcc
OBJECTS_DIR = $${BUILD_DIR_BASE}$${DR_SUBDIR}obj
LRELEASE_DIR = $${BUILD_DIR_BASE}translation # This folder will automatically have debug/release subdirs generated by lrelease on debug_and_release builds !
QM_DIR = $${LRELEASE_DIR}/$${DR_SUBDIR} # so the qm files will be located here
}

# PRECOMPILED_DIR: An undocumented variable that must be set to an existing build folder
# to prevent creation of unused build folders for precompiled headers we don't have
PRECOMPILED_DIR = $$BUILD_DIR
} else {
QM_DIR = $$OUT_PWD/$$DR_SUBDIR
}


TRANSLATIONS = src/res/translation/translation_de_DE.ts \
src/res/translation/translation_fr_FR.ts \
src/res/translation/translation_pt_PT.ts \
Expand All @@ -54,6 +128,34 @@ TRANSLATIONS = src/res/translation/translation_de_DE.ts \
src/res/translation/translation_sv_SE.ts \
src/res/translation/translation_zh_CN.ts

!isEmpty(QM_DIR) {
DISTFILES += \
$${QM_DIR}translation_de_DE.qm \
$${QM_DIR}translation_fr_FR.qm \
$${QM_DIR}translation_pt_PT.qm \
$${QM_DIR}translation_pt_BR.qm \
$${QM_DIR}translation_es_ES.qm \
$${QM_DIR}translation_nl_NL.qm \
$${QM_DIR}translation_pl_PL.qm \
$${QM_DIR}translation_it_IT.qm \
$${QM_DIR}translation_sv_SE.qm \
$${QM_DIR}translation_sk_SK.qm \
$${QM_DIR}translation_zh_CN.qm

android {
# add QMAKE_CLEAN to the .Target makefiles !
build_pass:QMAKE_CLEAN += $${QM_DIR}*.qm
} else {
debug_and_release {
# add QMAKE_CLEAN to the .Debug/.Release makefiles !
build_pass:QMAKE_CLEAN += $${QM_DIR}*.qm
} else {
# add QMAKE_CLEAN to the Makefile
!build_pass:QMAKE_CLEAN += $${QM_DIR}*.qm
}
}
}

INCLUDEPATH += src

INCLUDEPATH_OPUS = libs/opus/include \
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ to thank the maintainers of these projects for making their efforts available to
[ccrma.stanford.edu/software/stk/](https://ccrma.stanford.edu/software/stk/)
* Some pixmaps are from the Open Clip Art Library (OCAL): [openclipart.com](https://openclipart.org/)
* Country flag icons from Mark James: [famfamfam.com](http://www.famfamfam.com)
* ASIO is a trademark and software of Steinberg Media Technologies GmbH


We would also like to acknowledge the contributors listed in the
Expand Down
1 change: 1 addition & 0 deletions src/util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,7 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : CBaseDlg ( parent )
"<p>RobyDati (<a href=\"https://github.com/RobyDati\">RobyDati</a>)</p>"
"<p>Rob-NY (<a href=\"https://github.com/Rob-NY\">Rob-NY</a>)</p>"
"<p>Thai Pangsakulyanont (<a href=\"https://github.com/dtinth\">dtinth</a>)</p>"
"<p>Peter Goderie (<a href=\"https://github.com/pgScorpio\">pgScorpio</a>)</p>"
"<br>" +
tr ( "For details on the contributions check out the %1" )
.arg ( "<a href=\"https://github.com/jamulussoftware/jamulus/graphs/contributors\">" + tr ( "Github Contributors list" ) + "</a>." ) );
Expand Down