summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2004-08-08 11:01:52 (UTC)
committer zautrix <zautrix>2004-08-08 11:01:52 (UTC)
commit7c4e0075810cf95ab2b1ecda2d971264e9a9b60c (patch) (unidiff)
tree2900efa863dd70b7131b3c07ef7f522ac7da845f /korganizer
parent71eba6589af91448b84bfd409439115972203e9e (diff)
downloadkdepimpi-7c4e0075810cf95ab2b1ecda2d971264e9a9b60c.zip
kdepimpi-7c4e0075810cf95ab2b1ecda2d971264e9a9b60c.tar.gz
kdepimpi-7c4e0075810cf95ab2b1ecda2d971264e9a9b60c.tar.bz2
Made it compileable on desktop
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koprefs.cpp1
-rw-r--r--korganizer/korganizer.pro4
2 files changed, 5 insertions, 0 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 042046e..0db8e6d 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -16,32 +16,33 @@
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18 18
19 As a special exception, permission is given to link this program 19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable, 20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution. 21 without including the source code for Qt in the source distribution.
22*/ 22*/
23 23
24#include <time.h> 24#include <time.h>
25#ifndef _WIN32_ 25#ifndef _WIN32_
26#include <unistd.h> 26#include <unistd.h>
27#endif 27#endif
28#include <qdir.h> 28#include <qdir.h>
29#include <qtextstream.h> 29#include <qtextstream.h>
30#include <qtextcodec.h> 30#include <qtextcodec.h>
31#include <qstring.h> 31#include <qstring.h>
32#include <qregexp.h>
32#include <qfont.h> 33#include <qfont.h>
33#include <qcolor.h> 34#include <qcolor.h>
34#include <qstringlist.h> 35#include <qstringlist.h>
35#include <stdlib.h> 36#include <stdlib.h>
36 37
37#include <kglobal.h> 38#include <kglobal.h>
38#include <kconfig.h> 39#include <kconfig.h>
39#include <klocale.h> 40#include <klocale.h>
40#include <kdebug.h> 41#include <kdebug.h>
41#include <kemailsettings.h> 42#include <kemailsettings.h>
42#include <kstaticdeleter.h> 43#include <kstaticdeleter.h>
43 44
44#include "koprefs.h" 45#include "koprefs.h"
45#include "mainwindow.h" 46#include "mainwindow.h"
46 47
47const char *germanwords[][2] = { 48const char *germanwords[][2] = {
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index 02e608c..e501d88 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -6,32 +6,36 @@ MOC_DIR = _moc
6DESTDIR= ../bin 6DESTDIR= ../bin
7 7
8include( ../variables.pri ) 8include( ../variables.pri )
9 9
10INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio 10INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio
11#../qtcompat 11#../qtcompat
12DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL 12DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL
13DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER 13DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
14#KORG_NOPRINTER KORG_NOKABC 14#KORG_NOPRINTER KORG_NOKABC
15DEFINES += KORG_NOLVALTERNATION 15DEFINES += KORG_NOLVALTERNATION
16DEFINES += DESKTOP_VERSION 16DEFINES += DESKTOP_VERSION
17unix : { 17unix : {
18LIBS += ../bin/libmicrokdepim.so 18LIBS += ../bin/libmicrokdepim.so
19LIBS += ../bin/libmicrokcal.so 19LIBS += ../bin/libmicrokcal.so
20LIBS += ../bin/libmicrokde.so 20LIBS += ../bin/libmicrokde.so
21LIBS += ../bin/libmicrokabc.so 21LIBS += ../bin/libmicrokabc.so
22LIBS += ../bin/libmicrogammu.so
23LIBS += -lbluetooth
24LIBS += -lsdp
25
22LIBS += -lldap 26LIBS += -lldap
23OBJECTS_DIR = obj/unix 27OBJECTS_DIR = obj/unix
24MOC_DIR = moc/unix 28MOC_DIR = moc/unix
25} 29}
26win32: { 30win32: {
27DEFINES += _WIN32_ 31DEFINES += _WIN32_
28LIBS += ../bin/microkdepim.lib 32LIBS += ../bin/microkdepim.lib
29LIBS += ../bin/microkcal.lib 33LIBS += ../bin/microkcal.lib
30LIBS += ../bin/microkde.lib 34LIBS += ../bin/microkde.lib
31LIBS += ../bin/microkabc.lib 35LIBS += ../bin/microkabc.lib
32LIBS += ../libical/lib/ical.lib 36LIBS += ../libical/lib/ical.lib
33LIBS += ../libical/lib/icalss.lib 37LIBS += ../libical/lib/icalss.lib
34#LIBS += atls.lib 38#LIBS += atls.lib
35LIBS += mfc71u.lib 39LIBS += mfc71u.lib
36QMAKE_LINK += /NODEFAULTLIB:LIBC 40QMAKE_LINK += /NODEFAULTLIB:LIBC
37#QMAKE_LINK += /NODEFAULTLIB:MSVCRT 41#QMAKE_LINK += /NODEFAULTLIB:MSVCRT