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 | |||
@@ -6,7 +6,10 @@ 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 | } |
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index 32ad10a..bb5f29e 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro | |||
@@ -56,14 +56,14 @@ 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 |