Make it build on Windows. Fix traces on Windows. Abstract out platform specific actio...

[dorian] / dorian.pro

diff --git a/dorian.pro b/dorian.pro
index 19ea789..40de241 100644 (file)
--- a/dorian.pro
+++ b/dorian.pro
@@ -1,43 +1,68 @@
 QT += webkit xml
 
+INCLUDEPATH += $$PWD \
+    $$PWD/model \
+    $$PWD/widgets
+
 SOURCES += \
     main.cpp \
     mainwindow.cpp \
     bookview.cpp \
-    unzip/unzip.c \
-    unzip/ioapi.c \
-    extractzip.cpp \
-    library.cpp \
-    book.cpp \
-    info.cpp \
+    model/unzip/unzip.c \
+    model/unzip/ioapi.c \
+    model/extractzip.cpp \
+    model/library.cpp \
+    model/book.cpp \
     librarydialog.cpp \
     devtools.cpp \
     infodialog.cpp \
-    translucentbutton.cpp \
+    widgets/translucentbutton.cpp \
     settingswindow.cpp \
-    settings.cpp \
-    bookmarksdialog.cpp
+    model/settings.cpp \
+    bookmarksdialog.cpp \
+    model/sortedlibrary.cpp \
+    bookmarkinfodialog.cpp \
+    widgets/dyalog.cpp \
+    chaptersdialog.cpp \
+    widgets/fullscreenwindow.cpp \
+    trace.cpp \
+    widgets/toolbuttonbox.cpp \
+    model/bookfinder.cpp \
+    widgets/listwindow.cpp \
+    widgets/progress.cpp \
+    widgets/adopterwindow.cpp
 
 HEADERS += \
     mainwindow.h \
     bookview.h \
-    selectionsuppressor.h \
-    opshandler.h \
-    unzip/unzip.h \
-    unzip/ioapi.h \
-    extractzip.h \
-    library.h \
-    book.h \
-    info.h \
+    model/opshandler.h \
+    model/unzip/unzip.h \
+    model/unzip/ioapi.h \
+    model/extractzip.h \
+    model/library.h \
+    model/book.h \
     librarydialog.h \
     devtools.h \
     infodialog.h \
-    translucentbutton.h \
+    widgets/translucentbutton.h \
     settingswindow.h \
-    settings.h \
+    model/settings.h \
     bookmarksdialog.h \
-    opserrorhandler.h \
-    containerhandler.h
+    model/xmlerrorhandler.h \
+    model/containerhandler.h \
+    model/sortedlibrary.h \
+    model/ncxhandler.h \
+    bookmarkinfodialog.h \
+    widgets/dyalog.h \
+    chaptersdialog.h \
+    widgets/fullscreenwindow.h \
+    trace.h \
+    widgets/toolbuttonbox.h \
+    model/bookfinder.h \
+    widgets/listwindow.h \
+    widgets/progress.h \
+    widgets/adopterwindow.h \
+    widgets/listview.h
 
 RESOURCES += \
     dorian.qrc
@@ -59,17 +84,38 @@ OTHER_FILES += \
     styles/sand.js \
     styles/night.js \
     styles/default.js \
-    styles/day.js
+    styles/day.js \
+    www/index.html \
+    pkg/maemo/autobuild.sh \
+    pkg/maemo/autobuild-scratchbox.sh \
+    LICENSE.txt
 
 DEFINES += \
-    USE_FILE32API
+    USE_FILE32API \
+    DORIAN_TEST_MODEL
+
+include(model/modeltest/modeltest.pri)
 
-unix: LIBS += -lz
-windows {
-    # FIXME: Build zlib, too
+unix {
+    symbian {
+    } else {
+        LIBS += -lz
+    }
+}
+win32 {
+    DEFINES += ZLIB_WINAPI
+    INCLUDEPATH += $$PWD/model/zlib
+    LIBS += pkg/win32/zlibstat.lib
+}
+symbian {
+    # ICON = ...
+    TARGET.UID3 = 0xEA633557
+    # TARGET.CAPABILITY = ...
+    # FIXME: Add OpenC ZLIB?
+    INCLUDEPATH += C:\NokiaQtSDK\Symbian\SDK\src\3rdparty\zlib
 }
 maemo5 {
-    QT += maemo5
+    QT += maemo5 dbus
     isEmpty(PREFIX) {
         PREFIX = /usr
     }
@@ -92,3 +138,6 @@ maemo5 {
     iconscalable.path = $$DATADIR/icons/hicolor/scalable/hildon
     iconscalable.files += pkg/maemo/icon-scalable/dorian.png
 }
+macx {
+    CONFIG += x86
+}