Make OMEdit use rpath-link to ease linking

sjoelund · sjoelund · commit db25f7e54a50 · 2016-04-15T16:30:45.000+02:00
diff --git a/OMEdit/OMEditGUI/OMEdit.config.in b/OMEdit/OMEditGUI/OMEdit.config.in
@@ -6,7 +6,7 @@ QMAKE_LINK = @CXX@
 
 OPENMODELICAHOME = @OPENMODELICAHOME@
 
-LIBS += -L @OPENMODELICAHOME@/lib/@host_short@/omc -lOMPlot -lomqwt -L../OMEditGUI/Debugger/Parser -lGDBMIParser -lomantlr3 @RPATH_QMAKE@ -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lfmilib_shared -lModelicaExternalC -lomcgc -L@OMBUILDDIR@/lib/@host_short@/omc
+LIBS += -L @OPENMODELICAHOME@/lib/@host_short@/omc -lOMPlot -lomqwt -L../OMEditGUI/Debugger/Parser -lGDBMIParser -lomantlr3 @RPATH_QMAKE@ -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lomcgc -L@OMBUILDDIR@/lib/@host_short@/omc
 INCLUDEPATH += @OPENMODELICAHOME@/include/omc/scripting-API @OPENMODELICAHOME@/include/omplot @OPENMODELICAHOME@/include/omplot/qwt @OPENMODELICAHOME@/include/@host_short@/omc/antlr3 @OPENMODELICAHOME@/include/omc/c ../../qjson-0.8.1/build/include
 
 QMAKE_CFLAGS = @CFLAGS@ @CPPFLAGS@
diff --git a/common b/common
@@ -1 +1 @@
-Subproject commit c535ec79728ac2887d46e802cfe0e5bc310acb76
+Subproject commit 2fe814f59e21e5eb91ccfd51950819c0e953e589
