Fixed FMILibrary linking

Check for the correct library type. Removed unnecessary code.
OpenModelica · Feb 7, 2018 · a45068d · a45068d
1 parent 1d1f811
commit a45068d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
@@ -5924,7 +5924,7 @@ void ModelWidgetContainer::loadPreviousViewType(ModelWidget *pModelWidget)
         pModelWidget->getDiagramViewToolButton()->setChecked(true);
         break;
     }
-  } else if (pModelWidget->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::CompositeModel) {
+  } else if (pModelWidget->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::Text) {
     pModelWidget->getTextViewToolButton()->setChecked(true);
   }
 }
@@ -6044,18 +6044,6 @@ void ModelWidgetContainer::currentModelWidgetChanged(QMdiSubWindow *pSubWindow)
     // update the Undo/Redo actions
     pModelWidget->updateUndoRedoActions();
   }
-  /* enable/disable the find/replace and goto line actions depending on the text editor visibility. */
-  if (pModelWidget && pModelWidget->getEditor()->isVisible()) {
-    if (pModelWidget->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::Modelica) {
-      enabled = true;
-    } else if (pModelWidget->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::Text) {
-      enabled = true;
-    } else {
-      enabled = false;
-    }
-  } else {
-    enabled = false;
-  }
 }
 
 /*!

diff --git a/OMEdit/OMEditGUI/OMEditGUI.pro b/OMEdit/OMEditGUI/OMEditGUI.pro
@@ -87,7 +87,7 @@ win32 {
   }
   LIBS += -L../OMEditGUI/Debugger/Parser -lGDBMIParser \
     -L$$(OMBUILDDIR)/lib/omc -lomantlr3 -lOMPlot -lomqwt -lomopcua \
-    -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lfmilib -lModelicaExternalC -lomcgc -lpthread -llibfmilib -lshlwapi\
+    -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lfmilib -lModelicaExternalC -lomcgc -lpthread -lshlwapi\
     -lws2_32
 
   INCLUDEPATH += $$(OMBUILDDIR)/include/omplot \