From 28118cf6e3810bb31c68815a535f59d8245d5671 Mon Sep 17 00:00:00 2001 From: Gareth Coco Date: Tue, 31 Jan 2012 23:44:53 -0500 Subject: [PATCH] Overhaul gcconfig.pri.in and src.pro Changes to src.pro are to make it so that anything that is set in src.pro can be overwritten out of gcconfig.pri. This hopefully means that src.pro will never have to be changed by someone wanting to compile the code using a different setup to the main developers or on different platform. Changes to gcconfig.pri.in are to allow the changes in src.pro to be used. It also adds some new tweaks and documents how to use the changes in the file. --- src/gcconfig.pri.in | 235 ++++++++++++++++++++++++++------------------ src/src.pro | 176 +++++++++++++++++---------------- 2 files changed, 232 insertions(+), 179 deletions(-) diff --git a/src/gcconfig.pri.in b/src/gcconfig.pri.in index 1b7b25c94..ce9b6d61a 100644 --- a/src/gcconfig.pri.in +++ b/src/gcconfig.pri.in @@ -1,19 +1,24 @@ -# To build, copy this file to gcconfig.pri and then fill in the paths to your -# 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, but make -# sure you have installed a version of srmio with PCIV/7 support (please -# check http://www.zuto.de/project/srmio/ or build from git://github.com/rclasen/srmio.git +# To build, copy this file to gcconfig.pri and then fill in the paths. -BOOST_INSTALL = /usr/local/boost -SRMIO_INSTALL = /usr/local/srmio -D2XX_INCLUDE = /usr/local/include/D2XX +# You can define the name of the executage file here. +# If you do not specify anything then we deafult to: GoldenCheetah +#APP_NAME = -# We use g++ on all platforms so switch on -# auto vectorization amongst other things to -# speed up looping over ride file points +# We recommend a debug build for development and a release build for deployment +#CONFIG += debug +#CONFIG += release + +# If you want a console window to appear on Windows machines +# then uncomment the following two lines. +#CONFIG += console +#QMAKE_LFLAGS = -mwindows + +# We use g++ on all platforms so switch on auto vectorization amongst other +# things to speed up looping over ride file points #QMAKE_CXXFLAGS += -O3 -#let us know where flex/bison are: +# Let us know where flex and bison are installed. +# You may need to specify the full path if things don't work. #QMAKE_LEX = flex #QMAKE_YACC = bison #win32 { @@ -22,35 +27,75 @@ D2XX_INCLUDE = /usr/local/include/D2XX # QMAKE_DEL_FILE = rm -f #} +# Set path to the root of the boost include files. +# If the files are in /usr/include/boost then set +# BOOST_INCLUDE = /usr/include +# If you do not define BOOST_INCLUDE the application may or may not compile. +BOOST_INCLUDE = + +# If you want SRM download support you must install SRMIO +# http://www.zuto.de/project/srmio/ +# Set path to the root of the SRMIO installation +# If you installed in /usr/local/srmio then set +# SRMIO_INSTALL = /usr/local/srmio +# This will automatically set: +# SRMIO_INCLUDE = $${SRMIO_INSTALL}/include +# SRMIO_LIBS = $${SRMIO_INSTALL}/lib/libsrmio.a +# You may override the INCLUDE and LIB files if you like. +# You *must* define SRMIO_INSTALL to use this feature. +#SRMIO_INSTALL = +#SRMIO_INCLUDE = +#SRMIO_LIBS = + +# If you want D2XX device downloads, you need the D2XX libraries +# http://www.ftdichip.com/Drivers/D2XX.htm +# Set path to where the D2XX include file (d2xx.h) is located +# If the files are in /usr/include/d2xx then set +# D2XX = /usr/include/d2xx +# If for some reason you need a library to compile d2xx support +# specify it on the D2XX_LIBS = line. +# You *must* define D2XX_INCLUDE to use this feature. +#D2XX_INCLUDE = +#D2XX_LIBS = + # If you want Twitter support you must install liboauth -# http://liboauth.sourceforge.net/ -# Set the path to where liboauth.a was installed -# By default it will have been installed like this: -# -#LIBOAUTH_INSTALL = /usr/local -#LIBCRYPTO_INSTALL = -lcrypto -#LIBCURL_INSTALL=-lcurl -#LIBZ_INSTALL=-lz +# http://liboauth.sourceforge.net/ +# Set path to the root of the OAUTH installation +# If you installed in /usr/local/oauth then set +# LIBOAUTH_INSTALL = /usr/local/oauth +# This will automatically set: +# LIBOAUTH_INCLUDE = $${LIBOAUTH_INSTALL}/include +# LIBOAUTH_LIBS = $${LIBOAUTH_INSTALL}/lib/liboauth.a -lcurl -lcrypto -lz +# You may override the INCLUDE and LIB files if you like. +# You *must* define LIBOAUTH_INSTALL to use this feature. +#LIBOAUTH_INSTALL = +#LIBOAUTH_INCLUDE = +#LIBOAUTH_LIBS = # If you want 3D plotting, you need to install qwtplot3d -# -# http://qwtplot3d.sourceforge.net/ -# -# If you are running Linux and have font problems, download -# the Tar ball from http://qwtplot3d.svn.sourceforge.net/viewvc/qwtplot3d/ -# Follow Branches -> Maintain_0_2_x -> qwtplot3d -# -## then set the following variable appropriately: +# http://qwtplot3d.sourceforge.net/ +# If you are running Linux and have font problems, download +# the Tar ball from http://qwtplot3d.svn.sourceforge.net/viewvc/qwtplot3d/ +# Follow Branches -> Maintain_0_2_x -> qwtplot3d +# Set path to the root of the qwtplot3d installation +# If you installed in /usr/local/qwtplot3d then set +# QWT3D_INSTALL = /usr/local/qwtplot3d +# This will automatically set: +# QWT3D_INCLUDE = $${QWT3D_INSTALL}/include +# QWT3D_LIBS = $${QWT3D_INSTALL}/lib/libqwtplot3d.a +# You may override the INCLUDE and LIB files if you like. +# You *must* define QWT3D_INSTALL to use this feature. +#QWT3D_INSTALL = +#QWT3D_INCLUDE = +#QWT3D_LIBS = -#QWT3D_INSTALL = /usr/local/qwtplot3d - -# If you want TrainingPeaks.com upload/download you need -# to install the Qt Soap add-on -# -# http://qt.nokia.com/products/appdev/add-on-products/catalog/4/Utilities/qtsoap -# -# then set the following variable appropriately: -#QTSOAP_INSTALL = /usr/local/qtsoap-2.7_1-opensource/ +# For TrainingPeaks.com upload/download you need to install the Qt Soap add-on +# http://qt.nokia.com/products/appdev/add-on-products/catalog/4/Utilities/qtsoap +# If qtsoap.pri is install in /usr/local/qtsolutions/soap/ then set +# QTSOAP_INSTALL = /usr/local/qtsolutions/soap +# By default we use a copy of Qt Soap in the GIT repository. +# You *must* define QTSOAP_INSTALL to use a different version than this. +#QTSOAP_INSTALL = # If you want support for Google Earth .kml files then you need # to install the Google libkml library @@ -59,45 +104,47 @@ D2XX_INCLUDE = /usr/local/include/D2XX # or on Linux sudo apt-get install libkml-dev # # then set the following variable appropriately -# to the root of the libs/includ path +# to the root of the libs/include path #KML_INSTALL = /usr/local +#KML_INCLUDE = +#KML_LIBS = -# If you want support for Downloading iCal calendars -# you will need to install libical -# -# http://sourceforge.net/projects/freeassociation/ -# -# then set the following variable appropriately -# to the root of the libs/includ path -#ICAL_INSTALL = /usr/local/libical +# If you want support for downloading from iCal calendars you will need libical +# http://sourceforge.net/projects/freeassociation/ +# Set path to the root of the libical installation +# If you installed in /usr/local/libical then set +# ICAL_INSTALL = /usr/local/libical +# This will automatically set: +# ICAL_INCLUDE = $${ICAL_INSTALL}/include +# ICAL_LIBS = $${ICAL_INSTALL}/lib/libical.a +# You may override the INCLUDE and LIB files if you like. +# You *must* define ICAL_INSTALL to use this feature. +#ICAL_INSTALL = +#ICAL_INCLUDE = +#ICAL_LIBS = -# SliLabs USB Xpress SDK -# ** note this is only required on windows, on Mac and Linux -# ** the USB stick is presented as a serial device. -# If you want support for using USB1 sticks in realtime -# then install the SiLabs USBXpress development kit -# from http://www.silabs.com/products/mcu/Pages/USBXpress.aspx -# and set the following to the 'Host' directory within the -# SDK, the value below is correct if you install using the default -# pathname (SiLabs in your root directory) -#USBXPRESS_INSTALL=/c/SiLabs/MCU/USBXpress/USBXpress_API/Host/ +# If you want support for using USB1 sticks in Train View on Windows +# then install the SiLabs USBXpress Software Development Kit (SDK) +# http://www.silabs.com/products/mcu/Pages/USBXpress.aspx +# and set the following to the 'Host' directory within the SDK +# USBXPRESS_INSTALL = /c/SiLabs/MCU/USBXpress/USBXpress_API/Host/ +# You may override the INCLUDE and LIB files if you like. +# You *must* define USBXPRESS_INSTALL to use this feature. +#USBXPRESS_INSTALL = +#USBXPRESS_INCLUDE = +#USBXPRESS_LIBS = -# Libusb 0.1.12 -# Note this is also only required on build support for Train View -# to support Garmin USB2 sticks -# -# For Windows builds: -# You must make sure you install v0.1.12.2 of libusb-win from: -# http://sourceforge.net/projects/libusb-win32/files/libusb-win32-releases/0.1.12.2/ -#LIBUSB_INSTALL=/c/libusb-win32-device-bin-0.1.12.2 -# -# For Linux and OS X builds: -# You must make sure you libusb v0.1.12.2 from: -# http://prdownloads.sourceforge.net/libusb/libusb-0.1.12.tar.gz -# it has been placed in the contrib directory, but you will need -# to configure and build it separately, take care to build for the -# right target architecture on OSX (i386) to avoid linker errors -#LIBUSB_INSTALL=/usr/local +# If you want support for using USB2 sticks in Train View on Linux or Windows +# then you need to install libusb (Linux) or libusb-win32 (Windows) version 0.1.12 +# For Linux builds download: (There is a copy in the contrib directory) +# http://prdownloads.sourceforge.net/libusb/libusb-0.1.12.tar.gz +# For Windows builds download: +# http://sourceforge.net/projects/libusb-win32/files/libusb-win32-releases/0.1.12.2/ +# You may override the INCLUDE and LIB files if you like. +# You *must* define LIBUSB_INSTALL to use this feature. +#LIBUSB_INSTALL = /usr/local +#LIBUSB_INCLUDE = +#LIBUSB_LIBS = # if you want video playback on training mode then # download and install vlc (videolan) from @@ -106,30 +153,33 @@ D2XX_INCLUDE = /usr/local/include/D2XX # will need to use the latest distro (e.g. Meerkat # on Ubuntu) to be sure apt-get installs the latest # builds (we need 1.1.8 or higher). -# e.g. LINUX -#VLC_INSTALL = /usr/include/vlc/ -# e.g. WINDOWS -#VLC_INSTALL = /c/GC/vlc-1.1.8/sdk -# +# Set path to the root of the VLC installation +# If the are installed in /usr/local/vlc then set +# VLC_INSTALL = /usr/local/vlc +# This will automatically set (Windows and Unix): +# VLC_INCLUDE = $${VLC_INSTALL}/include +# For Windows +# VLC_LIBS = $${VLC_INSTALL}/lib/libvlc.dll.a $${VLC_INSTALL}/lib/libvlccore.dll.a +# For Unix +# VLC_LIBS = -lvlc -lvlccore +# You may override the INCLUDE and LIB files if you like. +# You *must* define VLC_INSTALL to use this feature. +#VLC_INSTALL = +#VLC_INCLUDE = +#VLC_LIBS = + # *** Mac users NOTE *** # On MAC you don't need libvlc since we use the # native QTKit (OSX framework) for video playback # using Quicktime and on 10.6 or higher Quicktime X # -# We recommend a debug build for development, and a static build for releases. -CONFIG += debug -#CONFIG += static - -# Edit these paths only if you have a Boost/srmio install that uses -# a non-standard directory layout. - -BOOST_INCLUDE = $${BOOST_INSTALL}/include - -!isEmpty( SRMIO_INSTALL ) { - SRMIO_INCLUDE = $${SRMIO_INSTALL}/include - SRMIO_LIB = $${SRMIO_INSTALL}/lib/libsrmio.a -} +# If your system has PKG_CONFIG, QT can use this to get dependent libraries. +# Add the names of libraries with PKG_CONFIG information. +# eg. PKGCONFIG = oauth libical +# Uncomment the following two lines to enable. +#CONFIG += link_pkgconfig +#PKGCONFIG = macx { # Uncomment this line to build with OS X Tiger support on a Leopard system: @@ -139,9 +189,6 @@ macx { #CONFIG+=x86 ppc # Uncomment this line if you have SDK 10.7 or higher - DEFINES += GC_HAVE_LION + #DEFINES += GC_HAVE_LION } -#if you want a 'robot' to test realtime code without having -#to get on your trainer and ride then uncomment below -#DEFINES += GC_WANT_ROBOT diff --git a/src/src.pro b/src/src.pro index dd7bbcf28..f69139acd 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,120 +4,116 @@ include( gcconfig.pri ) TEMPLATE = app TARGET = GoldenCheetah +!isEmpty( APP_NAME ) { TARGET = $${APP_NAME} } DEPENDPATH += . !isEmpty( BOOST_INCLUDE ) { INCLUDEPATH += $${BOOST_INCLUDE} } + INCLUDEPATH += ../qwt/src ../qxt/src QT += xml sql network webkit script LIBS += ../qwt/lib/libqwt.a LIBS += -lm !isEmpty( LIBOAUTH_INSTALL ) { -INCLUDEPATH += $${LIBOAUTH_INSTALL}/include -LIBS += $${LIBOAUTH_INSTALL}/lib/liboauth.a -LIBS += $${LIBCRYPTO_INSTALL} -LIBS += $${LIBZ_INSTALL} -LIBS += $${LIBCURL_INSTALL} -DEFINES += GC_HAVE_LIBOAUTH -SOURCES += TwitterDialog.cpp -HEADERS += TwitterDialog.h + isEmpty( LIBOAUTH_INCLUDE ) { LIBOAUTH_INCLUDE += $${LIBOAUTH_INSTALL}/include } + isEmpty( LIBOAUTH_LIBS ) { + LIBOAUTH_LIBS = $${LIBOAUTH_INSTALL}/lib/liboauth.a \ + -lcurl -lcrypto -lz + } + INCLUDEPATH += $${LIBOAUTH_INCLUDE} + LIBS += $${LIBOAUTH_LIBS} + DEFINES += GC_HAVE_LIBOAUTH + SOURCES += TwitterDialog.cpp + HEADERS += TwitterDialog.h } !isEmpty( D2XX_INCLUDE ) { - INCLUDEPATH += $${D2XX_INCLUDE} - HEADERS += D2XX.h - SOURCES += D2XX.cpp + INCLUDEPATH += $${D2XX_INCLUDE} + !isEmpty( D2XX_LIBS ) { LIBS += $${D2XX_LIBS} } + HEADERS += D2XX.h + SOURCES += D2XX.cpp } !isEmpty( SRMIO_INSTALL ) { - !isEmpty( SRMIO_INCLUDE ) { INCLUDEPATH += $${SRMIO_INCLUDE} } - LIBS += $${SRMIO_LIB} - HEADERS += SrmDevice.h - SOURCES += SrmDevice.cpp + isEmpty( SRMIO_INCLUDE ) { SRMIO_INCLUDE = $${SRMIO_INSTALL}/include } + isEmpty( SRMIO_LIBS ) { SRMIO_LIBS = $${SRMIO_INSTALL}/lib/libsrmio.a } + INCLUDEPATH += $${SRMIO_INCLUDE} + LIBS += $${SRMIO_LIBS} + HEADERS += SrmDevice.h + SOURCES += SrmDevice.cpp } !isEmpty( QWT3D_INSTALL ) { - INCLUDEPATH += $${QWT3D_INSTALL}/include - LIBS += $${QWT3D_INSTALL}/lib/libqwtplot3d.a - CONFIG += qwt3d -} -isEmpty( QWT3D_INSTALL ):linux-g++:exists( /usr/include/qwtplot3d-qt4 ):exists( /usr/lib/libqwtplot3d-qt4.so ) { - INCLUDEPATH += /usr/include/qwtplot3d-qt4 - LIBS += /usr/lib/libqwtplot3d-qt4.so - CONFIG += qwt3d -} -qwt3d { - QT += opengl - HEADERS += ModelPlot.h ModelWindow.h - SOURCES += ModelPlot.cpp ModelWindow.cpp - DEFINES += GC_HAVE_QWTPLOT3D + isEmpty( QWT3D_INCLUDE ) { QWT3D_INCLUDE = $${QWT3D_INSTALL}/include } + isEmpty( QWT3D_LIBS ) { QWT3D_LIBS = $${QWT3D_INSTALL}/lib/libqwtplot3d.a } + INCLUDEPATH += $${QWT3D_INCLUDE} + LIBS += $${QWT3D_LIBS} + QT += opengl + DEFINES += GC_HAVE_QWTPLOT3D + HEADERS += ModelPlot.h ModelWindow.h + SOURCES += ModelPlot.cpp ModelWindow.cpp } !isEmpty( KML_INSTALL) { - KML_INCLUDE = $${KML_INSTALL}/include - KML_LIBS = $${KML_INSTALL}/lib/libkmldom.a \ - $${KML_INSTALL}/lib/libkmlconvenience.a \ - $${KML_INSTALL}/lib/libkmlengine.a \ - $${KML_INSTALL}/lib/libkmlbase.a \ - - LIBS += $${KML_LIBS} $${KML_LIBS} - DEFINES += GC_HAVE_KML - SOURCES += KmlRideFile.cpp - HEADERS += KmlRideFile.h + isEmpty( KML_INCLUDE ) { KML_INCLUDE = $${KML_INSTALL}/include } + isEmpty( KML_LIBS ) { + KML_LIBS = $${KML_INSTALL}/lib/libkmldom.a \ + $${KML_INSTALL}/lib/libkmlconvenience.a \ + $${KML_INSTALL}/lib/libkmlengine.a \ + $${KML_INSTALL}/lib/libkmlbase.a + } + INCLUDEPATH += $${KML_INCLUDE} + LIBS += $${KML_LIBS} + DEFINES += GC_HAVE_KML + SOURCES += KmlRideFile.cpp + HEADERS += KmlRideFile.h } -!isEmpty( ICAL_INSTALL) { - HEADERS += ICalendar.h DiaryWindow.h CalDAV.h - SOURCES += ICalendar.cpp DiaryWindow.cpp CalDAV.cpp - ICAL_INCLUDE = $${ICAL_INSTALL}/include - ICAL_LIBS = $${ICAL_INSTALL}/lib/libical.a - DEFINES += GC_HAVE_ICAL +!isEmpty( ICAL_INSTALL ) { + isEmpty( ICAL_INCLUDE ) { ICAL_INCLUDE = $${ICAL_INSTALL}/include } + isEmpty( ICAL_LIBS ) { ICAL_LIBS = $${ICAL_INSTALL}/lib/libical.a } INCLUDEPATH += $${ICAL_INCLUDE} - LIBS += $${ICAL_LIBS} -} - -# are we supporting USB1 devices on Windows? -!isEmpty( USBXPRESS_INSTALL ) { - LIBS += $${USBXPRESS_INSTALL}/x86/SiUSBXp.lib - INCLUDEPATH += $${USBXPRESS_INSTALL} - DEFINES += GC_HAVE_USBXPRESS + LIBS += $${ICAL_LIBS} + DEFINES += GC_HAVE_ICAL + HEADERS += ICalendar.h DiaryWindow.h CalDAV.h + SOURCES += ICalendar.cpp DiaryWindow.cpp CalDAV.cpp } # are we supporting USB2 devices !isEmpty( LIBUSB_INSTALL ) { - DEFINES += GC_HAVE_LIBUSB - INCLUDEPATH += $${LIBUSB_INSTALL}/include - SOURCES += LibUsb.cpp EzUsb.c Fortius.cpp FortiusController.cpp - HEADERS += LibUsb.h EzUsb.h Fortius.cpp FortiusController.h - - unix { - LIBS += $${LIBUSB_INSTALL}/lib/libusb.a - } - - win32 { - LIBS += $${LIBUSB_INSTALL}/lib/gcc/libusb.a + isEmpty( LIBUSB_INCLUDE ) { LIBUSB_INCLUDE = $${LIBUSB_INSTALL}/include } + isEmpty( LIBUSB_LIBS ) { + unix { LIBUSB_LIBS = $${LIBUSB_INSTALL}/lib/libusb.a } + win32 { LIBUSB_LIBS = $${LIBUSB_INSTALL}/lib/gcc/libusb.a } } + INCLUDEPATH += $${LIBUSB_INCLUDE} + LIBS += $${LIBUSB_LIBS} + DEFINES += GC_HAVE_LIBUSB + SOURCES += LibUsb.cpp EzUsb.c Fortius.cpp FortiusController.cpp + HEADERS += LibUsb.h EzUsb.h Fortius.cpp FortiusController.h } # are we supporting video playback? # only on Linux and Windows, since we use QTKit on Mac !isEmpty( VLC_INSTALL ) { - macx { # we do not use VLC on Mac we use Quicktime # so ignore this setting on a Mac build } else { - INCLUDEPATH += $${VLC_INSTALL}/include - DEFINES += GC_HAVE_VLC - HEADERS += VideoWindow.h - SOURCES += VideoWindow.cpp - - win32 { - LIBS += $${VLC_INSTALL}/lib/libvlc.dll.a - LIBS += $${VLC_INSTALL}/lib/libvlccore.dll.a - } else { - LIBS += -lvlc + isEmpty( VLC_INCLUDE ) { VLC_INCLUDE = $${VLC_INSTALL}/include } + isEmpty( VLC_LIBS ) { + win32 { + VLC_LIBS = $${VLC_INSTALL}/lib/libvlc.dll.a \ + $${VLC_INSTALL}/lib/libvlccore.dll.a + } else { + VLC_LIBS += -lvlc -lvlccore + } } + INCLUDEPATH += $${VLC_INCLUDE} + LIBS += $${VLC_LIBS} + DEFINES += GC_HAVE_VLC + HEADERS += VideoWindow.h + SOURCES += VideoWindow.cpp } } @@ -126,7 +122,7 @@ qwt3d { # Video playback using Quicktime Framework # Lion fullscreen playback macx { - LIBS += -lobjc -framework Carbon -framework IOKit -framework AppKit -framework QTKit + LIBS += -lobjc -framework Carbon -framework IOKit -framework AppKit -framework QTKit HEADERS += QtMacVideoWindow.h LionFullScreen.h OBJECTIVE_SOURCES += QtMacVideoWindow.mm LionFullScreen.mm } else { @@ -144,13 +140,20 @@ win32 { INCLUDEPATH += ./win32 $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib LIBS += -lws2_32 QMAKE_LFLAGS = -Wl,--enable-runtime-pseudo-reloc \ - -Wl,--script,win32/i386pe.x-no-rdata,--enable-auto-import + -Wl,--script,win32/i386pe.x-no-rdata,--enable-auto-import //QMAKE_CXXFLAGS += -fdata-sections RC_FILE = windowsico.rc - # Windows only USB support - SOURCES += USBXpress.cpp - HEADERS += USBXpress.h + # are we supporting USB1 devices on Windows? + !isEmpty( USBXPRESS_INSTALL ) { + isEmpty( USBXPRESS_INCLUDE ) { USBXPRESS_INCLUDE = $${USBXPRESS_INSTALL} } + isEmpty( USBXPRESS_LIBS ) { USBXPRESS_LIBS = $${USBXPRESS_INSTALL}/x86/SiUSBXp.lib } + INCLUDEPATH += $${USBXPRESS_INCLUDE} + LIBS += $${USBXPRESS_LIBS} + DEFINES += GC_HAVE_USBXPRESS + SOURCES += USBXpress.cpp + HEADERS += USBXpress.h + } } # local qxt widgets - rather than add another dependency on libqxt @@ -163,7 +166,11 @@ SOURCES += ../qxt/src/qxtspanslider.cpp \ ../qxt/src/qxtscheduleitemdelegate.cpp \ ../qxt/src/qxtstyleoptionscheduleviewitem.cpp -include( ../qtsolutions/soap/qtsoap.pri ) +isEmpty( QTSOAP_INSTALL ) { + include( ../qtsolutions/soap/qtsoap.pri ) +} else { + include( $${QTSOAP_INSTALL} ) +} HEADERS += TPUpload.h TPUploadDialog.h TPDownload.h TPDownloadDialog.h SOURCES += TPUpload.cpp TPUploadDialog.cpp TPDownload.cpp TPDownloadDialog.cpp DEFINES += GC_HAVE_SOAP @@ -171,7 +178,7 @@ DEFINES += GC_HAVE_SOAP HEADERS += ../qxt/src/qxtspanslider.h \ ../qxt/src/qxtspanslider_p.h \ ../qxt/src/qxtscheduleview.h \ - .././qxt/src/qxtscheduleview_p.h \ + ../qxt/src/qxtscheduleview_p.h \ ../qxt/src/qxtscheduleheaderwidget.h \ ../qxt/src/qxtscheduleviewheadermodel_p.h \ ../qxt/src/qxtscheduleitemdelegate.h \ @@ -347,7 +354,7 @@ HEADERS += \ ZoneScaleDraw.h YACCSOURCES = JsonRideFile.y WithingsParser.y -LEXSOURCES = JsonRideFile.l WithingsParser.l +LEXSOURCES = JsonRideFile.l WithingsParser.l #-t turns on debug, use with caution #QMAKE_YACCFLAGS = -t -d @@ -529,7 +536,7 @@ SOURCES += \ main.cpp \ RESOURCES = application.qrc \ - RideWindow.qrc + RideWindow.qrc TRANSLATIONS = translations/gc_fr.ts \ translations/gc_ja.ts \ @@ -546,4 +553,3 @@ OTHER_FILES += \ web/MapWindow.html \ web/StreetViewWindow.html \ web/Window.css -