|
|
|
@@ -19,20 +19,23 @@ ifneq ($(CONFIG_DEBUG),) |
19 | echo DEFINES += QT_DEBUG >> $@ |
19 | echo DEFINES += QT_DEBUG >> $@ |
20 | else |
20 | else |
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" >> $@ |
24 | endif |
24 | endif |
25 | |
25 | ifeq ($(CONFIG_STATIC),y) |
| |
26 | echo CONFIG += staticlib >> $@ |
| |
27 | endif |
26 | ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 |
28 | ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 |
27 | echo CONFIG -= qt3 >> $@ |
29 | echo CONFIG -= qt3 >> $@ |
28 | else |
30 | else |
29 | echo CONFIG += qt3 >> $@ |
31 | echo CONFIG += qt3 >> $@ |
30 | endif |
32 | endif |
31 | ifneq ($(CONFIG_QUICK_LAUNCH),) |
33 | ifneq ($(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 \} >> $@ |
37 | else |
40 | else |
38 | echo contains\( CONFIG, quick-app \) \{ >> $@ |
41 | echo contains\( CONFIG, quick-app \) \{ >> $@ |
|
|
diff --git a/config.in b/config.in index 124bc2a..c75576a 100644 --- a/ config.in+++ b/ config.in |
|
@@ -36,20 +36,24 @@ choice |
36 | endchoice |
36 | endchoice |
37 | |
37 | |
38 | config OPTIMIZE |
38 | config 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 |
| |
43 | config THREADED |
42 | config THREADED |
44 | boolean "Enable threaded build" |
43 | boolean "Enable threaded build" |
45 | default "n" |
44 | default "n" |
46 | |
45 | |
| |
46 | config STATIC |
| |
47 | boolean "Build static libraries" |
| |
48 | default "n" |
| |
49 | |
47 | config DEBUG |
50 | config DEBUG |
48 | boolean "Enable debug builds" |
51 | boolean "Enable debug builds" |
49 | default n |
52 | default n |
| |
53 | |
50 | config RELEASE |
54 | config RELEASE |
51 | bool |
55 | bool |
52 | default y |
56 | default y |
53 | depends !DEBUG |
57 | depends !DEBUG |
54 | |
58 | |
55 | config QUICK_LAUNCH |
59 | config QUICK_LAUNCH |
|