-rw-r--r-- | Vars.make | 1 | ||||
-rw-r--r-- | config.in | 5 | ||||
-rw-r--r-- | mkspecs/qws/linux-oe-g++/qmake.conf | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -1,71 +1,72 @@ | |||
1 | prefix=/opt/QtPalmtop | 1 | prefix=/opt/QtPalmtop |
2 | 2 | ||
3 | ifeq ($(OPIEDIR),) | 3 | ifeq ($(OPIEDIR),) |
4 | export OPIEDIR:=$(TOPDIR) | 4 | export OPIEDIR:=$(TOPDIR) |
5 | endif | 5 | endif |
6 | ifeq ($(IPK_DIR),) | 6 | ifeq ($(IPK_DIR),) |
7 | export IPK_DIR:=$(OPIEDIR) | 7 | export IPK_DIR:=$(OPIEDIR) |
8 | endif | 8 | endif |
9 | 9 | ||
10 | ifneq ($(wildcard $(TOPDIR)/.config),) | 10 | ifneq ($(wildcard $(TOPDIR)/.config),) |
11 | include $(TOPDIR)/.config | 11 | include $(TOPDIR)/.config |
12 | endif | 12 | endif |
13 | 13 | ||
14 | ifndef CONFIG_TARGET_OE | 14 | ifndef CONFIG_TARGET_OE |
15 | ifndef QTDIR | 15 | ifndef QTDIR |
16 | $(error QTDIR not set) | 16 | $(error QTDIR not set) |
17 | endif | 17 | endif |
18 | else | 18 | else |
19 | OEDIR:=$(CONFIG_OE_BUILD_DIR) | 19 | OEDIR:=$(CONFIG_OE_BUILD_DIR) |
20 | QTDIR:=$(OEDIR)/tmp/staging/arm-linux/qt2 | 20 | QTDIR:=$(OEDIR)/tmp/staging/arm-linux/qt2 |
21 | $(shell mkdir -p $(QTDIR)/src/moc) | 21 | $(shell mkdir -p $(QTDIR)/src/moc) |
22 | $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile) | 22 | $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile) |
23 | PLATFORM=sharp-linux | 23 | PLATFORM=sharp-linux |
24 | OEHOSTSYS:=$(CONFIG_OE_HOST_SYS) | ||
24 | endif | 25 | endif |
25 | 26 | ||
26 | ifdef CONFIG_TARGET_X86 | 27 | ifdef CONFIG_TARGET_X86 |
27 | PLATFORM=x86-linux | 28 | PLATFORM=x86-linux |
28 | endif | 29 | endif |
29 | ifdef CONFIG_TARGET_SHARP | 30 | ifdef CONFIG_TARGET_SHARP |
30 | PLATFORM=sharp-linux | 31 | PLATFORM=sharp-linux |
31 | endif | 32 | endif |
32 | ifdef CONFIG_TARGET_IPAQ | 33 | ifdef CONFIG_TARGET_IPAQ |
33 | PLATFORM=ipaq-linux | 34 | PLATFORM=ipaq-linux |
34 | endif | 35 | endif |
35 | ifdef CONFIG_TARGET_RAMSES | 36 | ifdef CONFIG_TARGET_RAMSES |
36 | PLATFORM=ramses-linux | 37 | PLATFORM=ramses-linux |
37 | endif | 38 | endif |
38 | ifdef CONFIG_TARGET_SIMPAD | 39 | ifdef CONFIG_TARGET_SIMPAD |
39 | PLATFORM=simpad-linux | 40 | PLATFORM=simpad-linux |
40 | endif | 41 | endif |
41 | 42 | ||
42 | ifdef CONFIG_TARGET_YOPY | 43 | ifdef CONFIG_TARGET_YOPY |
43 | PLATFORM=yopy-linux | 44 | PLATFORM=yopy-linux |
44 | endif | 45 | endif |
45 | ifdef CONFIG_TARGET_MACOSX | 46 | ifdef CONFIG_TARGET_MACOSX |
46 | PLATFORM=macx-darwin | 47 | PLATFORM=macx-darwin |
47 | endif | 48 | endif |
48 | 49 | ||
49 | export QMAKE:=$(OPIEDIR)/qmake/qmake | 50 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
50 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs | 51 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
51 | 52 | ||
52 | ifeq ($(QPE_VERSION),) | 53 | ifeq ($(QPE_VERSION),) |
53 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) | 54 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
54 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) | 55 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
55 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) | 56 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) |
56 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) | 57 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
57 | 58 | ||
58 | ifeq ($(QPE_VERSION),..) | 59 | ifeq ($(QPE_VERSION),..) |
59 | QPE_VERSION=1.1.2 | 60 | QPE_VERSION=1.1.2 |
60 | endif | 61 | endif |
61 | endif | 62 | endif |
62 | export QPE_VERSION | 63 | export QPE_VERSION |
63 | 64 | ||
64 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) | 65 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
65 | ifeq ($(VERSION_CVS),) | 66 | ifeq ($(VERSION_CVS),) |
66 | VERSION_CVS:=$(shell date +%s) | 67 | VERSION_CVS:=$(shell date +%s) |
67 | endif | 68 | endif |
68 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) | 69 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
69 | SUB_VERSION:=$(VERSION_CVS) | 70 | SUB_VERSION:=$(VERSION_CVS) |
70 | endif | 71 | endif |
71 | export SUB_VERSION | 72 | export SUB_VERSION |
@@ -1,92 +1,97 @@ | |||
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_OE | 24 | config TARGET_OE |
25 | boolean "OpenEmbedded w/ OE build dir set below" | 25 | boolean "OpenEmbedded w/ OE build dir set below" |
26 | 26 | ||
27 | config TARGET_IPAQ | 27 | config TARGET_IPAQ |
28 | boolean "iPAQ" | 28 | boolean "iPAQ" |
29 | 29 | ||
30 | config TARGET_RAMSES | 30 | config TARGET_RAMSES |
31 | boolean "Ramses" | 31 | boolean "Ramses" |
32 | 32 | ||
33 | config TARGET_SIMPAD | 33 | config TARGET_SIMPAD |
34 | boolean "SIMpad" | 34 | boolean "SIMpad" |
35 | 35 | ||
36 | config TARGET_YOPY | 36 | config TARGET_YOPY |
37 | boolean "Yopy 3500/3700" | 37 | boolean "Yopy 3500/3700" |
38 | endchoice | 38 | endchoice |
39 | 39 | ||
40 | config OE_BUILD_DIR | 40 | config OE_BUILD_DIR |
41 | depends TARGET_OE | 41 | depends TARGET_OE |
42 | string "OE build directory" | 42 | string "OE build directory" |
43 | default ">>>set OpenEmbedded build directory here<<<" | 43 | default ">>>set OpenEmbedded build directory here<<<" |
44 | 44 | ||
45 | config OE_HOST_SYS | ||
46 | depends TARGET_OE | ||
47 | string "OE host system" | ||
48 | default "i686-linux" | ||
49 | |||
45 | config OPTIMIZE | 50 | config OPTIMIZE |
46 | boolean "Use optimizations" | 51 | boolean "Use optimizations" |
47 | default "y" if ! TARGET_X86 | 52 | default "y" if ! TARGET_X86 |
48 | 53 | ||
49 | config THREADED | 54 | config THREADED |
50 | boolean "Enable threaded build" | 55 | boolean "Enable threaded build" |
51 | default "n" | 56 | default "n" |
52 | 57 | ||
53 | config STATIC | 58 | config STATIC |
54 | boolean "Build static libraries" | 59 | boolean "Build static libraries" |
55 | default "n" | 60 | default "n" |
56 | 61 | ||
57 | config DEBUG | 62 | config DEBUG |
58 | boolean "Enable debug builds" | 63 | boolean "Enable debug builds" |
59 | default n | 64 | default n |
60 | 65 | ||
61 | config RELEASE | 66 | config RELEASE |
62 | bool | 67 | bool |
63 | default y | 68 | default y |
64 | depends !DEBUG | 69 | depends !DEBUG |
65 | 70 | ||
66 | config QUICK_LAUNCH | 71 | config QUICK_LAUNCH |
67 | boolean "Enable Quick Launch" | 72 | boolean "Enable Quick Launch" |
68 | default n if TARGET_X86 | 73 | default n if TARGET_X86 |
69 | default y if ! TARGET_X86 | 74 | default y if ! TARGET_X86 |
70 | 75 | ||
71 | config QUICKLAUNCH_PATH | 76 | config QUICKLAUNCH_PATH |
72 | string "Path to quicklauncher" | 77 | string "Path to quicklauncher" |
73 | default "./quicklauncher" if TARGET_X86 | 78 | default "./quicklauncher" if TARGET_X86 |
74 | default "/opt/QtPalmtop/bin/quicklauncher" if ! TARGET_X86 | 79 | default "/opt/QtPalmtop/bin/quicklauncher" if ! TARGET_X86 |
75 | 80 | ||
76 | config SPECFILE | 81 | config SPECFILE |
77 | string | 82 | string |
78 | default "qws/linux-generic-g++" if TARGET_X86 && (! X11) | 83 | default "qws/linux-generic-g++" if TARGET_X86 && (! X11) |
79 | default "linux-g++" if TARGET_X86 && X11 | 84 | default "linux-g++" if TARGET_X86 && X11 |
80 | default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11) | 85 | default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11) |
81 | default "linux-g++" if TARGET_SHARP && X11 | 86 | default "linux-g++" if TARGET_SHARP && X11 |
82 | default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11) | 87 | default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11) |
83 | default "linux-g++" if TARGET_IPAQ && X11 | 88 | default "linux-g++" if TARGET_IPAQ && X11 |
84 | default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11) | 89 | default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11) |
85 | default "linux-g++" if TARGET_RAMSES && X11 | 90 | default "linux-g++" if TARGET_RAMSES && X11 |
86 | default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11) | 91 | default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11) |
87 | default "linux-g++" if TARGET_SIMPAD && X11 | 92 | default "linux-g++" if TARGET_SIMPAD && X11 |
88 | default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11) | 93 | default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11) |
89 | default "qws/macx-generic-g++" if TARGET_MACOSX && (! X11) | 94 | default "qws/macx-generic-g++" if TARGET_MACOSX && (! X11) |
90 | default "qws/linux-oe-g++" if TARGET_OE && (!X11) | 95 | default "qws/linux-oe-g++" if TARGET_OE && (!X11) |
91 | 96 | ||
92 | config CUSTOMFILE | 97 | config CUSTOMFILE |
diff --git a/mkspecs/qws/linux-oe-g++/qmake.conf b/mkspecs/qws/linux-oe-g++/qmake.conf index c4c273f..90166b0 100644 --- a/mkspecs/qws/linux-oe-g++/qmake.conf +++ b/mkspecs/qws/linux-oe-g++/qmake.conf | |||
@@ -1,59 +1,59 @@ | |||
1 | # | 1 | # |
2 | # $Id$ | 2 | # $Id$ |
3 | # | 3 | # |
4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler | 4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler |
5 | # | 5 | # |
6 | 6 | ||
7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt link_prl | 9 | CONFIG += qt link_prl |
10 | 10 | ||
11 | STAGING_BINDIR = $(OEDIR)/tmp/staging/i686-linux/bin | 11 | STAGING_BINDIR = $(OEDIR)/tmp/staging/$(OEHOSTSYS)/bin |
12 | STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin | 12 | STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin |
13 | STAGING_INCDIR = $(OEDIR)/tmp/staging/arm-linux/include | 13 | STAGING_INCDIR = $(OEDIR)/tmp/staging/arm-linux/include |
14 | STAGING_LIBDIR = $(OEDIR)/tmp/staging/arm-linux/lib | 14 | STAGING_LIBDIR = $(OEDIR)/tmp/staging/arm-linux/lib |
15 | 15 | ||
16 | QMAKE_CC = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-gcc | 16 | QMAKE_CC = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-gcc |
17 | QMAKE_LEX = flex | 17 | QMAKE_LEX = flex |
18 | QMAKE_LEXFLAGS = | 18 | QMAKE_LEXFLAGS = |
19 | QMAKE_YACC = yacc | 19 | QMAKE_YACC = yacc |
20 | QMAKE_YACCFLAGS = -d | 20 | QMAKE_YACCFLAGS = -d |
21 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 21 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
22 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 22 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
23 | QMAKE_CFLAGS_WARN_OFF= | 23 | QMAKE_CFLAGS_WARN_OFF= |
24 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 24 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
25 | QMAKE_CFLAGS_DEBUG= -g | 25 | QMAKE_CFLAGS_DEBUG= -g |
26 | QMAKE_CFLAGS_SHLIB= -fPIC | 26 | QMAKE_CFLAGS_SHLIB= -fPIC |
27 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 27 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
28 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 28 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
29 | 29 | ||
30 | QMAKE_CXX = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-g++ -DQT_QWS_SL5XX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM | 30 | QMAKE_CXX = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-g++ -DQT_QWS_SL5XX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM |
31 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 31 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
32 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 32 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
33 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 33 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
34 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 34 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
35 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 35 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
36 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 36 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
37 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 37 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
38 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 38 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
39 | 39 | ||
40 | QMAKE_INCDIR = $$STAGING_INCDIR | 40 | QMAKE_INCDIR = $$STAGING_INCDIR |
41 | QMAKE_LIBDIR = $$STAGING_LIBDIR | 41 | QMAKE_LIBDIR = $$STAGING_LIBDIR |
42 | QMAKE_INCDIR_X11= | 42 | QMAKE_INCDIR_X11= |
43 | QMAKE_LIBDIR_X11= | 43 | QMAKE_LIBDIR_X11= |
44 | QMAKE_INCDIR_QT = $(QTDIR)/include | 44 | QMAKE_INCDIR_QT = $(QTDIR)/include |
45 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 45 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
46 | QMAKE_INCDIR_OPENGL= | 46 | QMAKE_INCDIR_OPENGL= |
47 | QMAKE_LIBDIR_OPENGL= | 47 | QMAKE_LIBDIR_OPENGL= |
48 | QMAKE_INCDIR_QTOPIA= | 48 | QMAKE_INCDIR_QTOPIA= |
49 | QMAKE_LIBDIR_QTOPIA= | 49 | QMAKE_LIBDIR_QTOPIA= |
50 | 50 | ||
51 | QMAKE_LINK = $$STAGING_CROSSDIR/arm-linux-g++ | 51 | QMAKE_LINK = $$STAGING_CROSSDIR/arm-linux-g++ |
52 | QMAKE_LINK_SHLIB= $$STAGING_CROSSDIR/arm-linux-g++ | 52 | QMAKE_LINK_SHLIB= $$STAGING_CROSSDIR/arm-linux-g++ |
53 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 53 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
54 | QMAKE_LFLAGS_RELEASE= | 54 | QMAKE_LFLAGS_RELEASE= |
55 | QMAKE_LFLAGS_DEBUG= | 55 | QMAKE_LFLAGS_DEBUG= |
56 | QMAKE_LFLAGS_SHLIB = -shared | 56 | QMAKE_LFLAGS_SHLIB = -shared |
57 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 57 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
58 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 58 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
59 | QMAKE_LFLAGS_THREAD = | 59 | QMAKE_LFLAGS_THREAD = |