summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kdepim-desktop.pro5
-rw-r--r--korganizer/korganizer.pro4
2 files changed, 6 insertions, 3 deletions
diff --git a/kdepim-desktop.pro b/kdepim-desktop.pro
index 6b7dd6b..df1c6cb 100644
--- a/kdepim-desktop.pro
+++ b/kdepim-desktop.pro
@@ -1,17 +1,20 @@
include( ./variables.pri )
TEMPLATE = subdirs
unix:{
staticlib: {
SUBDIRS += kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia
}
}
-SUBDIRS += libical libkcal kabc libkdepim microkde korganizer kaddressbook gammu/emb/common gammu/emb/gammu
+SUBDIRS += libical libkcal kabc libkdepim microkde korganizer kaddressbook
+unix:{
+SUBDIRS += gammu/emb/common gammu/emb/gammu
+}
!staticlib: {
SUBDIRS += kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia
}
unix:{
!staticlib: {
SUBDIRS += libetpan kmicromail/libmailwrapper kmicromail pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib pwmanager/pwmanager
}
}
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index 32ad10a..bb5f29e 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -51,24 +51,24 @@ DEFINES += _WIN32_
LIBS += ../bin/microkdepim.lib
LIBS += ../bin/microkcal.lib
LIBS += ../bin/microkde.lib
LIBS += ../bin/microkabc.lib
LIBS += ../libical/lib/ical.lib
LIBS += ../libical/lib/icalss.lib
#LIBS += atls.lib
QMAKE_LINK += /NODEFAULTLIB:LIBC
-QMAKE_LINK += /NODEFAULTLIB:MSVCRT
-QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
OBJECTS_DIR = obj/win
MOC_DIR = moc/win
#olimport section
#blabla: {
debug: {
LIBS += mfc71ud.lib
+QMAKE_LINK += /NODEFAULTLIB:MSVCRT
+QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
}
release: {
LIBS += mfc71u.lib
}
DEFINES += _OL_IMPORT_
HEADERS += ../outport/msoutl9.h \
koimportoldialog.h