Change libgc to libomcgc to make sure we link against the correct ver…

…sion of boehm-gc git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25319 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 30, 2015 · a8e54ba · a8e54ba
1 parent 10b18eb
commit a8e54ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/OMEdit/OMEditGUI/OMEdit.config.in b/OMEdit/OMEditGUI/OMEdit.config.in
@@ -7,7 +7,7 @@ QMAKE_CC  = @CC@
 QMAKE_CXX = @CXX@
 QMAKE_LINK = @CXX@
 
-LIBS += -L ../../build/lib/omc -lOMPlot -lomqwt -L../OMEditGUI/Debugger/Parser -lGDBMIParser -L../../Parser -lantlr3 @RPATH_QMAKE@ -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lfmilib_shared -lModelicaExternalC -lgc
+LIBS += -L ../../build/lib/omc -lOMPlot -lomqwt -L../OMEditGUI/Debugger/Parser -lGDBMIParser -L../../Parser -lantlr3 @RPATH_QMAKE@ -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lfmilib_shared -lModelicaExternalC -lomcgc
 INCLUDEPATH += ../../3rdParty/qwt/src ../../OMPlot/OMPlotGUI ../../3rdParty/antlr/3.2/libantlr3c-3.2/ ../../3rdParty/antlr/3.2/libantlr3c-3.2/include ../../build/include/omc/c
 
 QMAKE_CFLAGS = @CFLAGS@ @CPPFLAGS@

diff --git a/OMEdit/OMEditGUI/OMEditGUI.pro b/OMEdit/OMEditGUI/OMEditGUI.pro
@@ -188,7 +188,7 @@ win32 {
     -L../../build/lib/omc -lOMPlot -lomqwtd \
     -L../OMEditGUI/Debugger/Parser -lGDBMIParser \
     -L../../Parser -lantlr3 \
-    -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lfmilib -lModelicaExternalC -lgc -lpthread
+    -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lfmilib -lModelicaExternalC -lomcgc -lpthread
   } else {
     # In order to get the stack trace in Windows we must add -g flag. Qt automatically adds the -O2 flag for optimization.
     # We should also unset the QMAKE_LFLAGS_RELEASE define because it is defined as QMAKE_LFLAGS_RELEASE = -Wl,-s in qmake.conf file for MinGW
@@ -201,7 +201,7 @@ win32 {
       -L../../Parser -lantlr3 \
       # required for backtrace
       -L$$(OMDEV)/tools/mingw/bin -lintl-8 -lbfd -liberty -limagehlp \
-      -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lfmilib -lModelicaExternalC -lgc -lpthread
+      -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lfmilib -lModelicaExternalC -lomcgc -lpthread
   }
   INCLUDEPATH += $$(OMDEV)/lib/omniORB-4.1.6-mingw/include \
     ../../3rdParty/qwt/build/include \