summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make5
-rw-r--r--config.in6
2 files changed, 9 insertions, 2 deletions
diff --git a/Rules.make b/Rules.make
index 568f6cf..b78d763 100644
--- a/Rules.make
+++ b/Rules.make
@@ -13,32 +13,35 @@ else
13 echo CONFIG -= thread >> $@ 13 echo CONFIG -= thread >> $@
14endif 14endif
15ifneq ($(CONFIG_DEBUG),) 15ifneq ($(CONFIG_DEBUG),)
16 echo CONFIG += debug >> $@ 16 echo CONFIG += debug >> $@
17 echo CONFIG -= release >> $@ 17 echo CONFIG -= release >> $@
18 echo DEFINES += "QT_COMPONENT_DEBUG=2" >> $@ 18 echo DEFINES += "QT_COMPONENT_DEBUG=2" >> $@
19 echo DEFINES += QT_DEBUG >> $@ 19 echo DEFINES += QT_DEBUG >> $@
20else 20else
21 echo CONFIG -= debug >> $@ 21 echo CONFIG -= debug >> $@
22 echo CONFIG += release >> $@ 22 echo CONFIG += release >> $@
23 echo DEFINES += "OPIE_NO_DEBUG" >> $@ 23 echo DEFINES += "OPIE_NO_DEBUG" >> $@
24endif 24endif
25 25ifeq ($(CONFIG_STATIC),y)
26 echo CONFIG += staticlib >> $@
27endif
26ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 28ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
27 echo CONFIG -= qt3 >> $@ 29 echo CONFIG -= qt3 >> $@
28else 30else
29 echo CONFIG += qt3 >> $@ 31 echo CONFIG += qt3 >> $@
30endif 32endif
31ifneq ($(CONFIG_QUICK_LAUNCH),) 33ifneq ($(CONFIG_QUICK_LAUNCH),)
32 echo contains\( CONFIG, quick-app \) \{ >> $@ 34 echo contains\( CONFIG, quick-app \) \{ >> $@
35 echo CONFIG -= staticlib >> $@
33 echo CONFIG -= quick-app >> $@ 36 echo CONFIG -= quick-app >> $@
34 echo CONFIG += quick-app-lib >> $@ 37 echo CONFIG += quick-app-lib >> $@
35 echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@ 38 echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@
36 echo \} >> $@ 39 echo \} >> $@
37else 40else
38 echo contains\( CONFIG, quick-app \) \{ >> $@ 41 echo contains\( CONFIG, quick-app \) \{ >> $@
39 echo CONFIG -= quick-app >> $@ 42 echo CONFIG -= quick-app >> $@
40 echo CONFIG += quick-app-bin >> $@ 43 echo CONFIG += quick-app-bin >> $@
41 echo \} >> $@ 44 echo \} >> $@
42endif 45endif
43ifeq ($(CONFIG_SQL_PIM_BACKEND),y) 46ifeq ($(CONFIG_SQL_PIM_BACKEND),y)
44 echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@ 47 echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@
diff --git a/config.in b/config.in
index 124bc2a..c75576a 100644
--- a/config.in
+++ b/config.in
@@ -30,32 +30,36 @@ choice
30 config TARGET_SIMPAD 30 config TARGET_SIMPAD
31 boolean "SIMpad" 31 boolean "SIMpad"
32 32
33 config TARGET_YOPY 33 config TARGET_YOPY
34 boolean "Yopy 3500/3700" 34 boolean "Yopy 3500/3700"
35 35
36endchoice 36endchoice
37 37
38config OPTIMIZE 38config OPTIMIZE
39 boolean "Use optimizations" 39 boolean "Use optimizations"
40 default "y" if ! TARGET_X86 40 default "y" if ! TARGET_X86
41 41
42# added for threaded compile
43config THREADED 42config THREADED
44 boolean "Enable threaded build" 43 boolean "Enable threaded build"
45 default "n" 44 default "n"
46 45
46config STATIC
47 boolean "Build static libraries"
48 default "n"
49
47config DEBUG 50config DEBUG
48 boolean "Enable debug builds" 51 boolean "Enable debug builds"
49 default n 52 default n
53
50config RELEASE 54config RELEASE
51 bool 55 bool
52 default y 56 default y
53 depends !DEBUG 57 depends !DEBUG
54 58
55config QUICK_LAUNCH 59config QUICK_LAUNCH
56 boolean "Enable Quick Launch" 60 boolean "Enable Quick Launch"
57 default n if TARGET_X86 61 default n if TARGET_X86
58 default y if ! TARGET_X86 62 default y if ! TARGET_X86
59 63
60config QUICKLAUNCH_PATH 64config QUICKLAUNCH_PATH
61 string "Path to quicklauncher" 65 string "Path to quicklauncher"