summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kaddressbook.pro4
-rw-r--r--korganizer/korganizer.pro4
-rw-r--r--variables.pri1
3 files changed, 5 insertions, 4 deletions
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index f9d22d5..3386ffe 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -5,109 +5,109 @@ DESTDIR= ../bin
include( ../variables.pri )
INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../ interfaces
DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION
unix : {
staticlib: {
LIBS += ../bin/libmicrokabc_qtopia.a
LIBS += ../bin/libmicrokabc_file.a
LIBS += ../bin/libmicrokabc_dir.a
LIBS += ../bin/libmicrokdepim.a
LIBS += ../bin/libmicrokcal.a
LIBS += ../bin/libmicrokabc.a
LIBS += ../bin/libmicrokde.a
LIBS += ../bin/libmicrokabc_qtopia.a
LIBS += ../bin/libmicrokabc_file.a
LIBS += ../bin/libmicrokabc_dir.a
LIBS += ../bin/libmicrokdepim.a
LIBS += ../bin/libmicrokcal.a
LIBS += ../bin/libmicrokabc.a
LIBS += ../bin/libmicrokde.a
LIBS += ../libical/lib/libical.a
LIBS += ../libical/lib/libicalss.a
} else {
LIBS += ../bin/libmicrokdepim.so
LIBS += ../bin/libmicrokde.so
LIBS += ../bin/libmicrokabc.so
LIBS += ../bin/libmicrokcal.so
#LIBS += -lldap
}
OBJECTS_DIR = obj/unix
MOC_DIR = moc/unix
}
win32: {
RC_FILE = winicons.rc
DEFINES += _WIN32_
LIBS += ../bin/microkdepim.lib
LIBS += ../bin/microkcal.lib
LIBS += ../bin/microkde.lib
LIBS += ../bin/microkabc.lib
QMAKE_LINK += /NODEFAULTLIB:LIBC
OBJECTS_DIR = obj/win
MOC_DIR = moc/win
#olimport section
-#blabla: {
+importol {
debug: {
LIBS += mfc71ud.lib
}
release: {
LIBS += mfc71u.lib
}
DEFINES += _OL_IMPORT_
HEADERS = ../outport/msoutl9.h \
kaimportoldialog.h
SOURCES = ../outport/msoutl9.cpp \
kaimportoldialog.cpp
-#}
+}
#olimport section end
}
INTERFACES = \
# filteredit_base.ui \
# kofilterview_base.ui \
HEADERS += \
features/mergewidget.h \
features/distributionlistwidget.h \
kcmconfigs/addresseewidget.h \
kcmconfigs/extensionconfigdialog.h \
kcmconfigs/kcmkabconfig.h \
kcmconfigs/kabconfigwidget.h \
addresseeeditordialog.h \
addresseeeditorwidget.h \
addresseditwidget.h \
addresseeconfig.h \
addresseeutil.h \
emaileditwidget.h \
filtereditdialog.h \
kaddressbookmain.h \
kabprefs.h \
kabcore.h \
viewmanager.h \
extensionmanager.h \
extensionwidget.h \
kaddressbookview.h \
geowidget.h \
imagewidget.h \
incsearchwidget.h \
jumpbuttonbar.h \
phoneeditwidget.h \
secrecywidget.h \
keywidget.h \
nameeditdialog.h \
filter.h \
addviewdialog.h \
configurewidget.h \
viewconfigurewidget.h \
viewconfigurefieldspage.h \
viewconfigurefilterpage.h \
typecombo.h \
undo.h \
undocmds.h \
xxportmanager.h \
xxportobject.h \
xxportselectdialog.h \
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index bb5f29e..0750083 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -14,113 +14,113 @@ DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
#KORG_NOPRINTER KORG_NOKABC KORG_NODND
DEFINES += KORG_NOLVALTERNATION
DEFINES += DESKTOP_VERSION
unix : {
staticlib: {
LIBS += ../bin/libmicrokabc_qtopia.a
LIBS += ../bin/libmicrokabc_file.a
LIBS += ../bin/libmicrokabc_dir.a
LIBS += ../bin/libmicrokdepim.a
LIBS += ../bin/libmicrokcal.a
LIBS += ../bin/libmicrokabc.a
LIBS += ../bin/libmicrokde.a
LIBS += ../bin/libmicrokabc_qtopia.a
LIBS += ../bin/libmicrokabc_file.a
LIBS += ../bin/libmicrokabc_dir.a
LIBS += ../bin/libmicrokdepim.a
LIBS += ../bin/libmicrokcal.a
LIBS += ../bin/libmicrokabc.a
LIBS += ../bin/libmicrokde.a
LIBS += ../libical/lib/libical.a
LIBS += ../libical/lib/libicalss.a
} else {
LIBS += ../bin/libmicrokdepim.so
LIBS += ../bin/libmicrokcal.so
LIBS += ../bin/libmicrokde.so
LIBS += ../bin/libmicrokabc.so
#LIBS += -lbluetooth
#LIBS += -lsdp
#LIBS += -lldap
}
OBJECTS_DIR = obj/unix
MOC_DIR = moc/unix
}
win32: {
RC_FILE = winicons.rc
DEFINES += _WIN32_
LIBS += ../bin/microkdepim.lib
LIBS += ../bin/microkcal.lib
LIBS += ../bin/microkde.lib
LIBS += ../bin/microkabc.lib
LIBS += ../libical/lib/ical.lib
LIBS += ../libical/lib/icalss.lib
#LIBS += atls.lib
QMAKE_LINK += /NODEFAULTLIB:LIBC
OBJECTS_DIR = obj/win
MOC_DIR = moc/win
#olimport section
-#blabla: {
+importol: {
debug: {
LIBS += mfc71ud.lib
QMAKE_LINK += /NODEFAULTLIB:MSVCRT
QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
}
release: {
LIBS += mfc71u.lib
}
DEFINES += _OL_IMPORT_
HEADERS += ../outport/msoutl9.h \
koimportoldialog.h
SOURCES += ../outport/msoutl9.cpp \
koimportoldialog.cpp
-#}
+}
#olimport section end
}
INTERFACES = kofilterview_base.ui
#filteredit_base.ui
# kdateedit.h \
HEADERS += datenavigatorcontainer.h \
filteredit_base.h \
alarmclient.h \
calendarview.h \
customlistviewitem.h \
datenavigator.h \
docprefs.h \
filtereditdialog.h \
incomingdialog.h \
incomingdialog_base.h \
interfaces/korganizer/baseview.h \
interfaces/korganizer/calendarviewbase.h \
journalentry.h \
kdatenavigator.h \
koagenda.h \
koagendaitem.h \
koagendaview.h \
kocounterdialog.h \
kodaymatrix.h \
kodialogmanager.h \
koeditordetails.h \
koeditorgeneral.h \
koeditorgeneralevent.h \
koeditorgeneraltodo.h \
koeditorrecurrence.h \
koeventeditor.h \
koeventpopupmenu.h \
koeventview.h \
koeventviewer.h \
koeventviewerdialog.h \
kofilterview.h \
koglobals.h \
koincidenceeditor.h \
kojournalview.h \
kolistview.h \
kolocationbox.h \
komonthview.h \
koprefs.h \
diff --git a/variables.pri b/variables.pri
index 67c144d..4144b8e 100644
--- a/variables.pri
+++ b/variables.pri
@@ -1,13 +1,14 @@
# variables settings for compilation for Linux desktop and Qt 3.x.x
unix {
CONFIG += release
#for statically linking
#CONFIG += staticlib
}
win32 {
CONFIG += release
+CONFIG += importol
}
CONFIG += thread