From 3936af99d88fd6cf9bdb914381d18e52498f25e3 Mon Sep 17 00:00:00 2001 From: pionere Date: Wed, 12 Jan 2022 16:31:00 +0100 Subject: [PATCH] fix HAVE_SDL_AUDIO flag of CMakeLists.txt --- CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bcf5acf2..65bc39db6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1607,16 +1607,17 @@ elseif(WINDOWS) if(SDL_AUDIO) if(NOT WINDOWS_STORE) - set(SDL_AUDIO_DRIVER_WINMM 1) - file(GLOB WINMM_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/winmm/*.c) - set(SOURCE_FILES ${SOURCE_FILES} ${WINMM_AUDIO_SOURCES}) + set(SDL_AUDIO_DRIVER_WINMM 1) + file(GLOB WINMM_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/winmm/*.c) + set(SOURCE_FILES ${SOURCE_FILES} ${WINMM_AUDIO_SOURCES}) + set(HAVE_SDL_AUDIO TRUE) endif() - set(HAVE_SDL_AUDIO TRUE) if(HAVE_DSOUND_H AND NOT WINDOWS_STORE) set(SDL_AUDIO_DRIVER_DSOUND 1) file(GLOB DSOUND_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/directsound/*.c) set(SOURCE_FILES ${SOURCE_FILES} ${DSOUND_AUDIO_SOURCES}) + set(HAVE_SDL_AUDIO TRUE) endif() if(SDL_WASAPI AND HAVE_AUDIOCLIENT_H AND HAVE_MMDEVICEAPI_H) @@ -1627,6 +1628,7 @@ elseif(WINDOWS) list(APPEND WASAPI_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/wasapi/SDL_wasapi_winrt.cpp) endif() set(SOURCE_FILES ${SOURCE_FILES} ${WASAPI_AUDIO_SOURCES}) + set(HAVE_SDL_AUDIO TRUE) endif() endif() @@ -1643,8 +1645,8 @@ elseif(WINDOWS) ${SDL2_SOURCE_DIR}/src/render/direct3d11/*.cpp ) else() - set(SDL_VIDEO_DRIVER_WINDOWS 1) - file(GLOB WIN_VIDEO_SOURCES ${SDL2_SOURCE_DIR}/src/video/windows/*.c) + set(SDL_VIDEO_DRIVER_WINDOWS 1) + file(GLOB WIN_VIDEO_SOURCES ${SDL2_SOURCE_DIR}/src/video/windows/*.c) endif() set(SOURCE_FILES ${SOURCE_FILES} ${WIN_VIDEO_SOURCES})