blob: fb8ba3f71fd9f9877922cbd886d5dd90bad4bfb2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
diff -r -U2 qtiplot-0.9.6.2.orig/qtiplot/qtiplot.pro qtiplot-0.9.6.2/qtiplot/qtiplot.pro
--- qtiplot-0.9.6.2.orig/qtiplot/qtiplot.pro 2008-05-19 14:26:41.000000000 +0700
+++ qtiplot-0.9.6.2/qtiplot/qtiplot.pro 2008-05-25 07:47:27.000000000 +0700
@@ -18,5 +18,5 @@
# the *.path variables defined bellow.
######################################################################################
-#CONFIG += CustomInstall
+CONFIG += CustomInstall
CONFIG += release
@@ -28,10 +28,9 @@
#############################################################################
-INCLUDEPATH += ../3rdparty/muparser/include
-INCLUDEPATH += ../3rdparty/qwtplot3d/include
-INCLUDEPATH += ../3rdparty/qwt/src
-INCLUDEPATH += ../3rdparty/liborigin
-INCLUDEPATH += ../3rdparty/gsl/include
-INCLUDEPATH += ../3rdparty/zlib123/include
+INCLUDEPATH += /usr/include/muparser
+INCLUDEPATH += /usr/include/qwtplot3d
+INCLUDEPATH += /usr/include/qwt5
+INCLUDEPATH += /usr/include/liborigin
+INCLUDEPATH += /usr/include/gsl
##################### 3rd PARTY LIBRARIES SECTION ###########################
@@ -42,15 +41,17 @@
# statically link against libraries in 3rdparty
-unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a
-unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
-unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
-unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
-unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
+#unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a
+#unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+#unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
+#unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
+#unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
# dynamically link against dependencies if they are installed system-wide
-#unix:LIBS += -lmuparser
-#unix:LIBS += -lqwtplot3d
-#unix:LIBS += -lqwt
-#unix:LIBS += -lgsl -lgslcblas
+unix:LIBS += -lmuparser
+unix:LIBS += -lqwtplot3d
+unix:LIBS += -lqwt
+unix:LIBS += $$system(pkg-config --libs gsl)
+unix:LIBS += -lorigin
+unix:LIBS += -lz
##################### Windows ###############################################
@@ -240,6 +241,6 @@
###############################################################
- HEADERS += ../3rdparty/liborigin/OPJFile.h
- SOURCES += ../3rdparty/liborigin/OPJFile.cpp
+# HEADERS += ../3rdparty/liborigin/OPJFile.h
+# SOURCES += ../3rdparty/liborigin/OPJFile.cpp
###############################################################
|
GitWeb
