summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-06-02 23:42:42 (UTC)
committer mickeyl <mickeyl>2004-06-02 23:42:42 (UTC)
commit9499e1d1b46c1b5e0e6f8ce94aea4d8bd67f8f90 (patch) (unidiff)
tree3be637914bd75d0402670fa4b2e4785a6870c342
parent3706581a124f51ec92bcdf1fc3f94431778509e9 (diff)
downloadopie-9499e1d1b46c1b5e0e6f8ce94aea4d8bd67f8f90.zip
opie-9499e1d1b46c1b5e0e6f8ce94aea4d8bd67f8f90.tar.gz
opie-9499e1d1b46c1b5e0e6f8ce94aea4d8bd67f8f90.tar.bz2
enable building static versions of the libraries
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
@@ -21,16 +21,19 @@ 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" >> $@
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 \} >> $@
diff --git a/config.in b/config.in
index 124bc2a..c75576a 100644
--- a/config.in
+++ b/config.in
@@ -38,16 +38,20 @@ endchoice
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