Fixed compilation.

OpenModelica · May 5, 2015 · ecfaaf7 · ecfaaf7
1 parent a4b3fc3
commit ecfaaf7
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,16 +4,26 @@ qwt/Makefile.unix
 qwt/build
 qwt/lib
 qwt/src/Makefile
+qwt/src/Makefile.Debug
+qwt/src/Makefile.Release
+qwt/src/object_script.*
 qwt/src/moc
 qwt/src/obj
 /build
 *.o
 OMPlot/bin
 OMPlot/generatedfiles
 OMPlot/OMPlotGUI/Makefile
+OMPlot/OMPlotGUI/Makefile.Debug
+OMPlot/OMPlotGUI/Makefile.Release
 OMPlot/OMPlotGUI/Makefile.lib
+OMPlot/OMPlotGUI/Makefile.lib.Debug
+OMPlot/OMPlotGUI/Makefile.lib.Release
 OMPlot/OMPlotGUI/Makefile.unix
+OMPlot/OMPlotGUI/object_script.*
 OMPlot/OMPlotGUI/OMPlotGUI.config
+OMPlot/OMPlotGUI/OMPlotGUI.pro.*
+OMPlot/OMPlotGUI/OMPlotLib.pro.*
 config.*
 configure
 autom4te.cache

diff --git a/OMPlot/OMPlotGUI/Makefile.omdev.mingw b/OMPlot/OMPlotGUI/Makefile.omdev.mingw
@@ -0,0 +1,41 @@
+OMBUILDDIR=../../../OMCompiler/build
+
+QMAKE=qmake
+EXE=.exe
+NAME=OMPlot
+LIB=libOMPlot
+LIBEXE=.a
+
+.PHONY: always $(NAME) $(LIB)
+
+all: build
+
+Makefile: OMPlotGUI.pro
+	@rm -f $@
+	$(QMAKE) "CONFIG+=release"
+
+Makefile.lib: Makefile OMPlotLib.pro
+	@rm -f $@
+	$(QMAKE) "CONFIG+=release" OMPlotLib.pro -o $@
+
+clean: Makefile Makefile.lib
+	test ! -f Makefile || $(MAKE) -f Makefile clean
+	test ! -f Makefile.lib || $(MAKE) -f Makefile.lib clean
+	rm -rf ../bin/$(LIB)$(LIBEXE) ../bin/$(NAME)$(EXE) Makefile Makefile.Debug Makefile.Release Makefile.lib Makefile.lib.Debug Makefile.lib.Release object_script.*
+
+$(NAME): Makefile $(LIB)
+	$(MAKE) -f Makefile
+
+$(LIB): Makefile.lib
+	$(MAKE) -f $<
+	cp -p ../bin/$(LIB)$(LIBEXE) $(OMBUILDDIR)/lib/omc
+
+build: $(NAME) $(LIB)
+	cp -p ../bin/$(NAME)$(EXE) $(OMBUILDDIR)/bin
+	cp -puf $(OMDEV)/tools/OMTools/dll/mingwm10.dll $(OMBUILDDIR)/bin
+	cp -puf $(OMDEV)/tools/OMTools/dll/libgcc_s_dw2-1.dll $(OMBUILDDIR)/bin
+	cp -puf $(OMDEV)/tools/OMTools/dll/QtCore4.dll $(OMBUILDDIR)/bin
+	cp -puf $(OMDEV)/tools/OMTools/dll/QtGui4.dll $(OMBUILDDIR)/bin
+	cp -puf $(OMDEV)/tools/OMTools/dll/QtSvg4.dll $(OMBUILDDIR)/bin
+	mkdir -p $(OMBUILDDIR)/bin/iconengines/
+	cp -puf $(OMDEV)/tools/OMTools/dll/qsvgicon4.dll $(OMBUILDDIR)/bin/iconengines/
diff --git a/OMPlot/OMPlotGUI/OMPlotGUI.pro b/OMPlot/OMPlotGUI/OMPlotGUI.pro
@@ -25,14 +25,14 @@ HEADERS += Plot.h \
     PlotMainWindow.h
 
 win32 {
-QMAKE_LFLAGS += -enable-auto-import
-CONFIG(debug, debug|release){
-LIBS += -L../../build/lib/omc -lOMPlot -lomqwtd
-}
-else {
-LIBS += -L../../build/lib/omc -lOMPlot -lomqwt
-}
-INCLUDEPATH += ../../3rdParty/qwt/build/include
+  QMAKE_LFLAGS += -enable-auto-import
+  CONFIG(debug, debug|release){
+    LIBS += -L../../../OMCompiler/build/lib/omc -lOMPlot -lomqwtd
+  }
+  else {
+    LIBS += -L../../../OMCompiler/build/lib/omc -lOMPlot -lomqwt
+  }
+  INCLUDEPATH += ../../../OMCompiler/build/include/omc/qwt ../../../OMCompiler/build/include/omc/c
 } else {
   include(OMPlotGUI.config)
   LIBS += -lOMPlot

diff --git a/OMPlot/OMPlotGUI/OMPlotLib.pro b/OMPlot/OMPlotGUI/OMPlotLib.pro
@@ -40,13 +40,13 @@ HEADERS  += Plot.h \
     PlotMainWindow.h
 
 win32 {
-CONFIG(debug, debug|release){
-LIBS += -L../../build/lib/omc -lomqwtd
-}
-else {
-LIBS += -L../../build/lib/omc -lomqwt
-}
-INCLUDEPATH += ../../3rdParty/qwt/build/include
+  CONFIG(debug, debug|release){
+    LIBS += -L../../../OMCompiler/build/lib/omc -lomqwtd
+  }
+  else {
+    LIBS += -L../../../OMCompiler/build/lib/omc -lomqwt
+  }
+  INCLUDEPATH += ../../../OMCompiler/build/include/omc/qwt ../../../OMCompiler/build/include/omc/c
 } else {
   include(OMPlotGUI.config)
 }

diff --git a/qwt/Makefile.omdev.mingw b/qwt/Makefile.omdev.mingw
@@ -1,7 +1,5 @@
 # @author Adeel Asghar <adeel.asghar@liu.se>
 #
-# RCS: $Id: Makefile.omdev.mingw 76 2014-06-02 20:41:49Z adeas31 $
-#
 
 QMAKE=qmake
 NAME=qwt
@@ -25,4 +23,5 @@ $(NAME): Makefile
 
 build: $(NAME)
 	$(MAKE) -f Makefile install
-	cp -puf lib/libomqwt*.a ../../build/lib/omc
+	cp -puf lib/libomqwt*.a ../../OMCompiler/build/lib/omc
+	cp -puf build/include/* ../../OMCompiler/build/include/omc/qwt