Merge pull request #1 from mflehmig/animation2

fixLinuxBuild
OpenModelica · Sep 22, 2016 · 78f34ea · 78f34ea
2 parents f4df9cc + 3a786a3
commit 78f34ea
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/OMEdit/OMEditGUI/Animation/VisualizerMAT.cpp b/OMEdit/OMEditGUI/Animation/VisualizerMAT.cpp
@@ -32,7 +32,7 @@
  * @author Volker Waurich <volker.waurich@tu-dresden.de>
  */
 
-#include "VisualizerMat.h"
+#include "VisualizerMAT.h"
 
 VisualizerMAT::VisualizerMAT(const std::string& modelFile, const std::string& path)
         : VisualizerAbstract(modelFile, path, VisType::MAT),

diff --git a/OMEdit/OMEditGUI/MainWindow.h b/OMEdit/OMEditGUI/MainWindow.h
@@ -35,6 +35,8 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
+#undef smooth
+
 #include <QtGlobal>
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
 #include <QtWidgets>

diff --git a/OMEdit/OMEditGUI/OMEditGUI.pro b/OMEdit/OMEditGUI/OMEditGUI.pro
@@ -105,6 +105,7 @@ win32 {
   CONFIG(release, debug|release) {
     QMAKE_LFLAGS_RELEASE += -rdynamic
   }
+  LIBS += -losgDB -losgViewer -losgUtil -losgGA -losgQt -losg -lOpenThreads
 }
 
 SOURCES += main.cpp \