author | mickeyl <mickeyl> | 2004-06-02 23:42:42 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-06-02 23:42:42 (UTC) |
commit | 9499e1d1b46c1b5e0e6f8ce94aea4d8bd67f8f90 (patch) (unidiff) | |
tree | 3be637914bd75d0402670fa4b2e4785a6870c342 | |
parent | 3706581a124f51ec92bcdf1fc3f94431778509e9 (diff) | |
download | opie-9499e1d1b46c1b5e0e6f8ce94aea4d8bd67f8f90.zip opie-9499e1d1b46c1b5e0e6f8ce94aea4d8bd67f8f90.tar.gz opie-9499e1d1b46c1b5e0e6f8ce94aea4d8bd67f8f90.tar.bz2 |
enable building static versions of the libraries
-rw-r--r-- | Rules.make | 5 | ||||
-rw-r--r-- | config.in | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -1,80 +1,83 @@ | |||
1 | .phony: force | 1 | .phony: force |
2 | force: | 2 | force: |
3 | 3 | ||
4 | $(configs) : | 4 | $(configs) : |
5 | $(call makecfg,$@) | 5 | $(call makecfg,$@) |
6 | 6 | ||
7 | $(TOPDIR)/gen.pro : $(TOPDIR)/.config | 7 | $(TOPDIR)/gen.pro : $(TOPDIR)/.config |
8 | echo > $@ | 8 | echo > $@ |
9 | # added for threaded version | 9 | # added for threaded version |
10 | ifneq ($(CONFIG_THREADED),) | 10 | ifneq ($(CONFIG_THREADED),) |
11 | echo CONFIG += thread >> $@ | 11 | echo CONFIG += thread >> $@ |
12 | else | 12 | else |
13 | echo CONFIG -= thread >> $@ | 13 | echo CONFIG -= thread >> $@ |
14 | endif | 14 | endif |
15 | ifneq ($(CONFIG_DEBUG),) | 15 | ifneq ($(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 >> $@ |
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 \) \{ >> $@ |
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 \} >> $@ |
42 | endif | 45 | endif |
43 | ifeq ($(CONFIG_SQL_PIM_BACKEND),y) | 46 | ifeq ($(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) >> $@ |
45 | else | 48 | else |
46 | echo ENABLE_SQL_PIM_BACKEND=n >> $@ | 49 | echo ENABLE_SQL_PIM_BACKEND=n >> $@ |
47 | endif | 50 | endif |
48 | ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) | 51 | ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) |
49 | echo CONFIG += no-override >> $@ | 52 | echo CONFIG += no-override >> $@ |
50 | endif | 53 | endif |
51 | ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y) | 54 | ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y) |
52 | echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@ | 55 | echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@ |
53 | endif | 56 | endif |
54 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) | 57 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) |
55 | echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ | 58 | echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ |
56 | endif | 59 | endif |
57 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) | 60 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) |
58 | echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ | 61 | echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ |
59 | endif | 62 | endif |
60 | ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y) | 63 | ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y) |
61 | echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@ | 64 | echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@ |
62 | endif | 65 | endif |
63 | ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y) | 66 | ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y) |
64 | echo DEFINES += USE_FILE_NOTIFICATION >> $@ | 67 | echo DEFINES += USE_FILE_NOTIFICATION >> $@ |
65 | endif | 68 | endif |
66 | ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y) | 69 | ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y) |
67 | echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@ | 70 | echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@ |
68 | endif | 71 | endif |
69 | ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y) | 72 | ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y) |
70 | echo DEFINES += OPIE_HIGH_RES_SMALL_PHY >> $@ | 73 | echo DEFINES += OPIE_HIGH_RES_SMALL_PHY >> $@ |
71 | endif | 74 | endif |
72 | ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) | 75 | ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) |
73 | echo DEFINES += OPIE_NEW_MALLOC >> $@ | 76 | echo DEFINES += OPIE_NEW_MALLOC >> $@ |
74 | endif | 77 | endif |
75 | ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y) | 78 | ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y) |
76 | echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@ | 79 | echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@ |
77 | endif | 80 | endif |
78 | echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ | 81 | echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ |
79 | ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y) | 82 | ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y) |
80 | echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@ | 83 | echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@ |
@@ -1,97 +1,101 @@ | |||
1 | mainmenu "Opie Configuration" | 1 | mainmenu "Opie Configuration" |
2 | 2 | ||
3 | menu "Build Parameters" | 3 | menu "Build Parameters" |
4 | 4 | ||
5 | choice | 5 | choice |
6 | prompt "Target Machine" | 6 | prompt "Target Machine" |
7 | default TARGET_X86 | 7 | default TARGET_X86 |
8 | help | 8 | help |
9 | Please select the architecture of the machine you will be | 9 | Please select the architecture of the machine you will be |
10 | building the OpenZaurus buildroot for. | 10 | building the OpenZaurus buildroot for. |
11 | 11 | ||
12 | config TARGET_X86 | 12 | config TARGET_X86 |
13 | boolean "Intel X86" | 13 | boolean "Intel X86" |
14 | 14 | ||
15 | config TARGET_MACOSX | 15 | config TARGET_MACOSX |
16 | boolean "Mac OS X (DARWIN)" | 16 | boolean "Mac OS X (DARWIN)" |
17 | 17 | ||
18 | config TARGET_SHARP | 18 | config TARGET_SHARP |
19 | boolean "Sharp Zaurus w/ SA1100 (5000 and 5500)" | 19 | boolean "Sharp Zaurus w/ SA1100 (5000 and 5500)" |
20 | 20 | ||
21 | config TARGET_C700 | 21 | config TARGET_C700 |
22 | boolean "Sharp Zaurus w/ PXA25x (5600, C7x0, C8x0)" | 22 | boolean "Sharp Zaurus w/ PXA25x (5600, C7x0, C8x0)" |
23 | 23 | ||
24 | config TARGET_IPAQ | 24 | config TARGET_IPAQ |
25 | boolean "iPAQ" | 25 | boolean "iPAQ" |
26 | 26 | ||
27 | config TARGET_RAMSES | 27 | config TARGET_RAMSES |
28 | boolean "Ramses" | 28 | boolean "Ramses" |
29 | 29 | ||
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 | ||
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 |
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 | ||
60 | config QUICKLAUNCH_PATH | 64 | config QUICKLAUNCH_PATH |
61 | string "Path to quicklauncher" | 65 | string "Path to quicklauncher" |
62 | default "./quicklauncher" if TARGET_X86 | 66 | default "./quicklauncher" if TARGET_X86 |
63 | default "/opt/QtPalmtop/bin/quicklauncher" if ! TARGET_X86 | 67 | default "/opt/QtPalmtop/bin/quicklauncher" if ! TARGET_X86 |
64 | 68 | ||
65 | config SPECFILE | 69 | config SPECFILE |
66 | string | 70 | string |
67 | default "qws/linux-generic-g++" if TARGET_X86 && (! X11) | 71 | default "qws/linux-generic-g++" if TARGET_X86 && (! X11) |
68 | default "linux-g++" if TARGET_X86 && X11 | 72 | default "linux-g++" if TARGET_X86 && X11 |
69 | default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11) | 73 | default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11) |
70 | default "linux-g++" if TARGET_SHARP && X11 | 74 | default "linux-g++" if TARGET_SHARP && X11 |
71 | default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11) | 75 | default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11) |
72 | default "linux-g++" if TARGET_IPAQ && X11 | 76 | default "linux-g++" if TARGET_IPAQ && X11 |
73 | default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11) | 77 | default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11) |
74 | default "linux-g++" if TARGET_RAMSES && X11 | 78 | default "linux-g++" if TARGET_RAMSES && X11 |
75 | default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11) | 79 | default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11) |
76 | default "linux-g++" if TARGET_SIMPAD && X11 | 80 | default "linux-g++" if TARGET_SIMPAD && X11 |
77 | default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11) | 81 | default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11) |
78 | default "qws/macx-generic-g++" if TARGET_MACOSX && (! X11) | 82 | default "qws/macx-generic-g++" if TARGET_MACOSX && (! X11) |
79 | 83 | ||
80 | config CUSTOMFILE | 84 | config CUSTOMFILE |
81 | string | 85 | string |
82 | default "custom-ipaq.h" if TARGET_IPAQ | 86 | default "custom-ipaq.h" if TARGET_IPAQ |
83 | default "custom-sharp.h" if TARGET_SHARP | 87 | default "custom-sharp.h" if TARGET_SHARP |
84 | default "custom-ramses.h" if TARGET_RAMSES | 88 | default "custom-ramses.h" if TARGET_RAMSES |
85 | default "custom-ipaq.h" if TARGET_SIMPAD | 89 | default "custom-ipaq.h" if TARGET_SIMPAD |
86 | default "custom-yopy.h" if TARGET_YOPY | 90 | default "custom-yopy.h" if TARGET_YOPY |
87 | 91 | ||
88 | config OPTIMIZATIONS | 92 | config OPTIMIZATIONS |
89 | string "Optimization flags" | 93 | string "Optimization flags" |
90 | depends OPTIMIZE | 94 | depends OPTIMIZE |
91 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ | 95 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ |
92 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_YOPY | 96 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_YOPY |
93 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP | 97 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP |
94 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_RAMSES | 98 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_RAMSES |
95 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SIMPAD | 99 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SIMPAD |
96 | default "-march=armv5te -mtune=xscale -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_C700 | 100 | default "-march=armv5te -mtune=xscale -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_C700 |
97 | 101 | ||