Do not point directly into OMCompiler.git

Use includes and libraries in the build / OPENMODELICAHOME directory instead of pointing to a directory ../OMCompiler/ that may or may not exist.
OpenModelica · Jun 28, 2018 · 891aab5 · 891aab5
1 parent 23a584f
commit 891aab5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/OMEdit/OMEditGUI/Animation/Shapes.h b/OMEdit/OMEditGUI/Animation/Shapes.h
@@ -39,7 +39,7 @@
 #include "util/read_matlab4.h"
 #include "util/read_csv.h"
 #include "rapidxml.hpp"
-#include "fmilib.h"
+// #include "fmilib.h"
 #include <osg/Vec3f>
 #include <osg/Matrix>
 #include <osg/Uniform>

diff --git a/OMEdit/OMEditGUI/OMEditGUI.pro b/OMEdit/OMEditGUI/OMEditGUI.pro
@@ -72,16 +72,16 @@ win32 {
     QMAKE_LFLAGS_RELEASE =
     # win32 vs. win64
     contains(QT_ARCH, i386) { # 32-bit
-      LIBS += -L$$(OMDEV)/tools/msys/mingw32/lib/binutils -L$$(OMDEV)/tools/msys/mingw32/bin -L$$(OMDEV)/tools/msys/mingw32/lib -L$$(OPENMODELICAHOME)/../OMCompiler/3rdParty/FMIL/install/lib
+      LIBS += -L$$(OMDEV)/tools/msys/mingw32/lib/binutils -L$$(OMDEV)/tools/msys/mingw32/bin -L$$(OMDEV)/tools/msys/mingw32/lib
     } else { # 64-bit
-      LIBS += -L$$(OMDEV)/tools/msys/mingw64/lib/binutils -L$$(OMDEV)/tools/msys/mingw64/bin -L$$(OMDEV)/tools/msys/mingw64/lib -L$$(OPENMODELICAHOME)/../OMCompiler/3rdParty/FMIL/install/lib
+      LIBS += -L$$(OMDEV)/tools/msys/mingw64/lib/binutils -L$$(OMDEV)/tools/msys/mingw64/bin -L$$(OMDEV)/tools/msys/mingw64/lib
     }
     LIBS += -limagehlp -lbfd -lintl -liberty -llibosg.dll -llibosgViewer.dll -llibOpenThreads.dll -llibosgDB.dll -llibosgGA.dll
   } else { # debug
     contains(QT_ARCH, i386) { # 32-bit
-      LIBS += -L$$(OMDEV)/tools/msys/mingw32/lib -L$$(OPENMODELICAHOME)/../OMCompiler/3rdParty/FMIL/install/lib
+      LIBS += -L$$(OMDEV)/tools/msys/mingw32/lib
     } else { # 64-bit
-      LIBS += -L$$(OMDEV)/tools/msys/mingw64/lib -L$$(OPENMODELICAHOME)/../OMCompiler/3rdParty/FMIL/install/lib
+      LIBS += -L$$(OMDEV)/tools/msys/mingw64/lib
     }
     LIBS += -llibosgd.dll -llibosgViewerd.dll -llibOpenThreadsd.dll -llibosgDBd.dll -llibosgGAd.dll
   }
@@ -317,7 +317,7 @@ INCLUDEPATH += ../../qjson/build/include
 
 INCLUDEPATH += $$OPENMODELICAHOME/include/omc/scripting-API \
   $$OPENMODELICAHOME/include/omc/c/util \
-  $$OPENMODELICAHOME/../OMCompiler/3rdParty/FMIL/install/include
+  $$OPENMODELICAHOME/include/omc/fmil
 
 OTHER_FILES += Resources/css/stylesheet.qss \
   Resources/XMLSchema/tlmModelDescription.xsd \