From 7a368ab06b4926236ec93207e66ff7b14c234fe1 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 3 Oct 2013 13:21:36 -0700 Subject: Better fix for the compile problems Still don't like the order dependency - but at least this seems to work and correctly build after make confclean. Signed-off-by: Dirk Hohndel --- Makefile | 12 ++++++------ main.cpp | 1 - qt-ui/simplewidgets.h | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 4a3f6f86c..5258d3dbd 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,6 @@ SOURCES = \ equipment.c \ file.c \ info.c \ - main.cpp \ parse-xml.c \ planner.c \ subsurfacestartup.c \ @@ -80,10 +79,9 @@ SOURCES = \ uemis.c \ uemis-downloader.c \ libdivecomputer.c \ - qt-gui.cpp \ qthelper.cpp \ - qt-ui/divelistview.cpp \ - qt-ui/maintab.cpp \ + qt-ui/simplewidgets.cpp \ + qt-ui/tableview.cpp \ qt-ui/mainwindow.cpp \ qt-ui/models.cpp \ qt-ui/plotareascene.cpp \ @@ -94,17 +92,19 @@ SOURCES = \ qt-ui/kmessagewidget.cpp \ qt-ui/downloadfromdivecomputer.cpp \ qt-ui/preferences.cpp \ - qt-ui/simplewidgets.cpp \ qt-ui/subsurfacewebservices.cpp \ qt-ui/divecomputermanagementdialog.cpp \ qt-ui/diveplanner.cpp \ + qt-ui/divelistview.cpp \ qt-ui/about.cpp \ qt-ui/graphicsview-common.cpp \ qt-ui/printdialog.cpp \ qt-ui/printoptions.cpp \ qt-ui/printlayout.cpp \ qt-ui/completionmodels.cpp \ - qt-ui/tableview.cpp \ + qt-ui/maintab.cpp \ + qt-gui.cpp \ + main.cpp \ $(RESFILE) diff --git a/main.cpp b/main.cpp index 515dd40f5..a6e39ec53 100644 --- a/main.cpp +++ b/main.cpp @@ -11,7 +11,6 @@ #include "subsurfacestartup.h" #include "qt-ui/mainwindow.h" #include "qt-ui/diveplanner.h" -#include "qt-ui/ui_tableview.h" #include diff --git a/qt-ui/simplewidgets.h b/qt-ui/simplewidgets.h index 057a97251..78f4582c1 100644 --- a/qt-ui/simplewidgets.h +++ b/qt-ui/simplewidgets.h @@ -7,7 +7,7 @@ class QAbstractButton; #include #include -#include "ui_renumber.h" +#include "qt-ui/ui_renumber.h" class MinMaxAvgWidget : public QWidget{ Q_OBJECT -- cgit v1.2.3-70-g09d2