summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-04-03 19:05:24 (UTC)
committer zautrix <zautrix>2005-04-03 19:05:24 (UTC)
commit2d83daf3568bb829db2530baa917db5a4cbf0768 (patch) (side-by-side diff)
tree29e6a92865f7ebf007eb9de1453710a905afaefa
parent2ab1c2cb6c58e719c47390b2f919262b2557f2be (diff)
downloadkdepimpi-2d83daf3568bb829db2530baa917db5a4cbf0768.zip
kdepimpi-2d83daf3568bb829db2530baa917db5a4cbf0768.tar.gz
kdepimpi-2d83daf3568bb829db2530baa917db5a4cbf0768.tar.bz2
static compile fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kaddressbook.pro10
-rw-r--r--kdepim-desktop.pro6
-rw-r--r--korganizer/korganizer.pro9
-rw-r--r--libkdepim/kcmconfigs/kcmkdepimconfig.cpp2
-rw-r--r--variables.pri2
5 files changed, 26 insertions, 3 deletions
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index e73de06..2534835 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -1,41 +1,51 @@
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: {
+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: {
LIBS += mfc71u.lib
DEFINES += _OL_IMPORT_
HEADERS = ../outport/msoutl9.h \
kaimportoldialog.h
SOURCES = ../outport/msoutl9.cpp \
kaimportoldialog.cpp
#}
#olimport section end
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:{
+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
@@ -1,49 +1,58 @@
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: {
+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
#QMAKE_LINK += /NODEFAULTLIB:MSVCRT
#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
OBJECTS_DIR = obj/win
MOC_DIR = moc/win
#olimport section
#blabla: {
LIBS += mfc71u.lib
DEFINES += _OL_IMPORT_
HEADERS += ../outport/msoutl9.h \
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
@@ -23,49 +23,49 @@
/*
Enhanced Version of the file for platform independent KDE tools.
Copyright (c) 2004 Ulf Schenk
$Id$
*/
#include <qlayout.h>
#include <kdebug.h>
//#include <klocale.h>
//#include <stdlib.h>
#include "kdepimconfigwidget.h"
#include "kcmkdepimconfig.h"
#include "kprefs.h"
#include "kpimglobalprefs.h"
#ifndef _WIN32_
extern "C"
{
- KCModule *create_kabconfig(QWidget *parent, const char * ) {
+ KCModule *create_kdepimconfig(QWidget *parent, const char * ) {
return new KCMKdePimConfig(parent, "kcmkdepimconfig" );
}
}
#endif
KCMKdePimConfig::KCMKdePimConfig(QWidget *parent, const char *name )
: KCModule( KPimGlobalPrefs::instance(), parent, name )
{
//abort();
QVBoxLayout *layout = new QVBoxLayout( this );
mConfigWidget = new KDEPIMConfigWidget( (KPimGlobalPrefs*)getPreferences(), this, "KDEPIMConfigWidget" );
layout->addWidget( mConfigWidget );
layout->setSpacing( 0 );
layout->setMargin( 0 );
connect( mConfigWidget, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) );
}
void KCMKdePimConfig::load()
{
mConfigWidget->readConfig();
}
void KCMKdePimConfig::save()
diff --git a/variables.pri b/variables.pri
index 08c2a45..244de4c 100644
--- a/variables.pri
+++ b/variables.pri
@@ -1,10 +1,12 @@
# variables settings for compilation for Linux desktop and Qt 3.x.x
unix {
CONFIG += release
+#for statically linking
+#CONFIG += staticlib
}
win32 {
CONFIG += release
} \ No newline at end of file