Fixed OMPlot & qwt compilation for Windows.

Author: adeas31

Makefile.omdev.mingw

@@ -0,0 +1,30 @@
+ifeq ($(OMBUILDDIR),)
+$(error OMBUILDDIR variable is not set.)
+endif
+
+builddir_inc=$(OMBUILDDIR)/include
+buildbin=$(OMBUILDDIR)/bin
+buildlib=$(OMBUILDDIR)/lib/omc
+
+bindir = @bindir@
+bindir = @includedir@
+libdir = @libdir@/@host_short@/omc
+
+omplot: mkbuilddirs qwt
+	$(MAKE) -C OMPlot/OMPlotGUI -f Makefile.omdev.mingw
+
+$(buildlib)/libomqwt.a: mkbuilddirs qwt-build
+
+qwt: $(buildlib)/libomqwt.a
+
+qwt-build: mkbuilddirs
+	$(MAKE) -C qwt -f Makefile.omdev.mingw
+
+mkbuilddirs:
+	mkdir -p $(builddir_inc)/omplot/qwt
+	mkdir -p $(buildlib)
+	mkdir -p $(buildbin)
+
+clean:
+	$(MAKE) -C qwt -f Makefile.omdev.mingw clean
+	$(MAKE) -C OMPlot/OMPlotGUI -f Makefile.omdev.mingw clean

OMPlot/OMPlotGUI/Makefile.omdev.mingw

@@ -1,4 +1,6 @@
-OMBUILDDIR=../../../OMCompiler/build
+ifeq ($(OMBUILDDIR),)
+$(error OMBUILDDIR variable is not set.)
+endif
 
 QMAKE=qmake
 EXE=.exe

OMPlot/OMPlotGUI/OMPlotGUI.pro

@@ -27,12 +27,12 @@ HEADERS += Plot.h \
 win32 {
   QMAKE_LFLAGS += -enable-auto-import
   CONFIG(debug, debug|release){
-    LIBS += -L../../../OMCompiler/build/lib/omc -lOMPlot -lomqwtd
+    LIBS += -L$$(OMBUILDDIR)/lib/omc -lOMPlot -lomqwtd
   }
   else {
-    LIBS += -L../../../OMCompiler/build/lib/omc -lOMPlot -lomqwt
+    LIBS += -L$$(OMBUILDDIR)/lib/omc -lOMPlot -lomqwt
   }
-  INCLUDEPATH += ../../../OMCompiler/build/include/omc/qwt ../../../OMCompiler/build/include/omc/c
+  INCLUDEPATH += $$(OMBUILDDIR)/include/omplot/qwt $$(OMBUILDDIR)/include/omc/c
 } else {
   include(OMPlotGUI.config)
   LIBS += -lOMPlot

OMPlot/OMPlotGUI/OMPlotLib.pro

@@ -41,12 +41,12 @@ HEADERS  += Plot.h \
 
 win32 {
   CONFIG(debug, debug|release){
-    LIBS += -L../../../OMCompiler/build/lib/omc -lomqwtd
+    LIBS += -L$$(OMBUILDDIR)/lib/omc -lomqwtd
   }
   else {
-    LIBS += -L../../../OMCompiler/build/lib/omc -lomqwt
+    LIBS += -L$$(OMBUILDDIR)/lib/omc -lomqwt
   }
-  INCLUDEPATH += ../../../OMCompiler/build/include/omc/qwt ../../../OMCompiler/build/include/omc/c
+  INCLUDEPATH += $$(OMBUILDDIR)/include/omplot/qwt $$(OMBUILDDIR)/include/omc/c
 } else {
   include(OMPlotGUI.config)
 }

qwt/Makefile.omdev.mingw

@@ -1,6 +1,13 @@
 # @author Adeel Asghar <adeel.asghar@liu.se>
 #
 
+ifeq ($(OMBUILDDIR),)
+$(error OMBUILDDIR variable is not set.)
+endif
+
+builddir_inc=$(OMBUILDDIR)/include
+buildlib=$(OMBUILDDIR)/lib/omc
+
 QMAKE=qmake
 NAME=qwt
 
@@ -22,6 +29,5 @@ $(NAME): Makefile
 	$(MAKE) -f Makefile
 
 build: $(NAME)
-	$(MAKE) -f Makefile install
-	cp -puf lib/libomqwt*.a ../../OMCompiler/build/lib/omc
-	cp -puf build/include/* ../../OMCompiler/build/include/omc/qwt
+	cp -puf lib/libomqwt*.a $(buildlib)
+	test -f $(builddir_inc)/omplot/qwt/qwt_global.h || ($(MAKE) -f Makefile install && cp -a build/include/*.h $(builddir_inc)/omplot/qwt)