1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-11 09:03:36 +02:00

Various fixes to CMake build

Mostly a result of not defining __WXMSW__, but the portmixer cmakelist
wasn't looking for the right portaudio variables.
This commit is contained in:
Leland Lucius
2020-02-19 10:53:50 -06:00
parent b67c82171c
commit 53840f7a3e
6 changed files with 21 additions and 24 deletions

View File

@@ -10,28 +10,28 @@ list( APPEND SOURCES
${TARGET_ROOT}/src/px_win_common.c
>
$<$<BOOL:${use_pa_ds}>:
$<$<BOOL:${${_OPT}use_pa_ds}>:
${TARGET_ROOT}/src/px_win_ds.c
>
$<$<BOOL:${use_pa_wasapi}>:
$<$<BOOL:${${_OPT}use_pa_wasapi}>:
${TARGET_ROOT}/src/px_win_wasapi.c
${TARGET_ROOT}/src/px_win_endpoint.c
>
$<$<BOOL:${use_pa_wmme}>:
$<$<BOOL:${${_OPT}use_pa_wmme}>:
${TARGET_ROOT}/src/px_win_wmme.c
>
$<$<BOOL:${use_pa_coreaudio}>:
$<$<BOOL:${${_OPT}use_pa_coreaudio}>:
${TARGET_ROOT}/src/px_mac_coreaudio.c
>
$<$<BOOL:${use_pa_alsa}>:
$<$<BOOL:${${_OPT}use_pa_alsa}>:
${TARGET_ROOT}/src/px_linux_alsa.c
>
$<$<BOOL:${use_pa_oss}>:
$<$<BOOL:${${_OPT}use_pa_oss}>:
${TARGET_ROOT}/src/px_unix_oss.c
>
)
@@ -45,27 +45,27 @@ list( APPEND INCLUDES
list( APPEND DEFINES
PRIVATE
$<$<BOOL:${use_pa_ds}>:
$<$<BOOL:${${_OPT}use_pa_ds}>:
PX_USE_WIN_DSOUND=1
>
$<$<BOOL:${use_pa_wasapi}>:
$<$<BOOL:${${_OPT}use_pa_wasapi}>:
PX_USE_WIN_WASAPI=1
>
$<$<BOOL:${use_pa_wmme}>:
$<$<BOOL:${${_OPT}use_pa_wmme}>:
PX_USE_WIN_MME=1
>
$<$<BOOL:${use_pa_coreaudio}>:
$<$<BOOL:${${_OPT}use_pa_coreaudio}>:
PX_USE_MAC_COREAUDIO=1
>
$<$<BOOL:${use_pa_alsa}>:
$<$<BOOL:${${_OPT}use_pa_alsa}>:
PX_USE_LINUX_ALSA=1
>
$<$<BOOL:${use_pa_oss}>:
$<$<BOOL:${${_OPT}use_pa_oss}>:
PX_USE_UNIX_OSS=1
>
)