Link to OMPlotLib instead of compiling in the objects statically (re-…

…use of the shared library is then possible) git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20721 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · May 21, 2014 · b230e1e · b230e1e
1 parent eb5b782
commit b230e1e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 21 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 -lqwt -lgc @RPATH_QMAKE@
+LIBS += -L ../../build/lib/omc -lOMPlot -lqwt -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
@@ -10,22 +10,7 @@ TARGET = OMPlot
 TEMPLATE = app
 CONFIG += console
 
-SOURCES += main.cpp \
-    ../../SimulationRuntime/c/util/read_matlab4.c \
-    ../../SimulationRuntime/c/util/libcsv.c \
-    ../../SimulationRuntime/c/util/read_csv.c \
-    ../../SimulationRuntime/c/util/string_util.c \
-    Plot.cpp \
-    PlotZoomer.cpp \
-    Legend.cpp \
-    PlotPanner.cpp \
-    PlotGrid.cpp \
-    ScaleDraw.cpp \
-    PlotCurve.cpp \
-    PlotWindow.cpp \
-    PlotApplication.cpp \
-    PlotWindowContainer.cpp \
-    PlotMainWindow.cpp
+SOURCES += main.cpp
 
 HEADERS  += ../../SimulationRuntime/c/util/read_matlab4.h \
     ../../SimulationRuntime/c/util/libcsv.h \
@@ -45,11 +30,11 @@ HEADERS  += ../../SimulationRuntime/c/util/read_matlab4.h \
 win32 {
 QMAKE_LFLAGS += -enable-auto-import
 CONFIG(debug, debug|release){
-LIBS += -L../../3rdParty/qwt/build/lib -lqwtd \
+LIBS += -lOMPlot -L../../3rdParty/qwt/build/lib -lqwtd \
     -L../../3rdParty/gc-7.2/.libs -lgc
 }
 else {
-LIBS += -L../../3rdParty/qwt/build/lib -lqwt \
+LIBS += -lOMPlot -L../../3rdParty/qwt/build/lib -lqwt \
     -L../../3rdParty/gc-7.2/.libs -lgc
 }
 INCLUDEPATH += ../../3rdParty/qwt/build/include \

diff --git a/OMPlot/OMPlotGUI/OMPlotLib.pro b/OMPlot/OMPlotGUI/OMPlotLib.pro
@@ -15,8 +15,7 @@ win32 {
 }
 QMAKE_LFLAGS += -enable-auto-import
 
-SOURCES += main.cpp \
-    ../../SimulationRuntime/c/util/read_matlab4.c \
+SOURCES += ../../SimulationRuntime/c/util/read_matlab4.c \
     ../../SimulationRuntime/c/util/libcsv.c \
     ../../SimulationRuntime/c/util/read_csv.c \
     ../../SimulationRuntime/c/util/string_util.c \