summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kaddressbook.pro5
-rw-r--r--korganizer/korganizer.pro5
-rw-r--r--variables.pri4
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,114 +1,117 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on 2 CONFIG = qt warn_on
3 TARGET = kapi 3 TARGET = kapi
4DESTDIR= ../bin 4DESTDIR= ../bin
5 5
6include( ../variables.pri ) 6include( ../variables.pri )
7 7
8 8
9INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../ interfaces 9INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../ interfaces
10DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION 10DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION
11 11
12unix : { 12unix : {
13 13
14staticlib: { 14staticlib: {
15 TARGET = kapi_linux
15LIBS += ../bin/libmicrokabc_qtopia.a 16LIBS += ../bin/libmicrokabc_qtopia.a
16LIBS += ../bin/libmicrokabc_file.a 17LIBS += ../bin/libmicrokabc_file.a
17LIBS += ../bin/libmicrokabc_dir.a 18LIBS += ../bin/libmicrokabc_dir.a
18LIBS += ../bin/libmicrokdepim.a 19LIBS += ../bin/libmicrokdepim.a
19LIBS += ../bin/libmicrokcal.a 20LIBS += ../bin/libmicrokcal.a
20LIBS += ../bin/libmicrokabc.a 21LIBS += ../bin/libmicrokabc.a
21LIBS += ../bin/libmicrokde.a 22LIBS += ../bin/libmicrokde.a
22LIBS += ../bin/libmicrokabc_qtopia.a 23LIBS += ../bin/libmicrokabc_qtopia.a
23LIBS += ../bin/libmicrokabc_file.a 24LIBS += ../bin/libmicrokabc_file.a
24LIBS += ../bin/libmicrokabc_dir.a 25LIBS += ../bin/libmicrokabc_dir.a
25LIBS += ../bin/libmicrokdepim.a 26LIBS += ../bin/libmicrokdepim.a
26LIBS += ../bin/libmicrokcal.a 27LIBS += ../bin/libmicrokcal.a
27LIBS += ../bin/libmicrokabc.a 28LIBS += ../bin/libmicrokabc.a
28LIBS += ../bin/libmicrokde.a 29LIBS += ../bin/libmicrokde.a
29LIBS += ../libical/lib/libical.a 30LIBS += ../libical/lib/libical.a
30LIBS += ../libical/lib/libicalss.a 31LIBS += ../libical/lib/libicalss.a
31 32
32} else { 33} else {
33LIBS += ../bin/libmicrokdepim.so 34LIBS += ../bin/libmicrokdepim.so
34LIBS += ../bin/libmicrokde.so 35LIBS += ../bin/libmicrokde.so
35LIBS += ../bin/libmicrokabc.so 36LIBS += ../bin/libmicrokabc.so
36LIBS += ../bin/libmicrokcal.so 37LIBS += ../bin/libmicrokcal.so
37#LIBS += -lldap 38#LIBS += -lldap
38} 39}
39OBJECTS_DIR = obj/unix 40OBJECTS_DIR = obj/unix
40MOC_DIR = moc/unix 41MOC_DIR = moc/unix
41} 42}
42win32: { 43win32: {
43RC_FILE = winicons.rc 44RC_FILE = winicons.rc
44DEFINES += _WIN32_ 45DEFINES += _WIN32_
45LIBS += ../bin/microkdepim.lib 46LIBS += ../bin/microkdepim.lib
46LIBS += ../bin/microkcal.lib 47LIBS += ../bin/microkcal.lib
47LIBS += ../bin/microkde.lib 48LIBS += ../bin/microkde.lib
48LIBS += ../bin/microkabc.lib 49LIBS += ../bin/microkabc.lib
49QMAKE_LINK += /NODEFAULTLIB:LIBC 50QMAKE_LINK += /NODEFAULTLIB:LIBC
50OBJECTS_DIR = obj/win 51OBJECTS_DIR = obj/win
51MOC_DIR = moc/win 52MOC_DIR = moc/win
52#olimport section 53#olimport section
53importol { 54importol {
54debug: { 55debug: {
55LIBS += mfc71ud.lib 56LIBS += mfc71ud.lib
56} 57}
57release: { 58release: {
58LIBS += mfc71u.lib 59LIBS += mfc71u.lib
59} 60}
60DEFINES += _OL_IMPORT_ 61DEFINES += _OL_IMPORT_
61HEADERS = ../outport/msoutl9.h \ 62HEADERS = ../outport/msoutl9.h \
62 kaimportoldialog.h 63 kaimportoldialog.h
63SOURCES = ../outport/msoutl9.cpp \ 64SOURCES = ../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
69INTERFACES = \ 72INTERFACES = \
70# filteredit_base.ui \ 73# filteredit_base.ui \
71# kofilterview_base.ui \ 74# kofilterview_base.ui \
72 75
73HEADERS += \ 76HEADERS += \
74features/mergewidget.h \ 77features/mergewidget.h \
75features/distributionlistwidget.h \ 78features/distributionlistwidget.h \
76kcmconfigs/addresseewidget.h \ 79kcmconfigs/addresseewidget.h \
77kcmconfigs/extensionconfigdialog.h \ 80kcmconfigs/extensionconfigdialog.h \
78kcmconfigs/kcmkabconfig.h \ 81kcmconfigs/kcmkabconfig.h \
79kcmconfigs/kabconfigwidget.h \ 82kcmconfigs/kabconfigwidget.h \
80addresseeeditordialog.h \ 83addresseeeditordialog.h \
81addresseeeditorwidget.h \ 84addresseeeditorwidget.h \
82addresseditwidget.h \ 85addresseditwidget.h \
83addresseeconfig.h \ 86addresseeconfig.h \
84addresseeutil.h \ 87addresseeutil.h \
85emaileditwidget.h \ 88emaileditwidget.h \
86filtereditdialog.h \ 89filtereditdialog.h \
87kaddressbookmain.h \ 90kaddressbookmain.h \
88kabprefs.h \ 91kabprefs.h \
89kabcore.h \ 92kabcore.h \
90viewmanager.h \ 93viewmanager.h \
91extensionmanager.h \ 94extensionmanager.h \
92extensionwidget.h \ 95extensionwidget.h \
93kaddressbookview.h \ 96kaddressbookview.h \
94geowidget.h \ 97geowidget.h \
95imagewidget.h \ 98imagewidget.h \
96incsearchwidget.h \ 99incsearchwidget.h \
97jumpbuttonbar.h \ 100jumpbuttonbar.h \
98phoneeditwidget.h \ 101phoneeditwidget.h \
99secrecywidget.h \ 102secrecywidget.h \
100keywidget.h \ 103keywidget.h \
101nameeditdialog.h \ 104nameeditdialog.h \
102filter.h \ 105filter.h \
103addviewdialog.h \ 106addviewdialog.h \
104configurewidget.h \ 107configurewidget.h \
105viewconfigurewidget.h \ 108viewconfigurewidget.h \
106viewconfigurefieldspage.h \ 109viewconfigurefieldspage.h \
107viewconfigurefilterpage.h \ 110viewconfigurefilterpage.h \
108typecombo.h \ 111typecombo.h \
109undo.h \ 112undo.h \
110undocmds.h \ 113undocmds.h \
111xxportmanager.h \ 114xxportmanager.h \
112xxportobject.h \ 115xxportobject.h \
113xxportselectdialog.h \ 116xxportselectdialog.h \
114details/detailsviewcontainer.h \ 117details/detailsviewcontainer.h \
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index 0750083..50443ef 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -1,127 +1,130 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on 2 CONFIG = qt warn_on
3 TARGET = kopi 3 TARGET = kopi
4OBJECTS_DIR = _obj/ 4OBJECTS_DIR = _obj/
5MOC_DIR = _moc 5MOC_DIR = _moc
6DESTDIR= ../bin 6DESTDIR= ../bin
7 7
8include( ../variables.pri ) 8include( ../variables.pri )
9 9
10INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim 10INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim
11#../qtcompat 11#../qtcompat
12DEFINES += KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL 12DEFINES += KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL
13DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER 13DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
14#KORG_NOPRINTER KORG_NOKABC KORG_NODND 14#KORG_NOPRINTER KORG_NOKABC KORG_NODND
15DEFINES += KORG_NOLVALTERNATION 15DEFINES += KORG_NOLVALTERNATION
16DEFINES += DESKTOP_VERSION 16DEFINES += DESKTOP_VERSION
17unix : { 17unix : {
18staticlib: { 18staticlib: {
19 TARGET = kopi_linux
19LIBS += ../bin/libmicrokabc_qtopia.a 20LIBS += ../bin/libmicrokabc_qtopia.a
20LIBS += ../bin/libmicrokabc_file.a 21LIBS += ../bin/libmicrokabc_file.a
21LIBS += ../bin/libmicrokabc_dir.a 22LIBS += ../bin/libmicrokabc_dir.a
22LIBS += ../bin/libmicrokdepim.a 23LIBS += ../bin/libmicrokdepim.a
23LIBS += ../bin/libmicrokcal.a 24LIBS += ../bin/libmicrokcal.a
24LIBS += ../bin/libmicrokabc.a 25LIBS += ../bin/libmicrokabc.a
25LIBS += ../bin/libmicrokde.a 26LIBS += ../bin/libmicrokde.a
26LIBS += ../bin/libmicrokabc_qtopia.a 27LIBS += ../bin/libmicrokabc_qtopia.a
27LIBS += ../bin/libmicrokabc_file.a 28LIBS += ../bin/libmicrokabc_file.a
28LIBS += ../bin/libmicrokabc_dir.a 29LIBS += ../bin/libmicrokabc_dir.a
29LIBS += ../bin/libmicrokdepim.a 30LIBS += ../bin/libmicrokdepim.a
30LIBS += ../bin/libmicrokcal.a 31LIBS += ../bin/libmicrokcal.a
31LIBS += ../bin/libmicrokabc.a 32LIBS += ../bin/libmicrokabc.a
32LIBS += ../bin/libmicrokde.a 33LIBS += ../bin/libmicrokde.a
33LIBS += ../libical/lib/libical.a 34LIBS += ../libical/lib/libical.a
34LIBS += ../libical/lib/libicalss.a 35LIBS += ../libical/lib/libicalss.a
35} else { 36} else {
36LIBS += ../bin/libmicrokdepim.so 37LIBS += ../bin/libmicrokdepim.so
37LIBS += ../bin/libmicrokcal.so 38LIBS += ../bin/libmicrokcal.so
38LIBS += ../bin/libmicrokde.so 39LIBS += ../bin/libmicrokde.so
39LIBS += ../bin/libmicrokabc.so 40LIBS += ../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}
45OBJECTS_DIR = obj/unix 46OBJECTS_DIR = obj/unix
46MOC_DIR = moc/unix 47MOC_DIR = moc/unix
47} 48}
48win32: { 49win32: {
49RC_FILE = winicons.rc 50RC_FILE = winicons.rc
50DEFINES += _WIN32_ 51DEFINES += _WIN32_
51LIBS += ../bin/microkdepim.lib 52LIBS += ../bin/microkdepim.lib
52LIBS += ../bin/microkcal.lib 53LIBS += ../bin/microkcal.lib
53LIBS += ../bin/microkde.lib 54LIBS += ../bin/microkde.lib
54LIBS += ../bin/microkabc.lib 55LIBS += ../bin/microkabc.lib
55LIBS += ../libical/lib/ical.lib 56LIBS += ../libical/lib/ical.lib
56LIBS += ../libical/lib/icalss.lib 57LIBS += ../libical/lib/icalss.lib
57#LIBS += atls.lib 58#LIBS += atls.lib
58QMAKE_LINK += /NODEFAULTLIB:LIBC 59QMAKE_LINK += /NODEFAULTLIB:LIBC
59OBJECTS_DIR = obj/win 60OBJECTS_DIR = obj/win
60MOC_DIR = moc/win 61MOC_DIR = moc/win
61#olimport section 62#olimport section
62importol: { 63importol: {
63debug: { 64debug: {
64LIBS += mfc71ud.lib 65LIBS += mfc71ud.lib
65QMAKE_LINK += /NODEFAULTLIB:MSVCRT 66QMAKE_LINK += /NODEFAULTLIB:MSVCRT
66QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib 67QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
67} 68}
68release: { 69release: {
69LIBS += mfc71u.lib 70LIBS += mfc71u.lib
70} 71}
71DEFINES += _OL_IMPORT_ 72DEFINES += _OL_IMPORT_
72 73
73HEADERS += ../outport/msoutl9.h \ 74HEADERS += ../outport/msoutl9.h \
74 koimportoldialog.h 75 koimportoldialog.h
75 76
76SOURCES += ../outport/msoutl9.cpp \ 77SOURCES += ../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
84INTERFACES = kofilterview_base.ui 87INTERFACES = kofilterview_base.ui
85#filteredit_base.ui 88#filteredit_base.ui
86 89
87# kdateedit.h \ 90# kdateedit.h \
88 91
89HEADERS += datenavigatorcontainer.h \ 92HEADERS += 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 \
112 koeditorgeneraltodo.h \ 115 koeditorgeneraltodo.h \
113 koeditorrecurrence.h \ 116 koeditorrecurrence.h \
114 koeventeditor.h \ 117 koeventeditor.h \
115 koeventpopupmenu.h \ 118 koeventpopupmenu.h \
116 koeventview.h \ 119 koeventview.h \
117 koeventviewer.h \ 120 koeventviewer.h \
118 koeventviewerdialog.h \ 121 koeventviewerdialog.h \
119 kofilterview.h \ 122 kofilterview.h \
120 koglobals.h \ 123 koglobals.h \
121 koincidenceeditor.h \ 124 koincidenceeditor.h \
122 kojournalview.h \ 125 kojournalview.h \
123 kolistview.h \ 126 kolistview.h \
124 kolocationbox.h \ 127 kolocationbox.h \
125 komonthview.h \ 128 komonthview.h \
126 koprefs.h \ 129 koprefs.h \
127 koprefsdialog.h \ 130 koprefsdialog.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
4unix { 4unix {
5CONFIG += release
6#for statically linking 5#for statically linking
7#CONFIG += staticlib 6#CONFIG += staticlib
8} 7}
9win32 { 8win32 {
10CONFIG += release 9#disable importol to make it running on windows ME/98
11CONFIG += importol 10CONFIG += importol
12 11
13} 12}
14CONFIG += thread 13CONFIG += thread
14CONFIG += release