Rename libqwt to libomqwt to avoid conflicts on OSX

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20722 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · May 21, 2014 · cc59f81 · cc59f81
1 parent b230e1e
commit cc59f81
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/OMPlot/OMPlotGUI/OMPlotGUI.config.in b/OMPlot/OMPlotGUI/OMPlotGUI.config.in
@@ -2,7 +2,7 @@ QMAKE_CC  = @CC@
 QMAKE_CXX = @CXX@
 QMAKE_LINK = @CXX@
 
-LIBS += -L ../../build/lib/omc -lOMPlot -lqwt -lgc @RPATH_QMAKE@
+LIBS += -L ../../build/lib/omc -lOMPlot -lomqwt -lgc @RPATH_QMAKE@
 INCLUDEPATH += ../../3rdParty/qwt/src ../../3rdParty/gc-7.2/include
 
 QMAKE_CFLAGS = @CFLAGS@ @CPPFLAGS@

diff --git a/OMPlot/OMPlotGUI/OMPlotGUI.pro b/OMPlot/OMPlotGUI/OMPlotGUI.pro
@@ -30,11 +30,11 @@ HEADERS  += ../../SimulationRuntime/c/util/read_matlab4.h \
 win32 {
 QMAKE_LFLAGS += -enable-auto-import
 CONFIG(debug, debug|release){
-LIBS += -lOMPlot -L../../3rdParty/qwt/build/lib -lqwtd \
+LIBS += -lOMPlot -L../../3rdParty/qwt/build/lib -lomqwtd \
     -L../../3rdParty/gc-7.2/.libs -lgc
 }
 else {
-LIBS += -lOMPlot -L../../3rdParty/qwt/build/lib -lqwt \
+LIBS += -lOMPlot -L../../3rdParty/qwt/build/lib -lomqwt \
     -L../../3rdParty/gc-7.2/.libs -lgc
 }
 INCLUDEPATH += ../../3rdParty/qwt/build/include \