| author | zautrix <zautrix> | 2005-04-03 19:05:24 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-04-03 19:05:24 (UTC) |
| commit | 2d83daf3568bb829db2530baa917db5a4cbf0768 (patch) (side-by-side diff) | |
| tree | 29e6a92865f7ebf007eb9de1453710a905afaefa | |
| parent | 2ab1c2cb6c58e719c47390b2f919262b2557f2be (diff) | |
| download | kdepimpi-2d83daf3568bb829db2530baa917db5a4cbf0768.zip kdepimpi-2d83daf3568bb829db2530baa917db5a4cbf0768.tar.gz kdepimpi-2d83daf3568bb829db2530baa917db5a4cbf0768.tar.bz2 | |
static compile fixes
| -rw-r--r-- | kaddressbook/kaddressbook.pro | 10 | ||||
| -rw-r--r-- | kdepim-desktop.pro | 4 | ||||
| -rw-r--r-- | korganizer/korganizer.pro | 9 | ||||
| -rw-r--r-- | libkdepim/kcmconfigs/kcmkdepimconfig.cpp | 2 | ||||
| -rw-r--r-- | variables.pri | 2 |
5 files changed, 25 insertions, 2 deletions
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro index e73de06..2534835 100644 --- a/kaddressbook/kaddressbook.pro +++ b/kaddressbook/kaddressbook.pro @@ -9,13 +9,23 @@ 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/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: { diff --git a/kdepim-desktop.pro b/kdepim-desktop.pro index 20c91ef..7ade680 100644 --- a/kdepim-desktop.pro +++ b/kdepim-desktop.pro @@ -1,8 +1,10 @@ - +include( ./variables.pri ) TEMPLATE = subdirs SUBDIRS = libical libkcal kabc libkdepim microkde korganizer kaddressbook kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia gammu/emb/common gammu/emb/gammu unix:{ +!staticlib: { SUBDIRS += libetpan kmicromail/libmailwrapper kmicromail pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib pwmanager/pwmanager } +} diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index 546b6e5..59a1a84 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro @@ -14,16 +14,25 @@ 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/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: { diff --git a/libkdepim/kcmconfigs/kcmkdepimconfig.cpp b/libkdepim/kcmconfigs/kcmkdepimconfig.cpp index e77c5ab..5094830 100644 --- a/libkdepim/kcmconfigs/kcmkdepimconfig.cpp +++ b/libkdepim/kcmconfigs/kcmkdepimconfig.cpp @@ -43,9 +43,9 @@ $Id$ #ifndef _WIN32_ extern "C" { - KCModule *create_kabconfig(QWidget *parent, const char * ) { + KCModule *create_kdepimconfig(QWidget *parent, const char * ) { return new KCMKdePimConfig(parent, "kcmkdepimconfig" ); } } #endif diff --git a/variables.pri b/variables.pri index 08c2a45..244de4c 100644 --- a/variables.pri +++ b/variables.pri @@ -2,8 +2,10 @@ # variables settings for compilation for Linux desktop and Qt 3.x.x unix { CONFIG += release +#for statically linking +#CONFIG += staticlib } win32 { CONFIG += release |