summaryrefslogtreecommitdiff
authorzecke <zecke>2004-08-25 21:22:54 (UTC)
committer zecke <zecke>2004-08-25 21:22:54 (UTC)
commit834a1cfd0367f7c2ed6e250666624104c450d542 (patch) (unidiff)
treeaee658da073a597919819878c25c812db9b7567e
parent7d89975c7fe8e67af4e201d7038640cfbfc515fb (diff)
downloadopie-834a1cfd0367f7c2ed6e250666624104c450d542.zip
opie-834a1cfd0367f7c2ed6e250666624104c450d542.tar.gz
opie-834a1cfd0367f7c2ed6e250666624104c450d542.tar.bz2
-Make libqpe work without RoHFeedback
-Use only a define in library.pro and add source code conditional.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make2
-rw-r--r--library/library.pro6
2 files changed, 4 insertions, 4 deletions
diff --git a/Rules.make b/Rules.make
index 04cfbee..e8b2420 100644
--- a/Rules.make
+++ b/Rules.make
@@ -51,13 +51,13 @@ else
51 echo ENABLE_SQL_PIM_BACKEND=n >> $@ 51 echo ENABLE_SQL_PIM_BACKEND=n >> $@
52endif 52endif
53ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) 53ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y)
54 echo CONFIG += no-override >> $@ 54 echo CONFIG += no-override >> $@
55endif 55endif
56ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y) 56ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y)
57 echo DEFINES += OPIE_WITHROHFEEDBACK >> $@ 57 echo CONFIG += LIBQPE_WITHROHFEEDBACK >> $@
58endif 58endif
59ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y) 59ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y)
60 echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@ 60 echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@
61endif 61endif
62ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) 62ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y)
63 echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ 63 echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@
diff --git a/library/library.pro b/library/library.pro
index af07fa3..1f68b74 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -44,13 +44,12 @@ HEADERS = calendar.h \
44 backend/categories.h \ 44 backend/categories.h \
45 stringutil.h \ 45 stringutil.h \
46 backend/palmtoprecord.h \ 46 backend/palmtoprecord.h \
47 backend/task.h \ 47 backend/task.h \
48 backend/event.h \ 48 backend/event.h \
49 backend/contact.h\ 49 backend/contact.h\
50 backend/rohfeedback.h \
51 categorymenu.h \ 50 categorymenu.h \
52 categoryedit_p.h \ 51 categoryedit_p.h \
53 categoryselect.h \ 52 categoryselect.h \
54 categorywidget.h \ 53 categorywidget.h \
55 ir.h \ 54 ir.h \
56 backend/vobject_p.h \ 55 backend/vobject_p.h \
@@ -104,13 +103,12 @@ SOURCES = calendar.cpp \
104 backend/categories.cpp \ 103 backend/categories.cpp \
105 backend/stringutil.cpp \ 104 backend/stringutil.cpp \
106 backend/palmtoprecord.cpp \ 105 backend/palmtoprecord.cpp \
107 backend/task.cpp \ 106 backend/task.cpp \
108 backend/event.cpp \ 107 backend/event.cpp \
109 backend/contact.cpp \ 108 backend/contact.cpp \
110 backend/rohfeedback.cpp \
111 categorymenu.cpp \ 109 categorymenu.cpp \
112 categoryedit_p.cpp \ 110 categoryedit_p.cpp \
113 categoryselect.cpp \ 111 categoryselect.cpp \
114 categorywidget.cpp \ 112 categorywidget.cpp \
115 ir.cpp \ 113 ir.cpp \
116 backend/vcc_yacc.cpp \ 114 backend/vcc_yacc.cpp \
@@ -136,8 +134,10 @@ include ( $(OPIEDIR)/include.pro )
136 134
137contains( CONFIG, no-override ){ 135contains( CONFIG, no-override ){
138 DEFINES += OPIE_NO_OVERRIDE_QT 136 DEFINES += OPIE_NO_OVERRIDE_QT
139} 137}
140 138
141contains( CONFIG, LIBQPE_WITHROHFEEDBACK ){ 139contains( CONFIG, LIBQPE_WITHROHFEEDBACK ){
142 DEFINES += WITHROHFEEDBACK 140 DEFINES += OPIE_ROHFEEDBACK
141 SOURCES += backend/rohfeedback.cpp
142 HEADERS += backend/rohfeedback.h
143} 143}