summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make11
-rw-r--r--config.in4
-rw-r--r--include.pro18
3 files changed, 32 insertions, 1 deletions
diff --git a/Rules.make b/Rules.make
index 5fd8d90..d4ccf44 100644
--- a/Rules.make
+++ b/Rules.make
@@ -17,8 +17,19 @@ ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
echo CONFIG -= qt3 >> $@
else
echo CONFIG += qt3 >> $@
endif
+ifneq ($(CONFIG_QUICK_LAUNCH),)
+ echo contains\( CONFIG, quick-app \) \{ >> $@
+ echo CONFIG -= quick-app >> $@
+ echo CONFIG += quick-app-lib >> $@
+ echo \} >> $@
+else
+ echo contains\( CONFIG, quick-app \) \{ >> $@
+ echo CONFIG -= quick-app >> $@
+ echo CONFIG += quick-app-bin >> $@
+ echo \} >> $@
+endif
$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
@echo Generating dependency information...
# add to subdir-y, and add descend rules
diff --git a/config.in b/config.in
index aa6a0d4..c6ee7a6 100644
--- a/config.in
+++ b/config.in
@@ -36,8 +36,12 @@ config DEBUG
config RELEASE
bool
default y
depends !DEBUG
+
+config QUICK_LAUNCH
+ boolean "Enable Quick Launch"
+ default n
config SPECFILE
string
default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
diff --git a/include.pro b/include.pro
index 3ba8776..c70c4d5 100644
--- a/include.pro
+++ b/include.pro
@@ -1,9 +1,24 @@
+include ( $(OPIEDIR)/gen.pro )
+
# make install
# base opie install path
prefix = /opt/QtPalmtop
+
+contains( CONFIG, quick-app-lib ) {
+ TEMPLATE = lib
+ DESTDIR = $(OPIEDIR)/plugins/applications
+ DEFINES += OPIE_APP_INTERFACE
+}
+contains ( CONFIG, quick-app-bin ) {
+ TEMPLATE = app
+ DESTDIR = $(OPIEDIR)/bin
+ DEFINES -= OPIE_APP_INTERFACE
+}
+
+
contains( TEMPLATE, lib ) {
target.path = $$prefix/lib
}
!contains( TEMPLATE, lib ) {
@@ -76,5 +91,6 @@ QMAKE_LIBDIR += $(OPIEDIR)/lib
MOC_DIR=.moc/$(PLATFORM)
OBJECTS_DIR=.obj/$(PLATFORM)
-include ( $(OPIEDIR)/gen.pro )
+#was here now at thetop
+#include ( $(OPIEDIR)/gen.pro )