Merge remote-tracking branch 'origin/develop' into develop

Explicit picking of driver for windows.
2024-04-05 06:49:57 -07:00 · 2024-04-05 06:49:48 -07:00
2 changed files with 4 additions and 7 deletions
--- a/cmake/portaudio.cmake
+++ b/cmake/portaudio.cmake
@ -3,6 +3,10 @@ if(LASP_HAS_PORTAUDIO)
    message("Building with Portaudio backend")
    if(WIN32)
        set(PA_USE_ALSA FALSE CACHE BOOL "Build PortAudio with ALSA backend")
+		set(PA_USE_ASIO TRUE CACHE BOOL "Build PortAudio with ASIO backend")
+		set(PA_USE_DS FALSE CACHE BOOL "Build PortAudio with Directsound backend")
+		set(PA_USE_WMME FALSE CACHE BOOL "Build PortAudio with WMME backend")
+		set(PA_USE_WDMKS FALSE CACHE BOOL "Build PortAudio with WDMKS backend")
    else()
        # Unix
        set(PA_USE_ALSA TRUE CACHE BOOL "Build PortAudio with ALSA backend")
--- a/pyproject.toml
+++ b/pyproject.toml
@ -59,10 +59,3 @@ install_components = ["python_modules"]
 # This might not work properly on Windows. Comment this out when testing on
 # Windows.
 mode = "symlink"
-
-[tool.commitizen]
-name = "cz_conventional_commits"
-tag_format = "v$version"
-version_scheme = "semver"
-version_provider = "pep621"
-update_changelog_on_bump = true
Author	SHA1	Message	Date
Anne de Jong	3738012c3e	Merge remote-tracking branch 'origin/develop' into develop Building, testing and releasing LASP if it has a tag / Build-Test-Ubuntu (push) Failing after 1m13s Details Building, testing and releasing LASP if it has a tag / Release-Ubuntu (push) Has been skipped Details	2024-04-05 06:49:57 -07:00
Anne de Jong	a91640cd8d	Explicit picking of driver for windows.	2024-04-05 06:49:48 -07:00