summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-08-18 05:32:46 (UTC)
committer zautrix <zautrix>2005-08-18 05:32:46 (UTC)
commit075fe8e7470f5b9db7553889271880e476a6015a (patch) (side-by-side diff)
treebdc4f7117a7189eccaf8fe2c36edc27bc6bf79f7
parent9de953866db87933c9773b98502f07ac408c8ef7 (diff)
downloadkdepimpi-075fe8e7470f5b9db7553889271880e476a6015a.zip
kdepimpi-075fe8e7470f5b9db7553889271880e476a6015a.tar.gz
kdepimpi-075fe8e7470f5b9db7553889271880e476a6015a.tar.bz2
pro fix
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,38 +1,39 @@
TEMPLATE = app
CONFIG = qt warn_on
TARGET = kapi
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: {
+TARGET = kapi_linux
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
}
@@ -41,50 +42,52 @@ 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
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
+} else {
+TARGET = kapi_me
+}
}
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 \
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index 0750083..50443ef 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -1,42 +1,43 @@
TEMPLATE = app
CONFIG = qt warn_on
TARGET = kopi
OBJECTS_DIR = _obj/
MOC_DIR = _moc
DESTDIR= ../bin
include( ../variables.pri )
INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim
#../qtcompat
DEFINES += KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL
DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
#KORG_NOPRINTER KORG_NOKABC KORG_NODND
DEFINES += KORG_NOLVALTERNATION
DEFINES += DESKTOP_VERSION
unix : {
staticlib: {
+TARGET = kopi_linux
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
@@ -54,50 +55,52 @@ 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
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
+} else {
+TARGET = kopi_me
+}
}
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 \
diff --git a/variables.pri b/variables.pri
index 4144b8e..5d3b6cb 100644
--- a/variables.pri
+++ b/variables.pri
@@ -1,14 +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
+#disable importol to make it running on windows ME/98
CONFIG += importol
}
CONFIG += thread
+CONFIG += release