summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-07-15 08:06:09 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-07-15 08:06:09 -0400
commitc00e03cced06703acdf32331c92b9f533d9c3ece (patch)
treecf375a90427d0b1107f0788aa4f1d10d6e7ea5f8
parent43f7813b248686bfa89600f91dccd83017dfe669 (diff)
Don't include jack/weakjack.h header when compiling for windows
-rw-r--r--libs/ardour/ardour/audioengine.h3
-rw-r--r--libs/ardour/audioengine.cc2
-rw-r--r--libs/ardour/port.cc2
3 files changed, 5 insertions, 2 deletions
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h
index 363238baad..10400c41d7 100644
--- a/libs/ardour/ardour/audioengine.h
+++ b/libs/ardour/ardour/audioengine.h
@@ -37,7 +37,10 @@
#include "pbd/signals.h"
#include "pbd/stacktrace.h"
+#ifndef WIN32
#include <jack/weakjack.h>
+#endif
+
#include <jack/jack.h>
#include <jack/transport.h>
#include <jack/thread.h>
diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 690012e529..a69e98283e 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -31,8 +31,6 @@
#include "pbd/unknown_type.h"
#include "pbd/epa.h"
-#include <jack/weakjack.h>
-
#include "midi++/port.h"
#include "midi++/jack_midi_port.h"
#include "midi++/mmc.h"
diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
index 3473b73617..a1eacca96e 100644
--- a/libs/ardour/port.cc
+++ b/libs/ardour/port.cc
@@ -21,7 +21,9 @@
#include "libardour-config.h"
#endif
+#ifndef WIN32
#include <jack/weakjack.h> // so that we can test for new functions at runtime
+#endif
#include "pbd/compose.h"
#include "pbd/error.h"