some minor corrections to make it compile and behave correctly on windows

git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@370 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33

diff --git a/src/iface/customer.h b/src/iface/customer.h
index 7048fe8..edde9d7 100644 (file)
--- a/src/iface/customer.h
+++ b/src/iface/customer.h
@@ -15,7 +15,6 @@
 
 #include <QString>
 
-// #include "MOCustomerShort.h"
 #include "MOCustomer.h"
 
 /**this class expands on MOCustomer to add some convenience methods*/

diff --git a/src/smoke.pro b/src/smoke.pro
index bc63839..6a5dfaa 100644 (file)
--- a/src/smoke.pro
+++ b/src/smoke.pro
@@ -22,6 +22,7 @@ RCC_DIR = .ctmp
 
 SOURCES = main.cpp
 HEADERS = main.h
+INCLUDEPATH += .
 
 RESOURCES += images/files.qrc
 

diff --git a/src/templates/odtrender.cpp b/src/templates/odtrender.cpp
index 38831aa..b5934a6 100644 (file)
--- a/src/templates/odtrender.cpp
+++ b/src/templates/odtrender.cpp
@@ -20,8 +20,8 @@
 #include <QSettings>
 #include <QTemporaryFile>
 
-#include "../zip/qunzip.h"
-#include "../zip/qzip.h"
+#include "qunzip.h"
+#include "qzip.h"
 
 
 class MOdtRendererPrivate

diff --git a/woc/woc.pro b/woc/woc.pro
index c74e054..e9ffd33 100644 (file)
--- a/woc/woc.pro
+++ b/woc/woc.pro
@@ -2,6 +2,7 @@ TEMPLATE=app
 TARGET=../woc/woc
 QT-=gui
 QT+=xml
+CONFIG+=console
 
 #compilation output:
 DESTDIR = ../woc

diff --git a/zip/zip.pri b/zip/zip.pri
index fe09d05..dcc373b 100644 (file)
--- a/zip/zip.pri
+++ b/zip/zip.pri
@@ -3,3 +3,4 @@
 # Modified for Magic Smoke by (c) Konrad Rosenbaum, 2007
 
 LIBS += -L../zip -lzip
+INCLUDEPATH += ../zip
\ No newline at end of file