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 | |||
@@ -1,98 +1,101 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG = qt warn_on | 2 | 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 |
27 | LIBS += ../bin/libmicrokabc.a | 28 | LIBS += ../bin/libmicrokabc.a |
28 | LIBS += ../bin/libmicrokde.a | 29 | LIBS += ../bin/libmicrokde.a |
29 | LIBS += ../libical/lib/libical.a | 30 | LIBS += ../libical/lib/libical.a |
30 | LIBS += ../libical/lib/libicalss.a | 31 | LIBS += ../libical/lib/libicalss.a |
31 | 32 | ||
32 | } else { | 33 | } else { |
33 | LIBS += ../bin/libmicrokdepim.so | 34 | LIBS += ../bin/libmicrokdepim.so |
34 | LIBS += ../bin/libmicrokde.so | 35 | LIBS += ../bin/libmicrokde.so |
35 | LIBS += ../bin/libmicrokabc.so | 36 | LIBS += ../bin/libmicrokabc.so |
36 | LIBS += ../bin/libmicrokcal.so | 37 | LIBS += ../bin/libmicrokcal.so |
37 | #LIBS += -lldap | 38 | #LIBS += -lldap |
38 | } | 39 | } |
39 | OBJECTS_DIR = obj/unix | 40 | OBJECTS_DIR = obj/unix |
40 | MOC_DIR = moc/unix | 41 | MOC_DIR = moc/unix |
41 | } | 42 | } |
42 | win32: { | 43 | win32: { |
43 | RC_FILE = winicons.rc | 44 | RC_FILE = winicons.rc |
44 | DEFINES += _WIN32_ | 45 | DEFINES += _WIN32_ |
45 | LIBS += ../bin/microkdepim.lib | 46 | LIBS += ../bin/microkdepim.lib |
46 | LIBS += ../bin/microkcal.lib | 47 | LIBS += ../bin/microkcal.lib |
47 | LIBS += ../bin/microkde.lib | 48 | LIBS += ../bin/microkde.lib |
48 | LIBS += ../bin/microkabc.lib | 49 | LIBS += ../bin/microkabc.lib |
49 | QMAKE_LINK += /NODEFAULTLIB:LIBC | 50 | QMAKE_LINK += /NODEFAULTLIB:LIBC |
50 | OBJECTS_DIR = obj/win | 51 | OBJECTS_DIR = obj/win |
51 | MOC_DIR = moc/win | 52 | MOC_DIR = moc/win |
52 | #olimport section | 53 | #olimport section |
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 \ |
79 | kcmconfigs/kabconfigwidget.h \ | 82 | kcmconfigs/kabconfigwidget.h \ |
80 | addresseeeditordialog.h \ | 83 | addresseeeditordialog.h \ |
81 | addresseeeditorwidget.h \ | 84 | addresseeeditorwidget.h \ |
82 | addresseditwidget.h \ | 85 | addresseditwidget.h \ |
83 | addresseeconfig.h \ | 86 | addresseeconfig.h \ |
84 | addresseeutil.h \ | 87 | addresseeutil.h \ |
85 | emaileditwidget.h \ | 88 | emaileditwidget.h \ |
86 | filtereditdialog.h \ | 89 | filtereditdialog.h \ |
87 | kaddressbookmain.h \ | 90 | kaddressbookmain.h \ |
88 | kabprefs.h \ | 91 | kabprefs.h \ |
89 | kabcore.h \ | 92 | kabcore.h \ |
90 | viewmanager.h \ | 93 | viewmanager.h \ |
91 | extensionmanager.h \ | 94 | extensionmanager.h \ |
92 | extensionwidget.h \ | 95 | extensionwidget.h \ |
93 | kaddressbookview.h \ | 96 | kaddressbookview.h \ |
94 | geowidget.h \ | 97 | geowidget.h \ |
95 | imagewidget.h \ | 98 | imagewidget.h \ |
96 | incsearchwidget.h \ | 99 | incsearchwidget.h \ |
97 | jumpbuttonbar.h \ | 100 | jumpbuttonbar.h \ |
98 | phoneeditwidget.h \ | 101 | phoneeditwidget.h \ |
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index 0750083..50443ef 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro | |||
@@ -1,111 +1,114 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG = qt warn_on | 2 | CONFIG = qt warn_on |
3 | TARGET = kopi | 3 | TARGET = kopi |
4 | OBJECTS_DIR = _obj/ | 4 | OBJECTS_DIR = _obj/ |
5 | MOC_DIR = _moc | 5 | MOC_DIR = _moc |
6 | DESTDIR= ../bin | 6 | 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 |
31 | LIBS += ../bin/libmicrokabc.a | 32 | LIBS += ../bin/libmicrokabc.a |
32 | LIBS += ../bin/libmicrokde.a | 33 | LIBS += ../bin/libmicrokde.a |
33 | LIBS += ../libical/lib/libical.a | 34 | LIBS += ../libical/lib/libical.a |
34 | LIBS += ../libical/lib/libicalss.a | 35 | LIBS += ../libical/lib/libicalss.a |
35 | } else { | 36 | } else { |
36 | LIBS += ../bin/libmicrokdepim.so | 37 | LIBS += ../bin/libmicrokdepim.so |
37 | LIBS += ../bin/libmicrokcal.so | 38 | LIBS += ../bin/libmicrokcal.so |
38 | LIBS += ../bin/libmicrokde.so | 39 | LIBS += ../bin/libmicrokde.so |
39 | LIBS += ../bin/libmicrokabc.so | 40 | LIBS += ../bin/libmicrokabc.so |
40 | #LIBS += -lbluetooth | 41 | #LIBS += -lbluetooth |
41 | #LIBS += -lsdp | 42 | #LIBS += -lsdp |
42 | 43 | ||
43 | #LIBS += -lldap | 44 | #LIBS += -lldap |
44 | } | 45 | } |
45 | OBJECTS_DIR = obj/unix | 46 | OBJECTS_DIR = obj/unix |
46 | MOC_DIR = moc/unix | 47 | MOC_DIR = moc/unix |
47 | } | 48 | } |
48 | win32: { | 49 | win32: { |
49 | RC_FILE = winicons.rc | 50 | RC_FILE = winicons.rc |
50 | DEFINES += _WIN32_ | 51 | DEFINES += _WIN32_ |
51 | LIBS += ../bin/microkdepim.lib | 52 | LIBS += ../bin/microkdepim.lib |
52 | LIBS += ../bin/microkcal.lib | 53 | LIBS += ../bin/microkcal.lib |
53 | LIBS += ../bin/microkde.lib | 54 | LIBS += ../bin/microkde.lib |
54 | LIBS += ../bin/microkabc.lib | 55 | LIBS += ../bin/microkabc.lib |
55 | LIBS += ../libical/lib/ical.lib | 56 | LIBS += ../libical/lib/ical.lib |
56 | LIBS += ../libical/lib/icalss.lib | 57 | LIBS += ../libical/lib/icalss.lib |
57 | #LIBS += atls.lib | 58 | #LIBS += atls.lib |
58 | QMAKE_LINK += /NODEFAULTLIB:LIBC | 59 | QMAKE_LINK += /NODEFAULTLIB:LIBC |
59 | OBJECTS_DIR = obj/win | 60 | OBJECTS_DIR = obj/win |
60 | MOC_DIR = moc/win | 61 | MOC_DIR = moc/win |
61 | #olimport section | 62 | #olimport section |
62 | importol: { | 63 | importol: { |
63 | debug: { | 64 | debug: { |
64 | LIBS += mfc71ud.lib | 65 | LIBS += mfc71ud.lib |
65 | QMAKE_LINK += /NODEFAULTLIB:MSVCRT | 66 | 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 \ |
92 | calendarview.h \ | 95 | calendarview.h \ |
93 | customlistviewitem.h \ | 96 | customlistviewitem.h \ |
94 | datenavigator.h \ | 97 | datenavigator.h \ |
95 | docprefs.h \ | 98 | docprefs.h \ |
96 | filtereditdialog.h \ | 99 | filtereditdialog.h \ |
97 | incomingdialog.h \ | 100 | incomingdialog.h \ |
98 | incomingdialog_base.h \ | 101 | incomingdialog_base.h \ |
99 | interfaces/korganizer/baseview.h \ | 102 | interfaces/korganizer/baseview.h \ |
100 | interfaces/korganizer/calendarviewbase.h \ | 103 | interfaces/korganizer/calendarviewbase.h \ |
101 | journalentry.h \ | 104 | journalentry.h \ |
102 | kdatenavigator.h \ | 105 | kdatenavigator.h \ |
103 | koagenda.h \ | 106 | koagenda.h \ |
104 | koagendaitem.h \ | 107 | koagendaitem.h \ |
105 | koagendaview.h \ | 108 | koagendaview.h \ |
106 | kocounterdialog.h \ | 109 | kocounterdialog.h \ |
107 | kodaymatrix.h \ | 110 | kodaymatrix.h \ |
108 | kodialogmanager.h \ | 111 | kodialogmanager.h \ |
109 | koeditordetails.h \ | 112 | koeditordetails.h \ |
110 | koeditorgeneral.h \ | 113 | koeditorgeneral.h \ |
111 | koeditorgeneralevent.h \ | 114 | koeditorgeneralevent.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 | ||