Merge branch 'master' of github.com:mapmapteam/mapmap

DestinationGLCanvas.cpp

@@ -61,8 +61,12 @@ void DestinationGLCanvas::doDraw(QPainter* painter)
 //    }
 //  }
 
-  glPushMatrix();
 
+  MainWindow &mainwindow = MainWindow::getInstance();
+  if ((&mainwindow) == NULL)
+    return;
+
+  glPushMatrix();
   MappingManager& mappingManager = MainWindow::getInstance().getMappingManager();
   QVector<Mapping::ptr> mappings = mappingManager.getVisibleMappings();
   for (QVector<Mapping::ptr>::const_iterator it = mappings.begin(); it != mappings.end(); ++it)

INSTALL

@@ -2,11 +2,15 @@ Build instructions
 ==================
 This file is written in rst, so that one can use rst2pdf to create a PDF out of it.
 
+
+Build on GNU/Linux
+------------------
 Dependencies: 
 
  * Qt
  * qt4-default
  * qt4-qmake
+ * liblo
 
 Build it::
 
@@ -18,6 +22,7 @@ Do this::
 
   sudo apt-get install -y \
       qt4-default \
+      liblo-dev \
       qt4-qmake
 
 For extras::
@@ -35,3 +40,14 @@ Then, do this::
   
   linguist mapmap_fr.ts
 
+Build on Mac OS X
+-----------------
+
+* Install the Apple Developer Tools. You need to register with a credit card in the Apple Store in order to download it.
+* Install Qt5. You can get it from http://qt-project.org/downloads and choose the default location.
+
+Do this::
+
+  ~/Qt5.2.1/5.2.1/clang_64/bin/qmake
+  make
+

MainWindow.cpp

@@ -28,6 +28,7 @@ MainWindow* MainWindow::instance = 0;
 
 MainWindow::MainWindow()
 {
+  MainWindow::setInstance(this);
   // Create model.
   mappingManager = new MappingManager;
 
@@ -60,7 +61,7 @@ MainWindow::MainWindow()
 
 MainWindow& MainWindow::getInstance()
 {
-  Q_ASSERT(instance);
+  //Q_ASSERT(instance);
 
   return *instance;
 }

OscInterface.cpp

@@ -20,6 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#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

OscInterface.h

@@ -22,6 +22,7 @@
 
 #ifndef OSC_INTERFACE_H_
 #define OSC_INTERFACE_H_
+#ifdef HAVE_OSC
 
 #include <tr1/memory>
 #include "concurrentqueue.h"
@@ -76,4 +77,5 @@ class OscInterface
 };
 
 
+#endif // HAVE_OSC
 #endif /* include guard */

OscReceiver.cpp

@@ -1,3 +1,4 @@
+#ifdef HAVE_OSC
 #include "OscReceiver.h"
 #include <iostream>
 #include <cstdio>
@@ -85,3 +86,5 @@ std::string OscReceiver::toString() const
     return "port:" + port_;
 }
 
+#endif // HAVE_OSC
+

OscReceiver.h

@@ -1,5 +1,6 @@
 #ifndef _OSC_RECEIVER_H_
 #define _OSC_RECEIVER_H_
+#ifdef HAVE_OSC
 
 #include "lo/lo.h"
 #include <string>
@@ -29,5 +30,6 @@ class OscReceiver {
         static void error(int num, const char *msg, const char *path);
 };
 
+#endif // HAVE_OSC
 #endif // _OSC_RECEIVER_H_
 

main.cpp

@@ -23,7 +23,6 @@ int main(int argc, char *argv[])
   app.installTranslator(&translator);
 
   MainWindow win;
-  MainWindow::setInstance(&win);
 
   //win.setLocale(QLocale("fr"));
 

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++