everything in one directory

src/DownloadRideDialog.h

@@ -20,7 +20,7 @@
 #define _GC_DownloadRideDialog_h 1
 
 #include <QtGui>
-#include "../pt/PowerTap.h"
+#include "PowerTap.h"
 
 class MainWindow;
 class DownloadThread;

src/RawRideFile.cpp

@@ -17,7 +17,7 @@
  */
 
 #include "RawRideFile.h"
-#include "../pt/PowerTap.h"
+#include "PowerTap.h"
 #include <assert.h>
 #include <math.h>
 

src/gui.pro

@@ -2,20 +2,19 @@
 TEMPLATE = app
 TARGET = GoldenCheetah
 DEPENDPATH += .
-INCLUDEPATH += /usr/local/qwt/include ../srm /sw/include
+INCLUDEPATH += /usr/local/qwt/include /sw/include
 CONFIG += static debug
 QT += xml
 LIBS += /usr/local/qwt/lib/libqwt.a 
-LIBS += ../srm/libsrm.a ../pt/libpt.a
 LIBS += -lm -lz -lftd2xx
 macx {
     LIBS += -framework Carbon
 }
 
 macx || unix {
-    LIBS += ../pt/Serial.o
+    HEADERS += Serial.h
+    SOURCES += Serial.cpp
 }
-LIBS += ../pt/D2XX.o
 
 QMAKE_CXXFLAGS = -DGC_BUILD_DATE="`date +'\"%a_%b_%d,_%Y\"'`"
 RC_FILE = images/gc.icns
@@ -26,11 +25,9 @@ HEADERS += \
 	ChooseCyclistDialog.h \
 	CpintPlot.h \
 	CsvRideFile.h \
-        DatePickerDialog.h \
 	DownloadRideDialog.h \
-        LogTimeScaleDraw.h \
-        LogTimeScaleEngine.h \
 	MainWindow.h \
+	PfPvPlot.h \
 	PowerHist.h \
 	RawRideFile.h \
 	RideFile.h \
@@ -40,25 +37,27 @@ HEADERS += \
 	TcxParser.h \
 	TcxRideFile.h \
 	TimeUtils.h \
-        Zones.h \
-        Pages.h \
         ConfigDialog.h \
+        D2XX.h \
+        DatePickerDialog.h \
+        Device.h \
+        LogTimeScaleDraw.h \
+        LogTimeScaleEngine.h \
+        Pages.h \
+        PowerTap.h \
+        Zones.h \
         cpint.h \
-	PfPvPlot.h
+        srm.h
 
 SOURCES += \
 	AllPlot.cpp \
-        BasicRideMetrics.cpp \
 	BestIntervalDialog.cpp \
-        BikeScore.cpp \
 	ChooseCyclistDialog.cpp \
 	CpintPlot.cpp \
 	CsvRideFile.cpp \
-        DatePickerDialog.cpp \
 	DownloadRideDialog.cpp \
-        LogTimeScaleDraw.cpp \
-        LogTimeScaleEngine.cpp \
 	MainWindow.cpp \
+	PfPvPlot.cpp \
 	PowerHist.cpp \
 	RawRideFile.cpp \
 	RideFile.cpp \
@@ -68,12 +67,20 @@ SOURCES += \
 	TcxParser.cpp \
 	TcxRideFile.cpp \
 	TimeUtils.cpp \
-        Zones.cpp \
-        Pages.cpp \
-        ConfigDialog.cpp \
 	cpint.cpp \
-	PfPvPlot.cpp \
-	main.cpp
+        BasicRideMetrics.cpp \
+        BikeScore.cpp \
+        ConfigDialog.cpp \
+        D2XX.cpp \
+        DatePickerDialog.cpp \
+        Device.cpp \
+        LogTimeScaleDraw.cpp \
+        LogTimeScaleEngine.cpp \
+        Pages.cpp \
+        PowerTap.cpp \
+        Zones.cpp \
+	main.cpp \
+        srm.cpp
 
 RESOURCES = application.qrc
 

src/pt/pt.pro

@@ -1,16 +0,0 @@
-
-TEMPLATE = lib
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += /sw/include
-LIBS += -lftd2xx
-CONFIG += static debug
-
-HEADERS += Device.h D2XX.h PowerTap.h
-SOURCES += Device.cpp D2XX.cpp PowerTap.cpp
-
-macx || unix {
-    HEADERS += Serial.h
-    SOURCES += Serial.cpp
-}
-

src/src.pro

@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-CONFIG += ordered
-SUBDIRS = srm pt gui

src/srm/srm.pro

@@ -1,16 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Sun Apr 8 17:19:06 2007
-######################################################################
-
-TEMPLATE = lib
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-CONFIG += static debug
-LIBS += -lm
-
-# Input
-HEADERS += srm.h
-SOURCES += srm.cpp
-