Skip to content

Commit

Permalink
Refactoring: Move ASIOSDK into libs/ folder
Browse files Browse the repository at this point in the history
  • Loading branch information
ann0see committed Apr 2, 2022
1 parent 8a93a22 commit 1ae014d
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/autobuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ jobs:
C:\Qt
C:\ChocoCache
~\windows\NSIS
~\windows\ASIOSDK2
~\libs\ASIOSDK2
key: ${{ matrix.config.target_os }}-${{ hashFiles('.github/workflows/autobuild.yml', 'autobuild/windows.ps1', 'windows/deploy_windows.ps1') }}-${{ matrix.config.base_command }}

- name: Cache Android dependencies
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ moc_*.cpp
ui_*.h
moc_predefs.h
src/res/qrc_resources.cpp
windows/ASIOSDK2
libs/ASIOSDK2
windows/VC_redist.x64.exe
windows/vc_redist.x86.exe
windows/nsProcess.dll
Expand Down
4 changes: 2 additions & 2 deletions COMPILING.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ Most users will probably want to use this method:

### Compiling only

1. Create a folder under `\windows` called ASIOSDK2
1. Download the [ASIOSDK](https://www.steinberg.net/asiosdk), open the top level folder in the .zip file and copy the contents into `[\path\to\jamulus\source]\windows\ASIOSDK2` so that, e.g., the folder `[\path\to\jamulus\source]\windows\ASIOSDK2\common` exists
1. Create a folder under `\libs` called ASIOSDK2
1. Download the [ASIOSDK](https://www.steinberg.net/asiosdk), open the top level folder in the .zip file and copy the contents into `[\path\to\jamulus\source]\libs\ASIOSDK2` so that, e.g., the folder `[\path\to\jamulus\source]\libs\ASIOSDK2\common` exists
1. Open Jamulus.pro in Qt Creator, configure the project with a default kit, then compile & run

---
Expand Down
18 changes: 9 additions & 9 deletions Jamulus.pro
Original file line number Diff line number Diff line change
Expand Up @@ -125,19 +125,19 @@ win32 {
message(Using ASIO.)
message(Please review the ASIO SDK licence.)

!exists(windows/ASIOSDK2) {
error("Error: ASIOSDK2 must be placed in Jamulus windows folder.")
!exists(libs/ASIOSDK2) {
error("Error: ASIOSDK2 must be placed in Jamulus \libs folder.")
}
# Important: Keep those ASIO includes local to this build target in
# order to avoid poisoning other builds license-wise.
HEADERS += src/sound/asio/sound.h
SOURCES += src/sound/asio/sound.cpp \
windows/ASIOSDK2/common/asio.cpp \
windows/ASIOSDK2/host/asiodrivers.cpp \
windows/ASIOSDK2/host/pc/asiolist.cpp
INCLUDEPATH += windows/ASIOSDK2/common \
windows/ASIOSDK2/host \
windows/ASIOSDK2/host/pc
libs/ASIOSDK2/common/asio.cpp \
libs/ASIOSDK2/host/asiodrivers.cpp \
libs/ASIOSDK2/host/pc/asiolist.cpp
INCLUDEPATH += libs/ASIOSDK2/common \
libs/ASIOSDK2/host \
libs/ASIOSDK2/host/pc
}
}

Expand Down Expand Up @@ -1120,6 +1120,6 @@ contains(CONFIG, "disable_version_check") {
# be sure to update .github/workflows/coding-style-check.yml and .clang-format-ignore as well.
CLANG_FORMAT_SOURCES = $$files(*.cpp, true) $$files(*.mm, true) $$files(*.h, true)
CLANG_FORMAT_SOURCES = $$find(CLANG_FORMAT_SOURCES, ^\(android|ios|mac|linux|src|windows\)/)
CLANG_FORMAT_SOURCES ~= s!^\(windows/\(nsProcess|ASIOSDK2\)/|src/res/qrc_resources\.cpp\)\S*$!!g
CLANG_FORMAT_SOURCES ~= s!^\(windows/nsProcess/|libs/ASIOSDK2|src/res/qrc_resources\.cpp\)\S*$!!g
clang_format.commands = 'clang-format -i $$CLANG_FORMAT_SOURCES'
QMAKE_EXTRA_TARGETS += clang_format
2 changes: 1 addition & 1 deletion src/sound/asio/sound.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include "../src/soundbase.h"

// The following includes require the ASIO SDK to be placed in
// windows/ASIOSDK2 during build.
// libs/ASIOSDK2 during build.
// Important:
// - Do not copy parts of ASIO SDK into the Jamulus source tree without
// further consideration as it would make the license situation more
Expand Down
2 changes: 1 addition & 1 deletion windows/deploy_windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ Function Install-Dependencies
# Don't download ASIO SDK on Jamulus JACK builds to save
# resources and to be extra-sure license-wise.
Install-Dependency -Uri $AsioSDKUrl `
-Name $AsioSDKName -Destination "ASIOSDK2"
-Name $AsioSDKName -Destination "..\libs\ASIOSDK2"
}
}

Expand Down

0 comments on commit 1ae014d

Please sign in to comment.