- Added configure checking of libqwt

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@8082 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 4, 2011 · ccbc97e · ccbc97e
1 parent 8528f87
commit ccbc97e
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 7 deletions.
diff --git a/OMPlot/OMPlotGUI/Makefile.unix.in b/OMPlot/OMPlotGUI/Makefile.unix.in
@@ -0,0 +1,31 @@
+top_builddir=../../
+builddir_bin=$(top_builddir)/build/bin/
+builddir_share=$(top_builddir)/build/share/
+runtimedir=$(top_builddir)/Compiler/runtime/
+
+QMAKE=@QMAKE@
+EXE=@EXE@
+NAME=OMPlot
+
+.PHONY: always
+
+all: build
+
+Makefile:
+	$(QMAKE)
+
+clean: Makefile
+	rm -rf $(NAME) $(NAME)$(EXE) Makefile
+
+$(NAME)$(EXE): Makefile
+	make -f Makefile
+ifeq ($(EXE),.app)
+$(NAME): $(NAME)$(EXE) always
+	cp -p $</Contents/MacOS/$(NAME) $@
+endif
+
+build: $(NAME)
+	cp -p $(NAME) $(builddir_bin)
+
+Makefile.unix: Makefile.unix.in
+	cd $(top_builddir); ./config.status
diff --git a/OMPlot/OMPlotGUI/OMPlotGUI.pro b/OMPlot/OMPlotGUI/OMPlotGUI.pro
@@ -18,9 +18,13 @@ plotwindow.h \
     ../../c_runtime/read_matlab4.h
 
 
-LIBS += -L $$(OMDEV)/lib/qwt-6.0.0-mingw/lib \ 
-      -lqwtd
-
-INCLUDEPATH += $$(OMDEV)/lib/qwt-6.0.0-mingw/include    
+win32 {
+  LIBS += -L $$(OMDEV)/lib/qwt-6.0.0-mingw/lib \ 
+        -lqwtd
+
+  INCLUDEPATH += $$(OMDEV)/lib/qwt-6.0.0-mingw/include
+} else {
+  include(OMPlotGUI.config)
+}
 
 DESTDIR = ../bin
diff --git a/OMPlot/OMPlotGUI/plotwindow.cpp b/OMPlot/OMPlotGUI/plotwindow.cpp
@@ -118,8 +118,8 @@ void PlotWindow::initializePlot()
     mpQwtPlot->replot();
 
     //plotpicker, Plotpanner, plotzoomer
-    mpPlotPicker = new QwtPlotPicker(QwtPlot::xBottom, QwtPlot::yLeft,
-                                     QwtPlotPicker::CrossRubberBand, QwtPicker::AlwaysOn,
+    mpPlotPicker = new QwtPlotPicker((int)QwtPlot::xBottom, (int)QwtPlot::yLeft,
+                                     (int)QwtPlotPicker::CrossRubberBand, (int) QwtPicker::AlwaysOn,
                                      mpQwtPlot->canvas());
     mpPlotPicker->setStateMachine(new QwtPickerDragPointMachine());
     mpPlotPicker->setTrackerPen(QColor(Qt::black));    

diff --git a/OMPlot/OMPlotGUI/plotwindow.h b/OMPlot/OMPlotGUI/plotwindow.h
@@ -35,6 +35,7 @@
 #include <QFileDialog>
 #include <QDockWidget>
 #include <QStatusBar>
+#include <QTextStream>
 
 #include <qwt_plot.h>
 #include <qwt_plot_curve.h>
@@ -45,7 +46,6 @@
 #include <qwt_legend.h>
 #include <qwt_plot_zoomer.h>
 #include <qwt_plot_panner.h>
-#include <qwt_plot_renderer.h>
 #include <qwt_scale_engine.h>
 #include <stdexcept>
 #include "../../c_runtime/read_matlab4.h"