author | zautrix <zautrix> | 2004-08-13 11:46:54 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-08-13 11:46:54 (UTC) |
commit | 61aabb3eece3bf9368c5686c4bf5a3748cff265d (patch) (unidiff) | |
tree | a27c1a17716f94a737ad6bb0202dba0e640703b6 | |
parent | ef75e61ebef1d5bdca6acd5d7f3489f43ae9dc1f (diff) | |
download | kdepimpi-61aabb3eece3bf9368c5686c4bf5a3748cff265d.zip kdepimpi-61aabb3eece3bf9368c5686c4bf5a3748cff265d.tar.gz kdepimpi-61aabb3eece3bf9368c5686c4bf5a3748cff265d.tar.bz2 |
One fix for compiling on desktop
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | korganizer/korganizer.pro | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1,67 +1,67 @@ | |||
1 | ############################################################################# | 1 | ############################################################################# |
2 | # Makefile for building: kopi-desktop | 2 | # Makefile for building: kopi-desktop |
3 | # Generated by qmake (1.07a) (Qt 3.3.3) on: Tue Aug 10 18:20:15 2004 | 3 | # Generated by qmake (1.07a) (Qt 3.3.3) on: Fri Aug 13 09:41:37 2004 |
4 | # Project: kopi-desktop.pro | 4 | # Project: kopi-desktop.pro |
5 | # Template: subdirs | 5 | # Template: subdirs |
6 | # Command: $(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kopi-desktop.pro | 6 | # Command: $(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kopi-desktop.pro |
7 | ############################################################################# | 7 | ############################################################################# |
8 | 8 | ||
9 | MAKEFILE =Makefile | 9 | MAKEFILE =Makefile |
10 | QMAKE =qmake | 10 | QMAKE =qmake |
11 | DEL_FILE = rm -f | 11 | DEL_FILE = rm -f |
12 | CHK_DIR_EXISTS= test -d | 12 | CHK_DIR_EXISTS= test -d |
13 | MKDIR = mkdir -p | 13 | MKDIR = mkdir -p |
14 | INSTALL_FILE= | 14 | INSTALL_FILE= |
15 | INSTALL_DIR = | 15 | INSTALL_DIR = |
16 | SUBTARGETS = \ | 16 | SUBTARGETS = \ |
17 | sub-gammu-emb-common \ | 17 | sub-gammu-emb-common \ |
18 | sub-libical \ | 18 | sub-libical \ |
19 | sub-libkcal \ | 19 | sub-libkcal \ |
20 | sub-microkde \ | 20 | sub-microkde \ |
21 | sub-libkdepim \ | 21 | sub-libkdepim \ |
22 | sub-kabc \ | 22 | sub-kabc \ |
23 | sub-korganizer \ | 23 | sub-korganizer \ |
24 | sub-kaddressbook \ | 24 | sub-kaddressbook \ |
25 | sub-kabc-plugins-file \ | 25 | sub-kabc-plugins-file \ |
26 | sub-kabc-plugins-dir | 26 | sub-kabc-plugins-dir |
27 | 27 | ||
28 | first: all | 28 | first: all |
29 | 29 | ||
30 | all: Makefile $(SUBTARGETS) | 30 | all: Makefile $(SUBTARGETS) |
31 | 31 | ||
32 | gammu/emb/common/$(MAKEFILE): | 32 | gammu/emb/common/$(MAKEFILE): |
33 | @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common" | 33 | @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common" |
34 | cd gammu/emb/common && $(QMAKE) common.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE) | 34 | cd gammu/emb/common && $(QMAKE) common.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE) |
35 | sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE | 35 | sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE |
36 | cd gammu/emb/common && $(MAKE) -f $(MAKEFILE) | 36 | cd gammu/emb/common && $(MAKE) -f $(MAKEFILE) |
37 | 37 | ||
38 | libical/$(MAKEFILE): | 38 | libical/$(MAKEFILE): |
39 | @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical" | 39 | @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical" |
40 | cd libical && $(QMAKE) libical.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE) | 40 | cd libical && $(QMAKE) libical.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE) |
41 | sub-libical: libical/$(MAKEFILE) FORCE | 41 | sub-libical: libical/$(MAKEFILE) FORCE |
42 | cd libical && $(MAKE) -f $(MAKEFILE) | 42 | cd libical && $(MAKE) -f $(MAKEFILE) |
43 | 43 | ||
44 | libkcal/$(MAKEFILE): | 44 | libkcal/$(MAKEFILE): |
45 | @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal" | 45 | @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal" |
46 | cd libkcal && $(QMAKE) libkcal.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE) | 46 | cd libkcal && $(QMAKE) libkcal.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE) |
47 | sub-libkcal: libkcal/$(MAKEFILE) FORCE | 47 | sub-libkcal: libkcal/$(MAKEFILE) FORCE |
48 | cd libkcal && $(MAKE) -f $(MAKEFILE) | 48 | cd libkcal && $(MAKE) -f $(MAKEFILE) |
49 | 49 | ||
50 | microkde/$(MAKEFILE): | 50 | microkde/$(MAKEFILE): |
51 | @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde" | 51 | @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde" |
52 | cd microkde && $(QMAKE) microkde.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE) | 52 | cd microkde && $(QMAKE) microkde.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE) |
53 | sub-microkde: microkde/$(MAKEFILE) FORCE | 53 | sub-microkde: microkde/$(MAKEFILE) FORCE |
54 | cd microkde && $(MAKE) -f $(MAKEFILE) | 54 | cd microkde && $(MAKE) -f $(MAKEFILE) |
55 | 55 | ||
56 | libkdepim/$(MAKEFILE): | 56 | libkdepim/$(MAKEFILE): |
57 | @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim" | 57 | @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim" |
58 | cd libkdepim && $(QMAKE) libkdepim.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE) | 58 | cd libkdepim && $(QMAKE) libkdepim.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE) |
59 | sub-libkdepim: libkdepim/$(MAKEFILE) FORCE | 59 | sub-libkdepim: libkdepim/$(MAKEFILE) FORCE |
60 | cd libkdepim && $(MAKE) -f $(MAKEFILE) | 60 | cd libkdepim && $(MAKE) -f $(MAKEFILE) |
61 | 61 | ||
62 | kabc/$(MAKEFILE): | 62 | kabc/$(MAKEFILE): |
63 | @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc" | 63 | @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc" |
64 | cd kabc && $(QMAKE) kabc.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE) | 64 | cd kabc && $(QMAKE) kabc.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE) |
65 | sub-kabc: kabc/$(MAKEFILE) FORCE | 65 | sub-kabc: kabc/$(MAKEFILE) FORCE |
66 | cd kabc && $(MAKE) -f $(MAKEFILE) | 66 | cd kabc && $(MAKE) -f $(MAKEFILE) |
67 | 67 | ||
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index e501d88..9fdcd2f 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro | |||
@@ -1,74 +1,74 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG = qt warn_on | 2 | CONFIG = qt warn_on |
3 | TARGET = kopi | 3 | TARGET = kopi |
4 | OBJECTS_DIR = _obj/ | 4 | OBJECTS_DIR = _obj/ |
5 | MOC_DIR = _moc | 5 | MOC_DIR = _moc |
6 | DESTDIR= ../bin | 6 | DESTDIR= ../bin |
7 | 7 | ||
8 | include( ../variables.pri ) | 8 | include( ../variables.pri ) |
9 | 9 | ||
10 | INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio | 10 | INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim |
11 | #../qtcompat | 11 | #../qtcompat |
12 | DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL | 12 | DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL |
13 | DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER | 13 | DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER |
14 | #KORG_NOPRINTER KORG_NOKABC | 14 | #KORG_NOPRINTER KORG_NOKABC |
15 | DEFINES += KORG_NOLVALTERNATION | 15 | DEFINES += KORG_NOLVALTERNATION |
16 | DEFINES += DESKTOP_VERSION | 16 | DEFINES += DESKTOP_VERSION |
17 | unix : { | 17 | unix : { |
18 | LIBS += ../bin/libmicrokdepim.so | 18 | LIBS += ../bin/libmicrokdepim.so |
19 | LIBS += ../bin/libmicrokcal.so | 19 | LIBS += ../bin/libmicrokcal.so |
20 | LIBS += ../bin/libmicrokde.so | 20 | LIBS += ../bin/libmicrokde.so |
21 | LIBS += ../bin/libmicrokabc.so | 21 | LIBS += ../bin/libmicrokabc.so |
22 | LIBS += ../bin/libmicrogammu.so | 22 | LIBS += ../bin/libmicrogammu.so |
23 | LIBS += -lbluetooth | 23 | LIBS += -lbluetooth |
24 | LIBS += -lsdp | 24 | LIBS += -lsdp |
25 | 25 | ||
26 | LIBS += -lldap | 26 | LIBS += -lldap |
27 | OBJECTS_DIR = obj/unix | 27 | OBJECTS_DIR = obj/unix |
28 | MOC_DIR = moc/unix | 28 | MOC_DIR = moc/unix |
29 | } | 29 | } |
30 | win32: { | 30 | win32: { |
31 | DEFINES += _WIN32_ | 31 | DEFINES += _WIN32_ |
32 | LIBS += ../bin/microkdepim.lib | 32 | LIBS += ../bin/microkdepim.lib |
33 | LIBS += ../bin/microkcal.lib | 33 | LIBS += ../bin/microkcal.lib |
34 | LIBS += ../bin/microkde.lib | 34 | LIBS += ../bin/microkde.lib |
35 | LIBS += ../bin/microkabc.lib | 35 | LIBS += ../bin/microkabc.lib |
36 | LIBS += ../libical/lib/ical.lib | 36 | LIBS += ../libical/lib/ical.lib |
37 | LIBS += ../libical/lib/icalss.lib | 37 | LIBS += ../libical/lib/icalss.lib |
38 | #LIBS += atls.lib | 38 | #LIBS += atls.lib |
39 | LIBS += mfc71u.lib | 39 | LIBS += mfc71u.lib |
40 | QMAKE_LINK += /NODEFAULTLIB:LIBC | 40 | QMAKE_LINK += /NODEFAULTLIB:LIBC |
41 | #QMAKE_LINK += /NODEFAULTLIB:MSVCRT | 41 | #QMAKE_LINK += /NODEFAULTLIB:MSVCRT |
42 | #QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib | 42 | #QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib |
43 | OBJECTS_DIR = obj/win | 43 | OBJECTS_DIR = obj/win |
44 | MOC_DIR = moc/win | 44 | MOC_DIR = moc/win |
45 | } | 45 | } |
46 | 46 | ||
47 | 47 | ||
48 | INTERFACES = kofilterview_base.ui | 48 | INTERFACES = kofilterview_base.ui |
49 | # filteredit_base.ui | 49 | # filteredit_base.ui |
50 | 50 | ||
51 | # kdateedit.h \ | 51 | # kdateedit.h \ |
52 | 52 | ||
53 | HEADERS = \ | 53 | HEADERS = \ |
54 | filteredit_base.h \ | 54 | filteredit_base.h \ |
55 | alarmclient.h \ | 55 | alarmclient.h \ |
56 | calendarview.h \ | 56 | calendarview.h \ |
57 | customlistviewitem.h \ | 57 | customlistviewitem.h \ |
58 | datenavigator.h \ | 58 | datenavigator.h \ |
59 | docprefs.h \ | 59 | docprefs.h \ |
60 | filtereditdialog.h \ | 60 | filtereditdialog.h \ |
61 | incomingdialog.h \ | 61 | incomingdialog.h \ |
62 | incomingdialog_base.h \ | 62 | incomingdialog_base.h \ |
63 | interfaces/korganizer/baseview.h \ | 63 | interfaces/korganizer/baseview.h \ |
64 | interfaces/korganizer/calendarviewbase.h \ | 64 | interfaces/korganizer/calendarviewbase.h \ |
65 | journalentry.h \ | 65 | journalentry.h \ |
66 | kdatenavigator.h \ | 66 | kdatenavigator.h \ |
67 | koagenda.h \ | 67 | koagenda.h \ |
68 | koagendaitem.h \ | 68 | koagendaitem.h \ |
69 | koagendaview.h \ | 69 | koagendaview.h \ |
70 | kocounterdialog.h \ | 70 | kocounterdialog.h \ |
71 | kodaymatrix.h \ | 71 | kodaymatrix.h \ |
72 | kodialogmanager.h \ | 72 | kodialogmanager.h \ |
73 | koeditordetails.h \ | 73 | koeditordetails.h \ |
74 | koeditorgeneral.h \ | 74 | koeditorgeneral.h \ |