summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-03-18 20:57:43 (UTC)
committer zautrix <zautrix>2005-03-18 20:57:43 (UTC)
commit246da4d3796f5e03a3ce5f2b2febe9e1c8dd7a7e (patch) (side-by-side diff)
tree03353e1d49610f87a9682d18d0e2d4747e046e41
parent9e549686b23b6dffdcbd09c9b10dc2cb795fbcdf (diff)
downloadkdepimpi-246da4d3796f5e03a3ce5f2b2febe9e1c8dd7a7e.zip
kdepimpi-246da4d3796f5e03a3ce5f2b2febe9e1c8dd7a7e.tar.gz
kdepimpi-246da4d3796f5e03a3ce5f2b2febe9e1c8dd7a7e.tar.bz2
desktop compile fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kdepim-desktop.pro2
-rw-r--r--kmicromail/kmicromail.pro2
-rw-r--r--kmicromail/libmailwrapper/libmailwrapper.pro2
3 files changed, 3 insertions, 3 deletions
diff --git a/kdepim-desktop.pro b/kdepim-desktop.pro
index da3a966..20c91ef 100644
--- a/kdepim-desktop.pro
+++ b/kdepim-desktop.pro
@@ -1,8 +1,8 @@
TEMPLATE = subdirs
SUBDIRS = libical libkcal kabc libkdepim microkde korganizer kaddressbook kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia gammu/emb/common gammu/emb/gammu
unix:{
-SUBDIRS += kmicromail/libetpan kmicromail/libmailwrapper kmicromail pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib pwmanager/pwmanager
+SUBDIRS += libetpan kmicromail/libmailwrapper kmicromail pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib pwmanager/pwmanager
}
diff --git a/kmicromail/kmicromail.pro b/kmicromail/kmicromail.pro
index 927dc8a..20161dc 100644
--- a/kmicromail/kmicromail.pro
+++ b/kmicromail/kmicromail.pro
@@ -34,45 +34,45 @@ SOURCES = main.cpp \
settingsdialog.cpp \
statuswidget.cpp \
newmaildir.cpp \
selectstore.cpp \
selectsmtp.cpp \
nntpgroups.cpp \
koprefs.cpp\
koprefsdialog.cpp\
nntpgroupsdlg.cpp
INTERFACES = editaccountsui.ui \
selectmailtypeui.ui \
imapconfigui.ui \
pop3configui.ui \
nntpconfigui.ui \
smtpconfigui.ui \
composemailui.ui \
settingsdialogui.ui \
statuswidgetui.ui \
newmaildirui.ui \
selectstoreui.ui \
nntpgroupsui.ui
-INCLUDEPATH += ./qpe . .. ../libkdepim ../microkde ../microkde/kdecore libetpan/include ../microkde/kdeui
+INCLUDEPATH += ./qpe . .. ../libkdepim ../microkde ../microkde/kdecore ../libetpan/include ../microkde/kdeui
LIBS += -L../bin -lmicromailwrapper -lmicrolibetpan -lmicrokde -lssl -lcrypto -lmicrokdepim -lmicrokabc
DESTDIR= ../bin
TARGET = ompi
DEFINES += DESKTOP_VERSION
unix : {
OBJECTS_DIR = obj/unix
MOC_DIR = moc/unix
}
win32: {
DEFINES += _WIN32_
LIBS += mfc71u.lib
QMAKE_LINK += /NODEFAULTLIB:LIBC
#QMAKE_LINK += /NODEFAULTLIB:MSVCRT
#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
OBJECTS_DIR = obj/win
MOC_DIR = moc/win
}
diff --git a/kmicromail/libmailwrapper/libmailwrapper.pro b/kmicromail/libmailwrapper/libmailwrapper.pro
index 0919cd2..646630b 100644
--- a/kmicromail/libmailwrapper/libmailwrapper.pro
+++ b/kmicromail/libmailwrapper/libmailwrapper.pro
@@ -20,46 +20,46 @@ HEADERS = mailwrapper.h \
../qpe/global.h
SOURCES = imapwrapper.cpp \
mailwrapper.cpp \
mailtypes.cpp \
pop3wrapper.cpp \
abstractmail.cpp \
smtpwrapper.cpp \
genericwrapper.cpp \
mboxwrapper.cpp \
settings.cpp \
logindialog.cpp \
sendmailprogress.cpp \
statusmail.cpp \
mhwrapper.cpp \
nntpwrapper.cpp \
generatemail.cpp \
storemail.cpp \
../qpe/qdialog_hacked.cpp \
../qpe/global.cpp
INTERFACES = logindialogui.ui \
sendmailprogressui.ui
-INCLUDEPATH += ../qpe .. ../../microkde ../../microkde/kdecore ../libetpan/include
+INCLUDEPATH += ../qpe .. ../../microkde ../../microkde/kdecore ../../libetpan/include
LIBS += -lssl -lcrypto
#-lqpe -letpan
DESTDIR = ../../bin
TARGET = micromailwrapper
DEFINES += DESKTOP_VERSION
unix : {
OBJECTS_DIR = obj/unix
MOC_DIR = moc/unix
}
win32: {
DEFINES += _WIN32_
LIBS += mfc71u.lib
QMAKE_LINK += /NODEFAULTLIB:LIBC
#QMAKE_LINK += /NODEFAULTLIB:MSVCRT
#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
OBJECTS_DIR = obj/win
MOC_DIR = moc/win
}