Hopefully fixes the Linux builds for qwt (shared version)

- Also should add OMOptimBasis as a shared library git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20717 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · May 21, 2014 · eb5b782 · eb5b782
1 parent 247509b
commit eb5b782
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/OMPlot/OMPlotGUI/Makefile.unix.in b/OMPlot/OMPlotGUI/Makefile.unix.in
@@ -20,7 +20,7 @@ Makefile: OMPlotGUI.pro OMPlotGUI.config
 Makefile.lib: Makefile OMPlotLib.pro OMPlotGUI.config
 	@rm -f $@
 	$(QMAKE) OMPlotLib.pro -o $@
-
+	cp -a ../bin/libOMPlot* $(top_builddir)/build/lib/omc/
 clean:
 	test ! -f Makefile || $(MAKE) -f Makefile clean
 	test ! -f Makefile.lib || $(MAKE) -f Makefile.lib clean

diff --git a/OMPlot/OMPlotGUI/OMPlotGUI.config.in b/OMPlot/OMPlotGUI/OMPlotGUI.config.in
@@ -2,8 +2,8 @@ QMAKE_CC  = @CC@
 QMAKE_CXX = @CXX@
 QMAKE_LINK = @CXX@
 
-LIBS += -L../../3rdParty/qwt/build/lib -lqwt -L ../../build/lib/omc -lgc @RPATH_QMAKE@
-INCLUDEPATH += ../../3rdParty/qwt/build/include ../../3rdParty/gc-7.2/include
+LIBS += -L ../../build/lib/omc -lqwt -lgc @RPATH_QMAKE@
+INCLUDEPATH += ../../3rdParty/qwt/src ../../3rdParty/gc-7.2/include
 
 QMAKE_CFLAGS = @CFLAGS@ @CPPFLAGS@
 QMAKE_CXXFLAGS = @CFLAGS@ @CPPFLAGS@

diff --git a/OMPlot/OMPlotGUI/OMPlotLib.pro b/OMPlot/OMPlotGUI/OMPlotLib.pro
@@ -9,7 +9,10 @@ QT += core gui
 TARGET = OMPlot
 TEMPLATE = lib
 
-CONFIG += release staticlib
+CONFIG += release
+win32 {
+ CONFIG += staticlib
+}
 QMAKE_LFLAGS += -enable-auto-import
 
 SOURCES += main.cpp \
@@ -50,8 +53,7 @@ LIBS += -L../../3rdParty/qwt/build/lib -lqwtd \
     -L../../3rdParty/gc-7.2/.libs -lgc
 }
 else {
-LIBS += -L../../3rdParty/qwt/build/lib -lqwt \
-    -L../../3rdParty/gc-7.2/.libs -lgc
+LIBS += -L../../build/lib/omc/ -lqwt -lgc
 }
 INCLUDEPATH += ../../3rdParty/qwt/build/include \
     ../../3rdParty/gc-7.2/include