From 093d7f7fdf2cd1dbed0cb888257b6b39b4bed7db Mon Sep 17 00:00:00 2001 From: Be Date: Wed, 11 Aug 2021 22:45:33 -0500 Subject: [PATCH] export WMME host API specific extensions in DLL symbols --- CMakeLists.txt | 2 ++ Makefile.in | 2 +- build/msvc/portaudio.def | 4 ++++ cmake/portaudio.def.in | 4 ++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 83301c9..4df23dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -185,6 +185,8 @@ if(WIN32) set(PORTAUDIO_PUBLIC_HEADERS "${PORTAUDIO_PUBLIC_HEADERS}" include/pa_win_wmme.h) target_compile_definitions(PortAudio PRIVATE PA_USE_WMME=1) target_link_libraries(PortAudio PRIVATE ole32 uuid) + else() + set(DEF_EXCLUDE_WMME_SYMBOLS ";") endif() option(WASAPI "Enable support for WASAPI" ON) diff --git a/Makefile.in b/Makefile.in index 8eb7342..527e199 100644 --- a/Makefile.in +++ b/Makefile.in @@ -44,7 +44,7 @@ PALIB = libportaudio.la PAINC = include/portaudio.h PA_LDFLAGS = $(LDFLAGS) $(SHARED_FLAGS) -rpath $(libdir) -no-undefined \ - -export-symbols-regex "(Pa|PaMacCore|PaJack|PaAlsa|PaAsio|PaOSS|PaWasapi|PaWasapiWinrt)_.*" \ + -export-symbols-regex "(Pa|PaMacCore|PaJack|PaAlsa|PaAsio|PaOSS|PaWasapi|PaWasapiWinrt|PaWinMME)_.*" \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) COMMON_OBJS = \ diff --git a/build/msvc/portaudio.def b/build/msvc/portaudio.def index 8de8065..fa34168 100644 --- a/build/msvc/portaudio.def +++ b/build/msvc/portaudio.def @@ -57,3 +57,7 @@ PaWasapi_SetStreamStateHandler @68 PaWasapiWinrt_SetDefaultDeviceId @67 PaWasapiWinrt_PopulateDeviceList @69 PaWasapi_GetIMMDevice @70 +PaWinMME_GetStreamInputHandleCount @71 +PaWinMME_GetStreamInputHandle @72 +PaWinMME_GetStreamOutputHandleCount @73 +PaWinMME_GetStreamOutputHandle @74 diff --git a/cmake/portaudio.def.in b/cmake/portaudio.def.in index 14f3328..af4d996 100644 --- a/cmake/portaudio.def.in +++ b/cmake/portaudio.def.in @@ -60,3 +60,7 @@ PaUtil_SetDebugPrintFunction @55 @DEF_EXCLUDE_WASAPI_SYMBOLS@PaWasapiWinrt_SetDefaultDeviceId @67 @DEF_EXCLUDE_WASAPI_SYMBOLS@PaWasapiWinrt_PopulateDeviceList @69 @DEF_EXCLUDE_WASAPI_SYMBOLS@PaWasapi_GetIMMDevice @70 +@DEF_EXCLUDE_WMME_SYMBOLS@PaWinMME_GetStreamInputHandleCount @71 +@DEF_EXCLUDE_WMME_SYMBOLS@PaWinMME_GetStreamInputHandle @72 +@DEF_EXCLUDE_WMME_SYMBOLS@PaWinMME_GetStreamOutputHandleCount @73 +@DEF_EXCLUDE_WMME_SYMBOLS@PaWinMME_GetStreamOutputHandle @74 -- 2.43.0