-rw-r--r-- | kabc/plugins/dir/dir.pro | 5 | ||||
-rw-r--r-- | kabc/plugins/dir/resourcedir.cpp | 9 | ||||
-rw-r--r-- | kabc/plugins/file/file.pro | 5 | ||||
-rw-r--r-- | kabc/plugins/file/resourcefile.cpp | 10 |
4 files changed, 27 insertions, 2 deletions
diff --git a/kabc/plugins/dir/dir.pro b/kabc/plugins/dir/dir.pro index 3db201f..0023029 100644 --- a/kabc/plugins/dir/dir.pro +++ b/kabc/plugins/dir/dir.pro @@ -24,6 +24,11 @@ MOC_DIR = moc/unix } win32: { +CONFIG += dll DEFINES += _WIN32_ OBJECTS_DIR = obj/win MOC_DIR = moc/win +LIBS += ../../../bin/microkdepim.lib +LIBS += ../../../bin/microkcal.lib +LIBS += ../../../bin/microkde.lib +LIBS += ../../../bin/microkabc.lib }
\ No newline at end of file diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp index 6ea2f4b..3cb5179 100644 --- a/kabc/plugins/dir/resourcedir.cpp +++ b/kabc/plugins/dir/resourcedir.cpp @@ -63,5 +63,10 @@ using namespace KABC; extern "C" +#ifdef _WIN32_ +__declspec(dllexport) +#else { +#endif + //US void *init_kabc_dir() void *init_microkabc_dir() @@ -69,6 +74,7 @@ extern "C" return new KRES::PluginFactory<ResourceDir,ResourceDirConfig>(); } +#ifndef _WIN32_ } - +#endif ResourceDir::ResourceDir( const KConfig *config ) @@ -124,4 +130,5 @@ ResourceDir::~ResourceDir() void ResourceDir::writeConfig( KConfig *config ) { + config->setGroup( "Resource_" + identifier() ); Resource::writeConfig( config ); diff --git a/kabc/plugins/file/file.pro b/kabc/plugins/file/file.pro index a5ade93..7cf7c58 100644 --- a/kabc/plugins/file/file.pro +++ b/kabc/plugins/file/file.pro @@ -25,6 +25,11 @@ MOC_DIR = moc/unix } win32: { +CONFIG += dll DEFINES += _WIN32_ OBJECTS_DIR = obj/win MOC_DIR = moc/win +LIBS += ../../../bin/microkdepim.lib +LIBS += ../../../bin/microkcal.lib +LIBS += ../../../bin/microkde.lib +LIBS += ../../../bin/microkabc.lib }
\ No newline at end of file diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp index 4b4c935..2d20706 100644 --- a/kabc/plugins/file/resourcefile.cpp +++ b/kabc/plugins/file/resourcefile.cpp @@ -59,5 +59,10 @@ using namespace KABC; extern "C" +#ifdef _WIN32_ +__declspec(dllexport) +#else { +#endif + //US void *init_kabc_file() void *init_microkabc_file() @@ -65,6 +70,7 @@ extern "C" return new KRES::PluginFactory<ResourceFile,ResourceFileConfig>(); } +#ifndef _WIN32_ } - +#endif ResourceFile::ResourceFile( const KConfig *config ) @@ -138,4 +144,6 @@ ResourceFile::~ResourceFile() void ResourceFile::writeConfig( KConfig *config ) { + + config->setGroup( "Resource_" + identifier() ); Resource::writeConfig( config ); |