summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-08-08 13:35:34 (UTC)
committer zautrix <zautrix>2004-08-08 13:35:34 (UTC)
commit957c13e21844ca75e337fc1c864554dd2240fc78 (patch) (side-by-side diff)
tree4e2a2a42116639786d2ff00829f3ad26ab0661b3
parent75138e84a2271f8929478853151a6ed4a73fb2cc (diff)
downloadkdepimpi-957c13e21844ca75e337fc1c864554dd2240fc78.zip
kdepimpi-957c13e21844ca75e337fc1c864554dd2240fc78.tar.gz
kdepimpi-957c13e21844ca75e337fc1c864554dd2240fc78.tar.bz2
Fixed win compile problem
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--gammu/emb/common/common.pro8
-rw-r--r--libkdepim/kcmconfigs/kcmkdepimconfig.cpp4
2 files changed, 9 insertions, 3 deletions
diff --git a/gammu/emb/common/common.pro b/gammu/emb/common/common.pro
index 7cbcb17..0c68000 100644
--- a/gammu/emb/common/common.pro
+++ b/gammu/emb/common/common.pro
@@ -140,13 +140,12 @@ service/backup/backvcs.c \
service/backup/backvcf.c \
service/backup/backics.c \
device/bluetoth/affix.c \
device/bluetoth/bluez.c \
device/bluetoth/blue_w32.c \
device/bluetoth/bluetoth.c \
-device/serial/ser_unx.c \
device/serial/ser_djg.c \
device/irda/irda.c \
device/devfunc.c \
protocol/at/at.c \
protocol/alcatel/alcabus.c \
protocol/nokia/mbus2.c \
@@ -174,6 +173,13 @@ phone/obex/obexgen.c \
phone/symbian/mroutgen.c
TARGET = microgammu
DESTDIR = ../../../bin
OBJECTS_DIR = obj/unix
MOC_DIR = moc/unix
+
+unix: {
+SOURCES += device/serial/ser_unx.c
+}
+win32:{
+SOURCES += device/serial/ser_w32.c
+}
diff --git a/libkdepim/kcmconfigs/kcmkdepimconfig.cpp b/libkdepim/kcmconfigs/kcmkdepimconfig.cpp
index 77a294a..830d5d2 100644
--- a/libkdepim/kcmconfigs/kcmkdepimconfig.cpp
+++ b/libkdepim/kcmconfigs/kcmkdepimconfig.cpp
@@ -37,20 +37,20 @@ $Id$
#include "kdepimconfigwidget.h"
#include "kcmkdepimconfig.h"
#include "kprefs.h"
#include "kpimprefs.h"
-
+#ifndef _WIN32_
extern "C"
{
KCModule *create_kabconfig( QWidget *parent, const char * ) {
return new KCMKdePimConfig( parent, "kcmkdepimconfig" );
}
}
-
+#endif
KCMKdePimConfig::KCMKdePimConfig( QWidget *parent, const char *name )
: KCModule( parent, name )
{
//abort();
QVBoxLayout *layout = new QVBoxLayout( this );
mConfigWidget = new KDEPIMConfigWidget( this, "mConfigWidget" );