diff --git a/OscInterface.cpp b/OscInterface.cpp index db66cd1..131323f 100644 --- a/OscInterface.cpp +++ b/OscInterface.cpp @@ -20,6 +20,7 @@ * along with this program. If not, see . */ +#ifdef HAVE_OSC #include "OscInterface.h" #include "MainWindow.h" #include "unused.h" @@ -230,3 +231,4 @@ void OscInterface::applyOscCommand(MainWindow &main_window, QVariantList & comma // open(); } +#endif // HAVE_OSC diff --git a/OscInterface.h b/OscInterface.h index 27e5af3..6aa0a7a 100644 --- a/OscInterface.h +++ b/OscInterface.h @@ -22,6 +22,7 @@ #ifndef OSC_INTERFACE_H_ #define OSC_INTERFACE_H_ +#ifdef HAVE_OSC #include #include "concurrentqueue.h" @@ -76,4 +77,5 @@ class OscInterface }; +#endif // HAVE_OSC #endif /* include guard */ diff --git a/OscReceiver.cpp b/OscReceiver.cpp index a739d91..c9b1f3d 100644 --- a/OscReceiver.cpp +++ b/OscReceiver.cpp @@ -1,3 +1,4 @@ +#ifdef HAVE_OSC #include "OscReceiver.h" #include #include @@ -85,3 +86,5 @@ std::string OscReceiver::toString() const return "port:" + port_; } +#endif // HAVE_OSC + diff --git a/OscReceiver.h b/OscReceiver.h index cf1b7f9..d615940 100644 --- a/OscReceiver.h +++ b/OscReceiver.h @@ -1,5 +1,6 @@ #ifndef _OSC_RECEIVER_H_ #define _OSC_RECEIVER_H_ +#ifdef HAVE_OSC #include "lo/lo.h" #include @@ -29,5 +30,6 @@ class OscReceiver { static void error(int num, const char *msg, const char *path); }; +#endif // HAVE_OSC #endif // _OSC_RECEIVER_H_ diff --git a/mapmap.pro b/mapmap.pro index d7381d9..7116df4 100644 --- a/mapmap.pro +++ b/mapmap.pro @@ -75,9 +75,10 @@ mac { INCLUDEPATH += \ /opt/local/include/ \ /opt/local/include/libxml2 - LIBS += -L/opt/local/lib \ + LIBS += \ -framework OpenGL \ -framework GLUT + # -L/opt/local/lib \ QMAKE_CXXFLAGS += -D__MACOSX_CORE__ QMAKE_CXXFLAGS += -stdlib=libstdc++