You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2p...

77 lines
2.4 KiB

3rdparty/qwtplot3d/qwtplot3d.pri | 8 ++++----
3rdparty/qwtplot3d/qwtplot3d.pro | 3 ---
3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp | 2 +-
3rdparty/qwtplot3d/src/qwt3d_label.cpp | 2 +-
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/3rdparty/qwtplot3d/qwtplot3d.pri b/3rdparty/qwtplot3d/qwtplot3d.pri
index 45a0c3e..16bbe53 100755
--- a/3rdparty/qwtplot3d/qwtplot3d.pri
+++ b/3rdparty/qwtplot3d/qwtplot3d.pri
@@ -8,6 +8,8 @@ DEPENDPATH += src \
3rdparty\gl2ps
INCLUDEPATH += .
+LIBS+=-lgl2ps
+
# Input
HEADERS += include/qwt3d_extglwidget.h \
include/qwt3d_color.h \
@@ -37,8 +39,7 @@ HEADERS += include/qwt3d_extglwidget.h \
include/qwt3d_volumeplot.h \
include/qwt3d_graphplot.h \
include/qwt3d_multiplot.h \
- include/qwt3d_io_gl2ps.h \
- 3rdparty/gl2ps/gl2ps.h
+ include/qwt3d_io_gl2ps.h
SOURCES += src/qwt3d_extglwidget.cpp \
src/qwt3d_axis.cpp \
src/qwt3d_color.cpp \
@@ -62,5 +63,4 @@ SOURCES += src/qwt3d_extglwidget.cpp \
src/qwt3d_function.cpp \
src/qwt3d_gridplot.cpp \
src/qwt3d_meshplot.cpp \
- src/qwt3d_io_gl2ps.cpp \
- 3rdparty/gl2ps/gl2ps.c
+ src/qwt3d_io_gl2ps.cpp
diff --git a/3rdparty/qwtplot3d/qwtplot3d.pro b/3rdparty/qwtplot3d/qwtplot3d.pro
index 95c8e26..18d03e3 100755
--- a/3rdparty/qwtplot3d/qwtplot3d.pro
+++ b/3rdparty/qwtplot3d/qwtplot3d.pro
@@ -31,9 +31,6 @@ RCC_DIR = $$DESTDIR/tmp
MOC_DIR = $$DESTDIR/tmp
DEFINES += GL2PS_HAVE_LIBPNG
-INCLUDEPATH += ../zlib/
-INCLUDEPATH += ../libpng/
-LIBS += ../libpng/libpng.a
# install
target.path = lib
diff --git a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
index bc7a9d8..589cfd2 100755
--- a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
+++ b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
@@ -6,7 +6,7 @@
#include <locale.h>
#include "qwt3d_openglhelper.h"
-#include "../3rdparty/gl2ps/gl2ps.h"
+#include "gl2ps.h"
#include "qwt3d_io_gl2ps.h"
#include "qwt3d_plot.h"
diff --git a/3rdparty/qwtplot3d/src/qwt3d_label.cpp b/3rdparty/qwtplot3d/src/qwt3d_label.cpp
index 7e54ad9..cc8bd60 100755
--- a/3rdparty/qwtplot3d/src/qwt3d_label.cpp
+++ b/3rdparty/qwtplot3d/src/qwt3d_label.cpp
@@ -1,7 +1,7 @@
#include <qbitmap.h>
#include "qwt3d_label.h"
#include "qwt3d_plot.h"
-#include "../3rdparty/gl2ps/gl2ps.h"
+#include "gl2ps.h"
using namespace Qwt3D;