diff options
author | Florian Jung <flo@windfisch.org> | 2012-01-03 17:26:09 +0000 |
---|---|---|
committer | Florian Jung <flo@windfisch.org> | 2012-01-03 17:26:09 +0000 |
commit | 1bc4ba9dfc00b6e7511fbf4765296a2002f83315 (patch) | |
tree | df6a0d5d9b61d64005dd368afea0aea11ab0a6b3 /muse2/muse/osc.cpp | |
parent | b988a0a27bc175ce10bc8fa53ed131486813f3e7 (diff) |
merged with release_2_0
Diffstat (limited to 'muse2/muse/osc.cpp')
-rw-r--r-- | muse2/muse/osc.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/muse2/muse/osc.cpp b/muse2/muse/osc.cpp index 7daeb9ff..7bdc0b00 100644 --- a/muse2/muse/osc.cpp +++ b/muse2/muse/osc.cpp @@ -61,8 +61,12 @@ #include "globals.h" #include "globaldefs.h" +#endif // OSC_SUPPORT + namespace MusECore { +#ifdef OSC_SUPPORT + static lo_server_thread serverThread = 0; static char* url = 0; static bool oscServerRunning = false; |