author | zautrix <zautrix> | 2005-05-25 07:40:34 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-05-25 07:40:34 (UTC) |
commit | 10381b24675874222d27ce2cafe707daa052e9e0 (patch) (unidiff) | |
tree | 0c7fc1ad25ec14fdf577313457fc8f5bd17d10dc | |
parent | c0ca8beceaa7a366a2d74a82504cad19f4ccd642 (diff) | |
download | kdepimpi-10381b24675874222d27ce2cafe707daa052e9e0.zip kdepimpi-10381b24675874222d27ce2cafe707daa052e9e0.tar.gz kdepimpi-10381b24675874222d27ce2cafe707daa052e9e0.tar.bz2 |
fix
-rw-r--r-- | kdepim-desktop.pro | 5 | ||||
-rw-r--r-- | korganizer/korganizer.pro | 4 |
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 | ||
2 | include( ./variables.pri ) | 2 | include( ./variables.pri ) |
3 | TEMPLATE = subdirs | 3 | TEMPLATE = subdirs |
4 | unix:{ | 4 | unix:{ |
5 | staticlib: { | 5 | staticlib: { |
6 | SUBDIRS += kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia | 6 | SUBDIRS += kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia |
7 | } | 7 | } |
8 | } | 8 | } |
9 | SUBDIRS += libical libkcal kabc libkdepim microkde korganizer kaddressbook gammu/emb/common gammu/emb/gammu | 9 | SUBDIRS += libical libkcal kabc libkdepim microkde korganizer kaddressbook |
10 | unix:{ | ||
11 | SUBDIRS += gammu/emb/common gammu/emb/gammu | ||
12 | } | ||
10 | !staticlib: { | 13 | !staticlib: { |
11 | SUBDIRS += kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia | 14 | SUBDIRS += kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia |
12 | } | 15 | } |
13 | unix:{ | 16 | unix:{ |
14 | !staticlib: { | 17 | !staticlib: { |
15 | SUBDIRS += libetpan kmicromail/libmailwrapper kmicromail pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib pwmanager/pwmanager | 18 | SUBDIRS += 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 { |
36 | LIBS += ../bin/libmicrokdepim.so | 36 | LIBS += ../bin/libmicrokdepim.so |
37 | LIBS += ../bin/libmicrokcal.so | 37 | LIBS += ../bin/libmicrokcal.so |
38 | LIBS += ../bin/libmicrokde.so | 38 | LIBS += ../bin/libmicrokde.so |
39 | LIBS += ../bin/libmicrokabc.so | 39 | LIBS += ../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 | } |
45 | OBJECTS_DIR = obj/unix | 45 | OBJECTS_DIR = obj/unix |
46 | MOC_DIR = moc/unix | 46 | MOC_DIR = moc/unix |
47 | } | 47 | } |
48 | win32: { | 48 | win32: { |
49 | RC_FILE = winicons.rc | 49 | RC_FILE = winicons.rc |
50 | DEFINES += _WIN32_ | 50 | DEFINES += _WIN32_ |
51 | LIBS += ../bin/microkdepim.lib | 51 | LIBS += ../bin/microkdepim.lib |
52 | LIBS += ../bin/microkcal.lib | 52 | LIBS += ../bin/microkcal.lib |
53 | LIBS += ../bin/microkde.lib | 53 | LIBS += ../bin/microkde.lib |
54 | LIBS += ../bin/microkabc.lib | 54 | LIBS += ../bin/microkabc.lib |
55 | LIBS += ../libical/lib/ical.lib | 55 | LIBS += ../libical/lib/ical.lib |
56 | LIBS += ../libical/lib/icalss.lib | 56 | LIBS += ../libical/lib/icalss.lib |
57 | #LIBS += atls.lib | 57 | #LIBS += atls.lib |
58 | QMAKE_LINK += /NODEFAULTLIB:LIBC | 58 | QMAKE_LINK += /NODEFAULTLIB:LIBC |
59 | QMAKE_LINK += /NODEFAULTLIB:MSVCRT | ||
60 | QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib | ||
61 | OBJECTS_DIR = obj/win | 59 | OBJECTS_DIR = obj/win |
62 | MOC_DIR = moc/win | 60 | MOC_DIR = moc/win |
63 | #olimport section | 61 | #olimport section |
64 | #blabla: { | 62 | #blabla: { |
65 | debug: { | 63 | debug: { |
66 | LIBS += mfc71ud.lib | 64 | LIBS += mfc71ud.lib |
65 | QMAKE_LINK += /NODEFAULTLIB:MSVCRT | ||
66 | QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib | ||
67 | } | 67 | } |
68 | release: { | 68 | release: { |
69 | LIBS += mfc71u.lib | 69 | LIBS += mfc71u.lib |
70 | } | 70 | } |
71 | DEFINES += _OL_IMPORT_ | 71 | DEFINES += _OL_IMPORT_ |
72 | 72 | ||
73 | HEADERS += ../outport/msoutl9.h \ | 73 | HEADERS += ../outport/msoutl9.h \ |
74 | koimportoldialog.h | 74 | koimportoldialog.h |
75 | 75 | ||
76 | SOURCES += ../outport/msoutl9.cpp \ | 76 | SOURCES += ../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 | ||
84 | INTERFACES = kofilterview_base.ui | 84 | INTERFACES = kofilterview_base.ui |
85 | #filteredit_base.ui | 85 | #filteredit_base.ui |
86 | 86 | ||
87 | # kdateedit.h \ | 87 | # kdateedit.h \ |
88 | 88 | ||
89 | HEADERS += datenavigatorcontainer.h \ | 89 | HEADERS += datenavigatorcontainer.h \ |
90 | filteredit_base.h \ | 90 | filteredit_base.h \ |