commit 20c2fce8321cceaeffd1f2e1d16806e6e3585359
parent 3a044b22f8a00050e569ba675010a0b220b0511c
Author: falkTX <falktx@falktx.com>
Date: Sat, 10 Jul 2021 23:33:05 +0100
Fix RtAudio-related windows build
Signed-off-by: falkTX <falktx@falktx.com>
Diffstat:
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Makefile.plugins.mk b/Makefile.plugins.mk
@@ -49,8 +49,7 @@ endif
ifeq ($(MACOS),true)
JACK_LIBS += -framework CoreAudio -framework CoreFoundation
else ifeq ($(WINDOWS),true)
-# TODO
-JACK_LIBS +=
+JACK_LIBS += -lksuser -lmfplat -lmfuuid -lole32 -lwinmm -lwmcodecdspuuid
else ifneq ($(HAIKU),true)
JACK_LIBS = -ldl
ifeq ($(HAVE_ALSA),true)
diff --git a/dgl/src/ApplicationPrivateData.cpp b/dgl/src/ApplicationPrivateData.cpp
@@ -25,7 +25,7 @@ START_NAMESPACE_DGL
typedef std::list<DGL_NAMESPACE::Window*>::reverse_iterator WindowListReverseIterator;
-static ThreadHandle getCurrentThreadHandle() noexcept
+static d_ThreadHandle getCurrentThreadHandle() noexcept
{
#ifdef DISTRHO_OS_WINDOWS
return GetCurrentThread();
@@ -34,7 +34,7 @@ static ThreadHandle getCurrentThreadHandle() noexcept
#endif
}
-static bool isThisTheMainThread(const ThreadHandle mainThreadHandle) noexcept
+static bool isThisTheMainThread(const d_ThreadHandle mainThreadHandle) noexcept
{
#ifdef DISTRHO_OS_WINDOWS
return GetCurrentThread() == mainThreadHandle; // IsGUIThread ?
diff --git a/dgl/src/ApplicationPrivateData.hpp b/dgl/src/ApplicationPrivateData.hpp
@@ -24,10 +24,10 @@
#ifdef DISTRHO_OS_WINDOWS
# include <winsock2.h>
# include <windows.h>
-typedef HANDLE ThreadHandle;
+typedef HANDLE d_ThreadHandle;
#else
# include <pthread.h>
-typedef pthread_t ThreadHandle;
+typedef pthread_t d_ThreadHandle;
#endif
typedef struct PuglWorldImpl PuglWorld;
@@ -59,7 +59,7 @@ struct Application::PrivateData {
uint visibleWindows;
/** Handle that identifies the main thread. Used to check if calls belong to current thread or not. */
- ThreadHandle mainThreadHandle;
+ d_ThreadHandle mainThreadHandle;
/** List of windows for this application. Only used during `close`. */
std::list<DGL_NAMESPACE::Window*> windows;