Changes for compiling on desktop

15 files changed, 239 insertions, 146 deletions

diff --git a/Makefile b/Makefile
index d770a05..620581b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,118 +1,147 @@
-DISTPATH = $(shell pwd)
-DISTDIR = $(shell basename $(DISTPATH))
-
-SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \
-   libkcal libkdepim kabc  kabc/converter/opie kabc/formats/binary kabc/plugins/file kabc/plugins/dir \
-   kabc/plugins/opie \
-	 korganizer kalarmd kaddressbook kmicromail/libetpan kmicromail/libmailwrapper kmicromail
-all: tmake
-	for i in $(SUBDIRS); do pushd $$i; \
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
-
-objects:
-	for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
-	for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
-	mkdir -p libical/lib/$(PLATFORM)
-
-clean:
-	rm -f libical/lib/$(PLATFORM)/*;
-	for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
-          rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
-          done 
-install:
-	cd bin/kdepim; make install
-	cp db2file/db2file $(QPEDIR)/bin/db2file
-	cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
-	cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop
-	cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
-
-dist:
-	@echo Dont forget to do "make install" before "make dist"
-	rm -f *arm.ipk
-	rm -f *~
-	cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim
-	mkipks kmicrokdelibs.control
-	mkipks korganizer.control
-	mkipks kaddressbook.control
-	mkipks kopiemail.control
-	mkipks korganizer-alarm.control
-
-tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \
-       libkcal/Makefile$(PLATFORM) \
-       libkdepim/Makefile$(PLATFORM) korganizer/Makefile$(PLATFORM) \
-       kalarmd/Makefile$(PLATFORM) \
-       libical/src/libical/Makefile$(PLATFORM) \
-       libical/src/libicalss/Makefile$(PLATFORM) \
-       kabc/Makefile$(PLATFORM) \
-       kabc/converter/opie/Makefile$(PLATFORM) \
-       kabc/formats/binary/Makefile$(PLATFORM) \
-       kabc/plugins/file/Makefile$(PLATFORM) \
-       kabc/plugins/dir/Makefile$(PLATFORM) \
-       kabc/plugins/ldap/Makefile$(PLATFORM) \
-       kabc/plugins/opie/Makefile$(PLATFORM) \
-       kaddressbook/Makefile$(PLATFORM) \
-       kmicromail/Makefile$(PLATFORM) \
-       kmicromail/libetpan/Makefile$(PLATFORM) \
-       kmicromail/libmailwrapper/Makefile$(PLATFORM) 
-
-
-
-qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
-	cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM)
-
-microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
-	cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" microkdeE.pro -o Makefile$(PLATFORM)
-
-libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
-	cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" libkcalE.pro -o Makefile$(PLATFORM)
-
-
-libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
-	cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" libkdepimE.pro -o Makefile$(PLATFORM)
-
-kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
-	cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" kalarmdE.pro -o Makefile$(PLATFORM)
-
-korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
-	cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" korganizerE.pro -o Makefile$(PLATFORM)
-
-libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
-	cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalE.pro -o Makefile$(PLATFORM)
-
-libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
-	cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalssE.pro -o Makefile$(PLATFORM)
-
-kabc/Makefile$(PLATFORM): kabc/kabcE.pro
-	cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcE.pro -o Makefile$(PLATFORM)
-
-kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieconverterE.pro
-	cd kabc/converter/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieconverterE.pro -o Makefile$(PLATFORM)
-  
-kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
-	cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
-
-kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/kabc_fileE.pro
-	cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_fileE.pro -o Makefile$(PLATFORM)
-
-kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/kabc_dirE.pro
-	cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_dirE.pro -o Makefile$(PLATFORM)
-
-kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/kabc_ldapE.pro
-	cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_ldapE.pro -o Makefile$(PLATFORM)
-
-kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/kabc_opieE.pro
-	cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_opieE.pro -o Makefile$(PLATFORM)
-
-
-kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
-	cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM)
-
-
-kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
-	cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" kmicromailE.pro -o Makefile$(PLATFORM)
-kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
-	cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" libetpanE.pro -o Makefile$(PLATFORM)
-kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
-	cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM)
+#############################################################################
+# Makefile for building: kopi-desktop
+# Generated by qmake (1.07a) (Qt 3.3.2) on: Wed Jul  7 13:43:59 2004
+# Project:  kopi-desktop.pro
+# Template: subdirs
+# Command: $(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kopi-desktop.pro
+#############################################################################
+
+MAKEFILE =	Makefile
+QMAKE    =	qmake
+DEL_FILE =    rm -f
+CHK_DIR_EXISTS= test -d
+MKDIR    = mkdir -p
+INSTALL_FILE= 
+INSTALL_DIR = 
+SUBTARGETS =	 \
+		sub-libical \
+		sub-libkcal \
+		sub-microkde \
+		sub-libkdepim \
+		sub-kabc \
+		sub-korganizer \
+		sub-kaddressbook \
+		sub-kabc-plugins-file \
+		sub-kabc-plugins-dir
+
+first: all
+
+all: Makefile $(SUBTARGETS)
+
+libical/$(MAKEFILE): 
+	@$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical"
+	cd libical && $(QMAKE) libical.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-libical: libical/$(MAKEFILE) FORCE
+	cd libical && $(MAKE) -f $(MAKEFILE)
+
+libkcal/$(MAKEFILE): 
+	@$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal"
+	cd libkcal && $(QMAKE) libkcal.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-libkcal: libkcal/$(MAKEFILE) FORCE
+	cd libkcal && $(MAKE) -f $(MAKEFILE)
+
+microkde/$(MAKEFILE): 
+	@$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde"
+	cd microkde && $(QMAKE) microkde.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-microkde: microkde/$(MAKEFILE) FORCE
+	cd microkde && $(MAKE) -f $(MAKEFILE)
+
+libkdepim/$(MAKEFILE): 
+	@$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim"
+	cd libkdepim && $(QMAKE) libkdepim.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-libkdepim: libkdepim/$(MAKEFILE) FORCE
+	cd libkdepim && $(MAKE) -f $(MAKEFILE)
+
+kabc/$(MAKEFILE): 
+	@$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc"
+	cd kabc && $(QMAKE) kabc.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-kabc: kabc/$(MAKEFILE) FORCE
+	cd kabc && $(MAKE) -f $(MAKEFILE)
+
+korganizer/$(MAKEFILE): 
+	@$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer"
+	cd korganizer && $(QMAKE) korganizer.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-korganizer: korganizer/$(MAKEFILE) FORCE
+	cd korganizer && $(MAKE) -f $(MAKEFILE)
+
+kaddressbook/$(MAKEFILE): 
+	@$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook"
+	cd kaddressbook && $(QMAKE) kaddressbook.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE
+	cd kaddressbook && $(MAKE) -f $(MAKEFILE)
+
+kabc/plugins/file/$(MAKEFILE): 
+	@$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
+	cd kabc/plugins/file && $(QMAKE) file.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
+	cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
+
+kabc/plugins/dir/$(MAKEFILE): 
+	@$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
+	cd kabc/plugins/dir && $(QMAKE) dir.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
+	cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
+
+Makefile: kopi-desktop.pro  /usr/local/qtgcc/mkspecs/default/qmake.conf 
+	$(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kopi-desktop.pro
+qmake: qmake_all
+	@$(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kopi-desktop.pro
+
+all: $(SUBTARGETS)
+qmake_all: libical/$(MAKEFILE) libkcal/$(MAKEFILE) microkde/$(MAKEFILE) libkdepim/$(MAKEFILE) kabc/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE)
+	 ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+	 ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+	 ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+	 ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+	 ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+	 ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+	 ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+	 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+	 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
+	 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+	 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+	 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+	 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+	 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+	 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+	 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+	 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+	 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+uninstall_subdirs: qmake_all FORCE
+	 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+	 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+	 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+	 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+	 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+	 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+	 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+	 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+	 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+install_subdirs: qmake_all FORCE
+	 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true
+	 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true
+	 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true
+	 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true
+	 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true
+	 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true
+	 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true
+	 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true
+	 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true
+distclean: qmake_all FORCE
+	 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+	 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+	 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+	 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+	 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+	 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+	 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+	 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+	 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+
+install:  install_subdirs
+
+uninstall:  uninstall_subdirs
+
+FORCE:
 
diff --git a/kabc/kabc.pro b/kabc/kabc.pro
index ea4bbb7..4a8d73a 100644
--- a/kabc/kabc.pro
+++ b/kabc/kabc.pro
@@ -44,3 +44,2 @@ distributionlisteditor.h \
 vcardformatplugin.h \
-formats/binaryformat.h \
 formats/vcardformatplugin2.h \
@@ -136,2 +135,3 @@ vcard/include/generated/TextListValue-generated.h
 # plugins/ldap/resourceldapconfig.h \
+#formats/binary/binaryformat.h \
  
@@ -143,3 +143,2 @@ distributionlisteditor.cpp \
 vcardformatplugin.cpp \
-formats/binaryformat.cpp \
 formats/vcardformatplugin2.cpp \
@@ -214 +213,2 @@ vcard/TextListValue.cpp
 
+#formats/binary/binaryformat.cpp \
diff --git a/kabc/plugins/dir/dir.pro b/kabc/plugins/dir/dir.pro
new file mode 100644
index 0000000..3db201f
--- a/dev/null
+++ b/kabc/plugins/dir/dir.pro
@@ -0,0 +1,29 @@
+TEMPLATE	= lib
+CONFIG += qt warn_on release
+#release debug
+
+TARGET = microkabc_dir
+INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat
+DESTDIR = ../../../bin
+#LIBS += -lmicrokde -lmicrokabc
+#LIBS += -L$(QPEDIR)/lib
+
+INTERFACES = \
+
+HEADERS = \
+ resourcedir.h \
+ resourcedirconfig.h
+ 
+SOURCES = \
+ resourcedir.cpp \
+ resourcedirconfig.cpp
+
+unix : {
+OBJECTS_DIR = obj/unix
+MOC_DIR = moc/unix
+}
+win32: {
+DEFINES += _WIN32_
+OBJECTS_DIR = obj/win
+MOC_DIR = moc/win
+}
\ No newline at end of file
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index be19821..6ea2f4b 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -262,5 +262,7 @@ bool ResourceDir::lock( const QString &path )
   // Create lock file
-  int result = ::link( QFile::encodeName( mLockUniqueName ),
+  int result = 0;
+#ifndef _WIN32_
+  result = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
-
+#endif
   if ( result == 0 ) {
diff --git a/kabc/plugins/file/file.pro b/kabc/plugins/file/file.pro
new file mode 100644
index 0000000..a5ade93
--- a/dev/null
+++ b/kabc/plugins/file/file.pro
@@ -0,0 +1,30 @@
+TEMPLATE	= lib
+CONFIG += qt warn_on release
+#release debug
+
+TARGET = microkabc_file
+INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat
+
+DESTDIR = ../../../bin
+#LIBS += -lmicrokde -lmicrokabc
+#LIBS += -L$(QPEDIR)/lib
+
+INTERFACES = \
+
+HEADERS = \
+ resourcefile.h \
+ resourcefileconfig.h
+ 
+SOURCES = \
+ resourcefile.cpp \
+ resourcefileconfig.cpp
+
+unix : {
+OBJECTS_DIR = obj/unix
+MOC_DIR = moc/unix
+}
+win32: {
+DEFINES += _WIN32_
+OBJECTS_DIR = obj/win
+MOC_DIR = moc/win
+}
\ No newline at end of file
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index 3920f69..4b4c935 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -288,5 +288,7 @@ bool ResourceFile::lock( const QString &fileName )
   // Create lock file
-  int result = ::link( QFile::encodeName( mLockUniqueName ),
+  int result = 0;
+#ifndef _WIN32_
+   result = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
-
+#endif
   if ( result == 0 ) {
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index f84b2ba..eb5bdd9 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -28,2 +28,3 @@
 #include <qpushbutton.h>
+#include <qapplication.h>
 
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index dce6a88..cf1fd3e 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -47,4 +47,5 @@ int main( int argc, char **argv )
       QString fileName ;
-      fileName  = qApp->applicationDirPath () + "/kdepim/kaddressbook/";
+      fileName  = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/";
       KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
+      QApplication::addLibraryPath ( qApp->applicationDirPath () );
 
@@ -59,4 +60,4 @@ int main( int argc, char **argv )
 #else
-      a.setMainWidget(m );
-      m->show();
+      a.setMainWidget( &m );
+      m.show();
 #endif
diff --git a/kopi-desktop.pro b/kopi-desktop.pro
index 1a5fabd..b255756 100644
--- a/kopi-desktop.pro
+++ b/kopi-desktop.pro
@@ -3,3 +3,3 @@
 TEMPLATE = subdirs
-SUBDIRS =  libical libkcal microkde libkdepim kabc korganizer kaddressbook
+SUBDIRS =  libical libkcal microkde libkdepim kabc korganizer kaddressbook kabc/plugins/file kabc/plugins/dir
 #kalarmd
diff --git a/kopiemail.control b/kopiemail.control
index 3d563f0..7a93a1b 100644
--- a/kopiemail.control
+++ b/kopiemail.control
@@ -6,3 +6,3 @@ Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
-Version: 1.9.2a
+Version: 1.9.2b
 License: GPL
diff --git a/microkde/kdecore/klibloader.cpp b/microkde/kdecore/klibloader.cpp
index c07d50f..c091e05 100644
--- a/microkde/kdecore/klibloader.cpp
+++ b/microkde/kdecore/klibloader.cpp
@@ -42,10 +42,7 @@
 #include <qtopia/qlibrary.h>
+#else
+#include <qlibrary.h> 
 #endif
 
-/*US
-#ifdef Q_WS_X11
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#endif
-*/
+
 template class QAsciiDict<KLibrary>;
@@ -194,3 +191,2 @@ void* KLibrary::symbol( const char* symname ) const
 //US        kdWarning(150) << "KLibrary: " << lt_dlerror() << endl;
-        kdWarning(150) << "KLibrary: " << m_libname << ", symbol:" << symname << " not found " << endl;
         return 0;
@@ -479,4 +475,7 @@ KLibrary* KLibLoader::library( const char *name )
         return 0;
-
+#ifdef DESKTOP_VERSION
+      QLibrary *qlib = new QLibrary( libfile.latin1() );
+#else
       QLibrary *qlib = new QLibrary( libfile.latin1(), QLibrary::Immediately );
+#endif
         
@@ -601,2 +600,3 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap)
 
+#if 0
 #ifndef Q_WS_QWS
@@ -630,2 +630,3 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap)
 
+#endif // 0
     deleted_one = true;
diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp
index 1a1e027..7f51d78 100644
--- a/microkde/kdecore/kstandarddirs.cpp
+++ b/microkde/kdecore/kstandarddirs.cpp
@@ -45,3 +45,2 @@
 #include <qstringlist.h>
-#include <qpe/qpeapplication.h>
 
@@ -1227,3 +1226,3 @@ void KStandardDirs::addKDEDefaults()
 //US for embedded, add qtopia dir as kdedir    
-   kdedirList.append(QPEApplication::qpeDir());
+    kdedirList.append(readEnvPath("QPEDIR" ));
 
diff --git a/microkde/kdeui/ktoolbar.cpp b/microkde/kdeui/ktoolbar.cpp
index 92cb8d2..79b0f9d 100644
--- a/microkde/kdeui/ktoolbar.cpp
+++ b/microkde/kdeui/ktoolbar.cpp
@@ -1026,3 +1026,3 @@ int KToolBar::iconSize() const
     int ret = 18;
-    if ( QApplication::desktop()->width() > 320 && QApplication::desktop()->width() < 650  )
+    if ( QApplication::desktop()->width() > 320   )
         ret = 30;
diff --git a/microkde/kresources/factory.cpp b/microkde/kresources/factory.cpp
index 827ec38..2253de4 100644
--- a/microkde/kresources/factory.cpp
+++ b/microkde/kresources/factory.cpp
@@ -28,4 +28,5 @@
 #include <kstaticdeleter.h>
+//#ifndef DESKTOP_VERSION
 #include <klibloader.h>
-
+//#endif
 #include <qfile.h>
diff --git a/microkde/microkde.pro b/microkde/microkde.pro
index 1e9b022..05833a9 100644
--- a/microkde/microkde.pro
+++ b/microkde/microkde.pro
@@ -100,3 +100,4 @@ KDGanttMinimizeSplitter.h \
  kdeui/kactionclasses.h \
- kdeui/kactioncollection.h 
+ kdeui/kactioncollection.h \
+ kdecore/klibloader.h 
  
@@ -165,6 +166,3 @@ KDGanttMinimizeSplitter.cpp \
  kdeui/kstdaction.cpp \
- kdeui/kxmlguiclient.cpp 
-
-
-
-# kdecore/klibloader.cpp \
\ No newline at end of file
+ kdeui/kxmlguiclient.cpp \
+ kdecore/klibloader.cpp 
\ No newline at end of file