diff --git a/.gitignore b/.gitignore index ce250e171..f31147ff5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ +Makefile + # old skool .svn # osx noise .DS_Store -profile \ No newline at end of file +profile diff --git a/build.pro b/build.pro new file mode 100644 index 000000000..bbf54630f --- /dev/null +++ b/build.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = qwt src diff --git a/src/gcconfig.pri.in b/src/gcconfig.pri.in index b860bf77c..e3f527042 100644 --- a/src/gcconfig.pri.in +++ b/src/gcconfig.pri.in @@ -1,9 +1,8 @@ # To build, copy this file to gcconfig.pri and then fill in the paths to your -# local installs of Boost, QWT, and srmio in the copy. If you don't want +# local installs of Boost and srmio in the copy. If you don't want # support for SRM downloads, just comment out the SRMIO_INSTALL line. BOOST_INSTALL = /usr/local/boost -QWT_INSTALL = /usr/local/qwt SRMIO_INSTALL = /usr/local/srmio D2XX_INCLUDE = /usr/local/include/D2XX @@ -11,14 +10,11 @@ D2XX_INCLUDE = /usr/local/include/D2XX CONFIG += debug #CONFIG += static -# Edit these paths only if you have a Boost/QWT/srmio install that uses +# Edit these paths only if you have a Boost/srmio install that uses # a non-standard directory layout. BOOST_INCLUDE = $${BOOST_INSTALL}/include -QWT_INCLUDE = $${QWT_INSTALL}/include -QWT_LIB = $${QWT_INSTALL}/lib/libqwt.a - !isEmpty( SRMIO_INSTALL ) { SRMIO_INCLUDE = $${SRMIO_INSTALL}/include SRMIO_LIB = $${SRMIO_INSTALL}/lib/libsrmio.a diff --git a/src/src.pro b/src/src.pro index b03976480..e56037400 100644 --- a/src/src.pro +++ b/src/src.pro @@ -6,9 +6,9 @@ TEMPLATE = app TARGET = GoldenCheetah DEPENDPATH += . !isEmpty( BOOST_INCLUDE ) { INCLUDEPATH += $${BOOST_INCLUDE} } -!isEmpty( QWT_INCLUDE ) { INCLUDEPATH += $${QWT_INCLUDE} } +INCLUDEPATH += ../qwt/src QT += xml sql -LIBS += $${QWT_LIB} +LIBS += ../qwt/lib/libqwt.a LIBS += -lm !isEmpty( D2XX_INCLUDE ) {