| author | zautrix <zautrix> | 2004-07-08 00:16:46 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-07-08 00:16:46 (UTC) |
| commit | e8628e6e3e98f2276fb69bbc545866cc9a022228 (patch) (side-by-side diff) | |
| tree | 798f61100c1ec3dab71a00ba63ac0d99fbd643b1 /kabc | |
| parent | 5030b0bd32b1e526f28ce0339d4b4854492393ae (diff) | |
| download | kdepimpi-e8628e6e3e98f2276fb69bbc545866cc9a022228.zip kdepimpi-e8628e6e3e98f2276fb69bbc545866cc9a022228.tar.gz kdepimpi-e8628e6e3e98f2276fb69bbc545866cc9a022228.tar.bz2 | |
Compile fixes for windows
| -rw-r--r-- | kabc/plugins/dir/dir.pro | 5 | ||||
| -rw-r--r-- | kabc/plugins/dir/resourcedir.cpp | 11 | ||||
| -rw-r--r-- | kabc/plugins/file/file.pro | 5 | ||||
| -rw-r--r-- | kabc/plugins/file/resourcefile.cpp | 10 |
4 files changed, 28 insertions, 3 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 @@ -23,7 +23,12 @@ OBJECTS_DIR = obj/unix 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 @@ -62,14 +62,20 @@ $Id$ using namespace KABC; extern "C" +#ifdef _WIN32_ +__declspec(dllexport) +#else { +#endif + //US void *init_kabc_dir() void *init_microkabc_dir() { return new KRES::PluginFactory<ResourceDir,ResourceDirConfig>(); } +#ifndef _WIN32_ } - +#endif ResourceDir::ResourceDir( const KConfig *config ) : Resource( config ) @@ -122,7 +128,8 @@ ResourceDir::~ResourceDir() } void ResourceDir::writeConfig( KConfig *config ) -{ +{ + config->setGroup( "Resource_" + identifier() ); Resource::writeConfig( config ); config->writeEntry( "FilePath", mPath ); 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 @@ -24,7 +24,12 @@ OBJECTS_DIR = obj/unix 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 @@ -58,14 +58,20 @@ $Id$ using namespace KABC; extern "C" +#ifdef _WIN32_ +__declspec(dllexport) +#else { +#endif + //US void *init_kabc_file() void *init_microkabc_file() { return new KRES::PluginFactory<ResourceFile,ResourceFileConfig>(); } +#ifndef _WIN32_ } - +#endif ResourceFile::ResourceFile( const KConfig *config ) : Resource( config ) , mFormat( 0 ) @@ -137,6 +143,8 @@ ResourceFile::~ResourceFile() void ResourceFile::writeConfig( KConfig *config ) { + + config->setGroup( "Resource_" + identifier() ); Resource::writeConfig( config ); config->writeEntry( "FileName", mFileName ); |