Line 0
Link Here
|
|
|
1 |
--- ./qtiplot/qtiplot.pro.orig Sat Jun 2 15:33:23 2007 |
2 |
+++ ./qtiplot/qtiplot.pro Sat Jun 2 15:35:21 2007 |
3 |
@@ -17,24 +17,17 @@ |
4 |
|
5 |
# what to install and where |
6 |
INSTALLS += target |
7 |
-INSTALLS += documentation |
8 |
-unix: target.path = /usr/bin |
9 |
+#INSTALLS += documentation |
10 |
+unix: target.path = $$(PREFIX) |
11 |
unix: documentation.path = /usr/share/doc/qtiplot |
12 |
|
13 |
##################### 3rd PARTY HEADER FILES SECTION ######################## |
14 |
#!!! Warning: You must modify these paths according to your computer settings |
15 |
############################################################################# |
16 |
|
17 |
-INCLUDEPATH += ../3rdparty/muParser |
18 |
- |
19 |
-INCLUDEPATH += ../3rdparty/qwtplot3d/include |
20 |
-INCLUDEPATH += ../3rdparty/qwt/src |
21 |
-#INCLUDEPATH += /usr/include/qwtplot3d |
22 |
-#INCLUDEPATH += /usr/include/qwt5 |
23 |
- |
24 |
-INCLUDEPATH += ../3rdparty/liborigin |
25 |
-INCLUDEPATH += ../3rdparty/gsl/include |
26 |
-INCLUDEPATH += ../3rdparty/zlib123/include |
27 |
+unix:INCLUDEPATH += $$(LOCALBASE)/include |
28 |
+unix:INCLUDEPATH += $$(LOCALBASE)/include/qwt |
29 |
+unix:INCLUDEPATH += $$(LOCALBASE)/include/qwtplot3d-qt4 |
30 |
|
31 |
##################### 3rd PARTY LIBRARIES SECTION ########################### |
32 |
#!!! Warning: You must modify these paths according to your computer settings |
33 |
@@ -47,18 +40,18 @@ |
34 |
unix:LIBS += -L /usr/lib$${libsuff} |
35 |
|
36 |
# statically link against Qwt(3D) in 3rdparty |
37 |
-unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a |
38 |
-unix:LIBS += ../3rdparty/qwt/lib/libqwt.a |
39 |
+unix:LIBS += -L$$(LOCALBASE)/lib -lqwt -lqwtplot3d-qt4 -lorigin |
40 |
+unix:LIBS += -lz -lmuparser |
41 |
# dynamically link against Qwt(3D) installed system-wide |
42 |
# WARNING: make sure they are compiled against Qt4 |
43 |
#unix:LIBS += -lqwtplot3d |
44 |
#unix:LIBS += -lqwt |
45 |
|
46 |
# statically link against GSL in 3rdparty |
47 |
-unix:LIBS += ../3rdparty/gsl/lib/libgsl.a |
48 |
-unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a |
49 |
+#unix:LIBS += ../3rdparty/gsl/lib/libgsl.a |
50 |
+#unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a |
51 |
#dynamically link against GSL installed system-wide |
52 |
-#unix:LIBS += -lgsl -lgslcblas |
53 |
+unix:LIBS += -lgsl -lgslcblas |
54 |
|
55 |
##################### Windows ############################################### |
56 |
|
57 |
@@ -110,8 +103,8 @@ |
58 |
translations/qtiplot_ja.ts \ |
59 |
translations/qtiplot_sv.ts |
60 |
|
61 |
-#system(lupdate -verbose qtiplot.pro) |
62 |
-#system(lrelease -verbose qtiplot.pro) |
63 |
+system($$(LOCALBASE)/bin/lupdate-qt4 -verbose qtiplot.pro) |
64 |
+system($$(LOCALBASE)/bin/lrelease-qt4 -verbose qtiplot.pro) |
65 |
|
66 |
###################### DOCUMENTATION ######################################## |
67 |
|
68 |
@@ -350,8 +343,8 @@ |
69 |
################# Origin Import (liborigin) ################### |
70 |
############################################################### |
71 |
|
72 |
-HEADERS += ../3rdparty/liborigin/OPJFile.h |
73 |
-SOURCES += ../3rdparty/liborigin/OPJFile.cpp |
74 |
+#HEADERS += ../3rdparty/liborigin/OPJFile.h |
75 |
+#SOURCES += ../3rdparty/liborigin/OPJFile.cpp |
76 |
|
77 |
############################################################### |
78 |
##################### SCRIPTING LANGUAGES SECTION ############# |
79 |
@@ -361,30 +354,32 @@ |
80 |
|
81 |
contains(SCRIPTING_LANGS, muParser) { |
82 |
DEFINES += SCRIPTING_MUPARSER |
83 |
- |
84 |
+ |
85 |
+ unix:LIBS += -lmuparser |
86 |
+ |
87 |
HEADERS += src/muParserScript.h \ |
88 |
src/muParserScripting.h \ |
89 |
- ../3rdparty/muParser/muParser.h \ |
90 |
- ../3rdparty/muParser/muParserBase.h \ |
91 |
- ../3rdparty/muParser/muParserInt.h \ |
92 |
- ../3rdparty/muParser/muParserError.h \ |
93 |
- ../3rdparty/muParser/muParserStack.h \ |
94 |
- ../3rdparty/muParser/muParserToken.h \ |
95 |
- ../3rdparty/muParser/muParserBytecode.h \ |
96 |
- ../3rdparty/muParser/muParserCallback.h \ |
97 |
- ../3rdparty/muParser/muParserTokenReader.h \ |
98 |
- ../3rdparty/muParser/muParserFixes.h \ |
99 |
- ../3rdparty/muParser/muParserDef.h \ |
100 |
+# ../3rdparty/muParser/muParser.h \ |
101 |
+# ../3rdparty/muParser/muParserBase.h \ |
102 |
+# ../3rdparty/muParser/muParserInt.h \ |
103 |
+# ../3rdparty/muParser/muParserError.h \ |
104 |
+# ../3rdparty/muParser/muParserStack.h \ |
105 |
+# ../3rdparty/muParser/muParserToken.h \ |
106 |
+# ../3rdparty/muParser/muParserBytecode.h \ |
107 |
+# ../3rdparty/muParser/muParserCallback.h \ |
108 |
+# ../3rdparty/muParser/muParserTokenReader.h \ |
109 |
+# ../3rdparty/muParser/muParserFixes.h \ |
110 |
+# ../3rdparty/muParser/muParserDef.h \ |
111 |
|
112 |
SOURCES += src/muParserScript.cpp \ |
113 |
src/muParserScripting.cpp \ |
114 |
- ../3rdparty/muParser/muParser.cpp \ |
115 |
- ../3rdparty/muParser/muParserBase.cpp \ |
116 |
- ../3rdparty/muParser/muParserInt.cpp \ |
117 |
- ../3rdparty/muParser/muParserBytecode.cpp \ |
118 |
- ../3rdparty/muParser/muParserCallback.cpp \ |
119 |
- ../3rdparty/muParser/muParserTokenReader.cpp \ |
120 |
- ../3rdparty/muParser/muParserError.cpp \ |
121 |
+# ../3rdparty/muParser/muParser.cpp \ |
122 |
+# ../3rdparty/muParser/muParserBase.cpp \ |
123 |
+# ../3rdparty/muParser/muParserInt.cpp \ |
124 |
+# ../3rdparty/muParser/muParserBytecode.cpp \ |
125 |
+# ../3rdparty/muParser/muParserCallback.cpp \ |
126 |
+# ../3rdparty/muParser/muParserTokenReader.cpp \ |
127 |
+# ../3rdparty/muParser/muParserError.cpp \ |
128 |
|
129 |
} |
130 |
|
131 |
@@ -396,12 +391,11 @@ |
132 |
SOURCES += src/PythonScript.cpp src/PythonScripting.cpp |
133 |
|
134 |
unix { |
135 |
- INCLUDEPATH += $$system(python python-includepath.py) |
136 |
- LIBS += $$system(python -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"") |
137 |
- LIBS += -lm |
138 |
- system(mkdir -p $${SIP_DIR}) |
139 |
- system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/qti.sip) |
140 |
- } |
141 |
+ INCLUDEPATH += $$(PYTHON_INCLUDEDIR) |
142 |
+ LIBS += -lm -l$$(PYTHON_VERSION) |
143 |
+ system(mkdir -p $${SIP_DIR}) |
144 |
+ system($$(PYTHON_VERSION) -c $${SIP_DIR} src/qti.sip) |
145 |
+ } |
146 |
|
147 |
win32 { |
148 |
INCLUDEPATH += $$system(call python-includepath.py) |