summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kdepim-desktop.pro5
-rw-r--r--korganizer/korganizer.pro4
2 files changed, 6 insertions, 3 deletions
diff --git a/kdepim-desktop.pro b/kdepim-desktop.pro
index 6b7dd6b..df1c6cb 100644
--- a/kdepim-desktop.pro
+++ b/kdepim-desktop.pro
@@ -1,18 +1,21 @@
1 1
2include( ./variables.pri ) 2include( ./variables.pri )
3TEMPLATE = subdirs 3TEMPLATE = subdirs
4unix:{ 4unix:{
5staticlib: { 5staticlib: {
6SUBDIRS += kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia 6SUBDIRS += kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia
7} 7}
8} 8}
9SUBDIRS += libical libkcal kabc libkdepim microkde korganizer kaddressbook gammu/emb/common gammu/emb/gammu 9SUBDIRS += libical libkcal kabc libkdepim microkde korganizer kaddressbook
10unix:{
11SUBDIRS += gammu/emb/common gammu/emb/gammu
12}
10!staticlib: { 13!staticlib: {
11SUBDIRS += kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia 14SUBDIRS += kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia
12} 15}
13unix:{ 16unix:{
14!staticlib: { 17!staticlib: {
15SUBDIRS += libetpan kmicromail/libmailwrapper kmicromail pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib pwmanager/pwmanager 18SUBDIRS += libetpan kmicromail/libmailwrapper kmicromail pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib pwmanager/pwmanager
16} 19}
17} 20}
18 21
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index 32ad10a..bb5f29e 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -35,56 +35,56 @@ LIBS += ../libical/lib/libicalss.a
35} else { 35} else {
36LIBS += ../bin/libmicrokdepim.so 36LIBS += ../bin/libmicrokdepim.so
37LIBS += ../bin/libmicrokcal.so 37LIBS += ../bin/libmicrokcal.so
38LIBS += ../bin/libmicrokde.so 38LIBS += ../bin/libmicrokde.so
39LIBS += ../bin/libmicrokabc.so 39LIBS += ../bin/libmicrokabc.so
40#LIBS += -lbluetooth 40#LIBS += -lbluetooth
41#LIBS += -lsdp 41#LIBS += -lsdp
42 42
43#LIBS += -lldap 43#LIBS += -lldap
44} 44}
45OBJECTS_DIR = obj/unix 45OBJECTS_DIR = obj/unix
46MOC_DIR = moc/unix 46MOC_DIR = moc/unix
47} 47}
48win32: { 48win32: {
49RC_FILE = winicons.rc 49RC_FILE = winicons.rc
50DEFINES += _WIN32_ 50DEFINES += _WIN32_
51LIBS += ../bin/microkdepim.lib 51LIBS += ../bin/microkdepim.lib
52LIBS += ../bin/microkcal.lib 52LIBS += ../bin/microkcal.lib
53LIBS += ../bin/microkde.lib 53LIBS += ../bin/microkde.lib
54LIBS += ../bin/microkabc.lib 54LIBS += ../bin/microkabc.lib
55LIBS += ../libical/lib/ical.lib 55LIBS += ../libical/lib/ical.lib
56LIBS += ../libical/lib/icalss.lib 56LIBS += ../libical/lib/icalss.lib
57#LIBS += atls.lib 57#LIBS += atls.lib
58QMAKE_LINK += /NODEFAULTLIB:LIBC 58QMAKE_LINK += /NODEFAULTLIB:LIBC
59QMAKE_LINK += /NODEFAULTLIB:MSVCRT
60QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
61OBJECTS_DIR = obj/win 59OBJECTS_DIR = obj/win
62MOC_DIR = moc/win 60MOC_DIR = moc/win
63#olimport section 61#olimport section
64#blabla: { 62#blabla: {
65debug: { 63debug: {
66LIBS += mfc71ud.lib 64LIBS += mfc71ud.lib
65QMAKE_LINK += /NODEFAULTLIB:MSVCRT
66QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
67} 67}
68release: { 68release: {
69LIBS += mfc71u.lib 69LIBS += mfc71u.lib
70} 70}
71DEFINES += _OL_IMPORT_ 71DEFINES += _OL_IMPORT_
72 72
73HEADERS += ../outport/msoutl9.h \ 73HEADERS += ../outport/msoutl9.h \
74 koimportoldialog.h 74 koimportoldialog.h
75 75
76SOURCES += ../outport/msoutl9.cpp \ 76SOURCES += ../outport/msoutl9.cpp \
77 koimportoldialog.cpp 77 koimportoldialog.cpp
78#} 78#}
79#olimport section end 79#olimport section end
80 80
81} 81}
82 82
83 83
84INTERFACES = kofilterview_base.ui 84INTERFACES = kofilterview_base.ui
85#filteredit_base.ui 85#filteredit_base.ui
86 86
87# kdateedit.h \ 87# kdateedit.h \
88 88
89HEADERS += datenavigatorcontainer.h \ 89HEADERS += datenavigatorcontainer.h \
90 filteredit_base.h \ 90 filteredit_base.h \