summaryrefslogtreecommitdiffabout
path: root/kabc
authorzautrix <zautrix>2004-07-08 00:16:46 (UTC)
committer zautrix <zautrix>2004-07-08 00:16:46 (UTC)
commite8628e6e3e98f2276fb69bbc545866cc9a022228 (patch) (side-by-side diff)
tree798f61100c1ec3dab71a00ba63ac0d99fbd643b1 /kabc
parent5030b0bd32b1e526f28ce0339d4b4854492393ae (diff)
downloadkdepimpi-e8628e6e3e98f2276fb69bbc545866cc9a022228.zip
kdepimpi-e8628e6e3e98f2276fb69bbc545866cc9a022228.tar.gz
kdepimpi-e8628e6e3e98f2276fb69bbc545866cc9a022228.tar.bz2
Compile fixes for windows
Diffstat (limited to 'kabc') (more/less context) (show whitespace changes)
-rw-r--r--kabc/plugins/dir/dir.pro5
-rw-r--r--kabc/plugins/dir/resourcedir.cpp9
-rw-r--r--kabc/plugins/file/file.pro5
-rw-r--r--kabc/plugins/file/resourcefile.cpp10
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
@@ -25,2 +25,3 @@ MOC_DIR = moc/unix
win32: {
+CONFIG += dll
DEFINES += _WIN32_
@@ -28,2 +29,6 @@ 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
@@ -64,3 +64,8 @@ using namespace KABC;
extern "C"
+#ifdef _WIN32_
+__declspec(dllexport)
+#else
{
+#endif
+
//US void *init_kabc_dir()
@@ -70,4 +75,5 @@ extern "C"
}
+#ifndef _WIN32_
}
-
+#endif
@@ -125,2 +131,3 @@ 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
@@ -26,2 +26,3 @@ MOC_DIR = moc/unix
win32: {
+CONFIG += dll
DEFINES += _WIN32_
@@ -29,2 +30,6 @@ 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
@@ -60,3 +60,8 @@ using namespace KABC;
extern "C"
+#ifdef _WIN32_
+__declspec(dllexport)
+#else
{
+#endif
+
//US void *init_kabc_file()
@@ -66,4 +71,5 @@ extern "C"
}
+#ifndef _WIN32_
}
-
+#endif
@@ -139,2 +145,4 @@ void ResourceFile::writeConfig( KConfig *config )
{
+
+ config->setGroup( "Resource_" + identifier() );
Resource::writeConfig( config );