From 1ae014d517333b72055c7a056bb6c0acb449021d Mon Sep 17 00:00:00 2001
From: ann0see <20726856+ann0see@users.noreply.github.com>
Date: Sat, 2 Apr 2022 22:32:56 +0200
Subject: [PATCH] Refactoring: Move ASIOSDK into libs/ folder

---
 .github/workflows/autobuild.yml |  2 +-
 .gitignore                      |  2 +-
 COMPILING.md                    |  4 ++--
 Jamulus.pro                     | 18 +++++++++---------
 src/sound/asio/sound.h          |  2 +-
 windows/deploy_windows.ps1      |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
index 21a5bcba2d..ff594bea74 100644
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -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
diff --git a/.gitignore b/.gitignore
index 22de5eeaf1..1f49dc501b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/COMPILING.md b/COMPILING.md
index d3be304496..1ed13c57db 100644
--- a/COMPILING.md
+++ b/COMPILING.md
@@ -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
 
 ---
diff --git a/Jamulus.pro b/Jamulus.pro
index a16bd51054..5279636ac5 100644
--- a/Jamulus.pro
+++ b/Jamulus.pro
@@ -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
         }
     }
 
@@ -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
diff --git a/src/sound/asio/sound.h b/src/sound/asio/sound.h
index d3b8f3d485..594cb5a6aa 100644
--- a/src/sound/asio/sound.h
+++ b/src/sound/asio/sound.h
@@ -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
diff --git a/windows/deploy_windows.ps1 b/windows/deploy_windows.ps1
index b53402ee71..95df80627f 100644
--- a/windows/deploy_windows.ps1
+++ b/windows/deploy_windows.ps1
@@ -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"
     }
 }