summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show 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
@@ -3,24 +3,25 @@ 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
@@ -53,26 +54,28 @@ MOC_DIR = moc/win
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 \
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
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
@@ -66,26 +67,28 @@ QMAKE_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 \
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