| -rw-r--r-- | kdepim-desktop.pro | 5 | ||||
| -rw-r--r-- | korganizer/korganizer.pro | 4 |
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,18 +1,21 @@ 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 @@ -27,72 +27,72 @@ LIBS += ../bin/libmicrokabc_qtopia.a LIBS += ../bin/libmicrokabc_file.a LIBS += ../bin/libmicrokabc_dir.a LIBS += ../bin/libmicrokdepim.a LIBS += ../bin/libmicrokcal.a LIBS += ../bin/libmicrokabc.a LIBS += ../bin/libmicrokde.a LIBS += ../libical/lib/libical.a LIBS += ../libical/lib/libicalss.a } else { LIBS += ../bin/libmicrokdepim.so LIBS += ../bin/libmicrokcal.so LIBS += ../bin/libmicrokde.so LIBS += ../bin/libmicrokabc.so #LIBS += -lbluetooth #LIBS += -lsdp #LIBS += -lldap } OBJECTS_DIR = obj/unix MOC_DIR = moc/unix } win32: { RC_FILE = winicons.rc 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 SOURCES += ../outport/msoutl9.cpp \ koimportoldialog.cpp #} #olimport section end } INTERFACES = kofilterview_base.ui #filteredit_base.ui # kdateedit.h \ HEADERS += datenavigatorcontainer.h \ filteredit_base.h \ alarmclient.h \ calendarview.h \ customlistviewitem.h \ datenavigator.h \ docprefs.h \ filtereditdialog.h \ incomingdialog.h \ incomingdialog_base.h \ |