--- qtiplot/qtiplot.pro.orig 2008-04-24 18:54:47.622675411 +0000 +++ qtiplot/qtiplot.pro 2008-04-24 19:01:18.639824832 +0000 @@ -30,12 +30,11 @@ #!!! Warning: You must modify these paths according to your computer settings ############################################################################# -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 ########################### #!!! Warning: You must modify these paths according to your computer settings @@ -44,17 +43,19 @@ ##################### Linux (Mac OS X) ###################################### # 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 ############################################### @@ -147,8 +148,7 @@ manual.files += ../manual/html \ ../manual/qtiplot-manual-en.pdf -documentation.files += ../README.html \ - ../gpl_licence.txt +documentation.files += ../README.html unix: man.files += ../qtiplot.1 @@ -403,8 +403,8 @@ ################# Origin Import (liborigin) ################### ############################################################### -HEADERS += ../3rdparty/liborigin/OPJFile.h -SOURCES += ../3rdparty/liborigin/OPJFile.cpp +#HEADERS += ../3rdparty/liborigin/OPJFile.h +#SOURCES += ../3rdparty/liborigin/OPJFile.cpp ############################################################### ################# Module: Plot 2D #############################