author | zautrix <zautrix> | 2005-08-18 05:32:46 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-08-18 05:32:46 (UTC) |
commit | 075fe8e7470f5b9db7553889271880e476a6015a (patch) (unidiff) | |
tree | bdc4f7117a7189eccaf8fe2c36edc27bc6bf79f7 | |
parent | 9de953866db87933c9773b98502f07ac408c8ef7 (diff) | |
download | kdepimpi-075fe8e7470f5b9db7553889271880e476a6015a.zip kdepimpi-075fe8e7470f5b9db7553889271880e476a6015a.tar.gz kdepimpi-075fe8e7470f5b9db7553889271880e476a6015a.tar.bz2 |
pro fix
-rw-r--r-- | kaddressbook/kaddressbook.pro | 5 | ||||
-rw-r--r-- | korganizer/korganizer.pro | 5 | ||||
-rw-r--r-- | variables.pri | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro index 3386ffe..233839f 100644 --- a/kaddressbook/kaddressbook.pro +++ b/kaddressbook/kaddressbook.pro | |||
@@ -3,24 +3,25 @@ CONFIG = qt warn_on | |||
3 | TARGET = kapi | 3 | TARGET = kapi |
4 | DESTDIR= ../bin | 4 | DESTDIR= ../bin |
5 | 5 | ||
6 | include( ../variables.pri ) | 6 | include( ../variables.pri ) |
7 | 7 | ||
8 | 8 | ||
9 | INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../ interfaces | 9 | INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../ interfaces |
10 | DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION | 10 | DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION |
11 | 11 | ||
12 | unix : { | 12 | unix : { |
13 | 13 | ||
14 | staticlib: { | 14 | staticlib: { |
15 | TARGET = kapi_linux | ||
15 | LIBS += ../bin/libmicrokabc_qtopia.a | 16 | LIBS += ../bin/libmicrokabc_qtopia.a |
16 | LIBS += ../bin/libmicrokabc_file.a | 17 | LIBS += ../bin/libmicrokabc_file.a |
17 | LIBS += ../bin/libmicrokabc_dir.a | 18 | LIBS += ../bin/libmicrokabc_dir.a |
18 | LIBS += ../bin/libmicrokdepim.a | 19 | LIBS += ../bin/libmicrokdepim.a |
19 | LIBS += ../bin/libmicrokcal.a | 20 | LIBS += ../bin/libmicrokcal.a |
20 | LIBS += ../bin/libmicrokabc.a | 21 | LIBS += ../bin/libmicrokabc.a |
21 | LIBS += ../bin/libmicrokde.a | 22 | LIBS += ../bin/libmicrokde.a |
22 | LIBS += ../bin/libmicrokabc_qtopia.a | 23 | LIBS += ../bin/libmicrokabc_qtopia.a |
23 | LIBS += ../bin/libmicrokabc_file.a | 24 | LIBS += ../bin/libmicrokabc_file.a |
24 | LIBS += ../bin/libmicrokabc_dir.a | 25 | LIBS += ../bin/libmicrokabc_dir.a |
25 | LIBS += ../bin/libmicrokdepim.a | 26 | LIBS += ../bin/libmicrokdepim.a |
26 | LIBS += ../bin/libmicrokcal.a | 27 | LIBS += ../bin/libmicrokcal.a |
@@ -53,26 +54,28 @@ MOC_DIR = moc/win | |||
53 | importol { | 54 | importol { |
54 | debug: { | 55 | debug: { |
55 | LIBS += mfc71ud.lib | 56 | LIBS += mfc71ud.lib |
56 | } | 57 | } |
57 | release: { | 58 | release: { |
58 | LIBS += mfc71u.lib | 59 | LIBS += mfc71u.lib |
59 | } | 60 | } |
60 | DEFINES += _OL_IMPORT_ | 61 | DEFINES += _OL_IMPORT_ |
61 | HEADERS = ../outport/msoutl9.h \ | 62 | HEADERS = ../outport/msoutl9.h \ |
62 | kaimportoldialog.h | 63 | kaimportoldialog.h |
63 | SOURCES = ../outport/msoutl9.cpp \ | 64 | SOURCES = ../outport/msoutl9.cpp \ |
64 | kaimportoldialog.cpp | 65 | kaimportoldialog.cpp |
65 | } | ||
66 | #olimport section end | 66 | #olimport section end |
67 | } else { | ||
68 | TARGET = kapi_me | ||
69 | } | ||
67 | } | 70 | } |
68 | 71 | ||
69 | INTERFACES = \ | 72 | INTERFACES = \ |
70 | # filteredit_base.ui \ | 73 | # filteredit_base.ui \ |
71 | # kofilterview_base.ui \ | 74 | # kofilterview_base.ui \ |
72 | 75 | ||
73 | HEADERS += \ | 76 | HEADERS += \ |
74 | features/mergewidget.h \ | 77 | features/mergewidget.h \ |
75 | features/distributionlistwidget.h \ | 78 | features/distributionlistwidget.h \ |
76 | kcmconfigs/addresseewidget.h \ | 79 | kcmconfigs/addresseewidget.h \ |
77 | kcmconfigs/extensionconfigdialog.h \ | 80 | kcmconfigs/extensionconfigdialog.h \ |
78 | kcmconfigs/kcmkabconfig.h \ | 81 | kcmconfigs/kcmkabconfig.h \ |
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index 0750083..50443ef 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro | |||
@@ -7,24 +7,25 @@ DESTDIR= ../bin | |||
7 | 7 | ||
8 | include( ../variables.pri ) | 8 | include( ../variables.pri ) |
9 | 9 | ||
10 | INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim | 10 | INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim |
11 | #../qtcompat | 11 | #../qtcompat |
12 | DEFINES += KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL | 12 | DEFINES += KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL |
13 | DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER | 13 | DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER |
14 | #KORG_NOPRINTER KORG_NOKABC KORG_NODND | 14 | #KORG_NOPRINTER KORG_NOKABC KORG_NODND |
15 | DEFINES += KORG_NOLVALTERNATION | 15 | DEFINES += KORG_NOLVALTERNATION |
16 | DEFINES += DESKTOP_VERSION | 16 | DEFINES += DESKTOP_VERSION |
17 | unix : { | 17 | unix : { |
18 | staticlib: { | 18 | staticlib: { |
19 | TARGET = kopi_linux | ||
19 | LIBS += ../bin/libmicrokabc_qtopia.a | 20 | LIBS += ../bin/libmicrokabc_qtopia.a |
20 | LIBS += ../bin/libmicrokabc_file.a | 21 | LIBS += ../bin/libmicrokabc_file.a |
21 | LIBS += ../bin/libmicrokabc_dir.a | 22 | LIBS += ../bin/libmicrokabc_dir.a |
22 | LIBS += ../bin/libmicrokdepim.a | 23 | LIBS += ../bin/libmicrokdepim.a |
23 | LIBS += ../bin/libmicrokcal.a | 24 | LIBS += ../bin/libmicrokcal.a |
24 | LIBS += ../bin/libmicrokabc.a | 25 | LIBS += ../bin/libmicrokabc.a |
25 | LIBS += ../bin/libmicrokde.a | 26 | LIBS += ../bin/libmicrokde.a |
26 | LIBS += ../bin/libmicrokabc_qtopia.a | 27 | LIBS += ../bin/libmicrokabc_qtopia.a |
27 | LIBS += ../bin/libmicrokabc_file.a | 28 | LIBS += ../bin/libmicrokabc_file.a |
28 | LIBS += ../bin/libmicrokabc_dir.a | 29 | LIBS += ../bin/libmicrokabc_dir.a |
29 | LIBS += ../bin/libmicrokdepim.a | 30 | LIBS += ../bin/libmicrokdepim.a |
30 | LIBS += ../bin/libmicrokcal.a | 31 | LIBS += ../bin/libmicrokcal.a |
@@ -66,26 +67,28 @@ QMAKE_LINK += /NODEFAULTLIB:MSVCRT | |||
66 | QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib | 67 | QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib |
67 | } | 68 | } |
68 | release: { | 69 | release: { |
69 | LIBS += mfc71u.lib | 70 | LIBS += mfc71u.lib |
70 | } | 71 | } |
71 | DEFINES += _OL_IMPORT_ | 72 | DEFINES += _OL_IMPORT_ |
72 | 73 | ||
73 | HEADERS += ../outport/msoutl9.h \ | 74 | HEADERS += ../outport/msoutl9.h \ |
74 | koimportoldialog.h | 75 | koimportoldialog.h |
75 | 76 | ||
76 | SOURCES += ../outport/msoutl9.cpp \ | 77 | SOURCES += ../outport/msoutl9.cpp \ |
77 | koimportoldialog.cpp | 78 | koimportoldialog.cpp |
78 | } | ||
79 | #olimport section end | 79 | #olimport section end |
80 | } else { | ||
81 | TARGET = kopi_me | ||
82 | } | ||
80 | 83 | ||
81 | } | 84 | } |
82 | 85 | ||
83 | 86 | ||
84 | INTERFACES = kofilterview_base.ui | 87 | INTERFACES = kofilterview_base.ui |
85 | #filteredit_base.ui | 88 | #filteredit_base.ui |
86 | 89 | ||
87 | # kdateedit.h \ | 90 | # kdateedit.h \ |
88 | 91 | ||
89 | HEADERS += datenavigatorcontainer.h \ | 92 | HEADERS += datenavigatorcontainer.h \ |
90 | filteredit_base.h \ | 93 | filteredit_base.h \ |
91 | alarmclient.h \ | 94 | alarmclient.h \ |
diff --git a/variables.pri b/variables.pri index 4144b8e..5d3b6cb 100644 --- a/variables.pri +++ b/variables.pri | |||
@@ -1,14 +1,14 @@ | |||
1 | 1 | ||
2 | # variables settings for compilation for Linux desktop and Qt 3.x.x | 2 | # variables settings for compilation for Linux desktop and Qt 3.x.x |
3 | 3 | ||
4 | unix { | 4 | unix { |
5 | CONFIG += release | ||
6 | #for statically linking | 5 | #for statically linking |
7 | #CONFIG += staticlib | 6 | #CONFIG += staticlib |
8 | } | 7 | } |
9 | win32 { | 8 | win32 { |
10 | CONFIG += release | 9 | #disable importol to make it running on windows ME/98 |
11 | CONFIG += importol | 10 | CONFIG += importol |
12 | 11 | ||
13 | } | 12 | } |
14 | CONFIG += thread | 13 | CONFIG += thread |
14 | CONFIG += release | ||