summaryrefslogtreecommitdiffabout
Unidiff
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
@@ -7,17 +7,27 @@ include( ../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
14staticlib: {
15LIBS += ../bin/libmicrokdepim.a
16LIBS += ../bin/libmicrokcal.a
17LIBS += ../bin/libmicrokabc.a
18LIBS += ../bin/libmicrokde.a
19LIBS += ../libical/lib/libical.a
20LIBS += ../libical/lib/libicalss.a
21} else {
13LIBS += ../bin/libmicrokdepim.so 22LIBS += ../bin/libmicrokdepim.so
14LIBS += ../bin/libmicrokde.so 23LIBS += ../bin/libmicrokde.so
15LIBS += ../bin/libmicrokabc.so 24LIBS += ../bin/libmicrokabc.so
16LIBS += ../bin/libmicrokcal.so 25LIBS += ../bin/libmicrokcal.so
17#LIBS += -lldap 26#LIBS += -lldap
27}
18OBJECTS_DIR = obj/unix 28OBJECTS_DIR = obj/unix
19MOC_DIR = moc/unix 29MOC_DIR = moc/unix
20} 30}
21win32: { 31win32: {
22RC_FILE = winicons.rc 32RC_FILE = winicons.rc
23DEFINES += _WIN32_ 33DEFINES += _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 @@
1 1
2 2include( ./variables.pri )
3TEMPLATE = subdirs 3TEMPLATE = subdirs
4SUBDIRS = libical libkcal kabc libkdepim microkde korganizer kaddressbook kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia gammu/emb/common gammu/emb/gammu 4SUBDIRS = libical libkcal kabc libkdepim microkde korganizer kaddressbook kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia gammu/emb/common gammu/emb/gammu
5unix:{ 5unix:{
6!staticlib: {
6SUBDIRS += libetpan kmicromail/libmailwrapper kmicromail pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib pwmanager/pwmanager 7SUBDIRS += libetpan kmicromail/libmailwrapper kmicromail pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib pwmanager/pwmanager
7} 8}
9}
8 10
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index 546b6e5..59a1a84 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -12,20 +12,29 @@ INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui
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: {
19LIBS += ../bin/libmicrokdepim.a
20LIBS += ../bin/libmicrokcal.a
21LIBS += ../bin/libmicrokabc.a
22LIBS += ../bin/libmicrokde.a
23LIBS += ../libical/lib/libical.a
24LIBS += ../libical/lib/libicalss.a
25} else {
18LIBS += ../bin/libmicrokdepim.so 26LIBS += ../bin/libmicrokdepim.so
19LIBS += ../bin/libmicrokcal.so 27LIBS += ../bin/libmicrokcal.so
20LIBS += ../bin/libmicrokde.so 28LIBS += ../bin/libmicrokde.so
21LIBS += ../bin/libmicrokabc.so 29LIBS += ../bin/libmicrokabc.so
22#LIBS += -lbluetooth 30#LIBS += -lbluetooth
23#LIBS += -lsdp 31#LIBS += -lsdp
24 32
25#LIBS += -lldap 33#LIBS += -lldap
34}
26OBJECTS_DIR = obj/unix 35OBJECTS_DIR = obj/unix
27MOC_DIR = moc/unix 36MOC_DIR = moc/unix
28} 37}
29win32: { 38win32: {
30RC_FILE = winicons.rc 39RC_FILE = winicons.rc
31DEFINES += _WIN32_ 40DEFINES += _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
@@ -41,13 +41,13 @@ $Id$
41#include "kprefs.h" 41#include "kprefs.h"
42#include "kpimglobalprefs.h" 42#include "kpimglobalprefs.h"
43 43
44#ifndef _WIN32_ 44#ifndef _WIN32_
45extern "C" 45extern "C"
46{ 46{
47 KCModule *create_kabconfig(QWidget *parent, const char * ) { 47 KCModule *create_kdepimconfig(QWidget *parent, const char * ) {
48 return new KCMKdePimConfig(parent, "kcmkdepimconfig" ); 48 return new KCMKdePimConfig(parent, "kcmkdepimconfig" );
49 } 49 }
50} 50}
51#endif 51#endif
52 52
53KCMKdePimConfig::KCMKdePimConfig(QWidget *parent, const char *name ) 53KCMKdePimConfig::KCMKdePimConfig(QWidget *parent, const char *name )
diff --git a/variables.pri b/variables.pri
index 08c2a45..244de4c 100644
--- a/variables.pri
+++ b/variables.pri
@@ -1,10 +1,12 @@
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 5CONFIG += release
6#for statically linking
7#CONFIG += staticlib
6} 8}
7win32 { 9win32 {
8CONFIG += release 10CONFIG += release
9 11
10} \ No newline at end of file 12} \ No newline at end of file