aboutsummaryrefslogtreecommitdiffstats
path: root/packages/libqpe
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2005-02-14 10:22:01 +0000
committerMichael Lauer <mickey@vanille-media.de>2005-02-14 10:22:01 +0000
commitd264c684381ace00faa32ea710718d85c4253810 (patch)
tree8e7142c0d654bd49cd1fd5a11f36ab26c7b9057a /packages/libqpe
parent69fade6e3c11fee16b5c369b88dc236790321f7e (diff)
downloadopenembedded-d264c684381ace00faa32ea710718d85c4253810.tar.gz
consolidate collie, shepherd, husky into the common machine c7x0. kernel 2.6 handles all three machines, for kernel 2.4 we build three different kernels for every -image build.
BKrev: 42107bc9qhsZjYvjPqkddsMIsQuYAA
Diffstat (limited to 'packages/libqpe')
-rw-r--r--packages/libqpe/libqpe-opie_1.1.9.bb9
-rw-r--r--packages/libqpe/libqpe-opie_cvs.bb6
2 files changed, 7 insertions, 8 deletions
diff --git a/packages/libqpe/libqpe-opie_1.1.9.bb b/packages/libqpe/libqpe-opie_1.1.9.bb
index 22a83243dc..ed03318a49 100644
--- a/packages/libqpe/libqpe-opie_1.1.9.bb
+++ b/packages/libqpe/libqpe-opie_1.1.9.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
DEPENDS = "uicmoc-native qte"
PROVIDES = "virtual/libqpe"
-PR = "r1"
+PR = "r2"
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
@@ -20,11 +20,8 @@ EXTRA_QMAKEVARS_PRE = "CONFIG+=LIBQPE_WITHROHFEEDBACK"
EXTRA_QMAKEVARS_POST = "DESTDIR="
CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC -fno-rtti -fno-exceptions"
-
-CXXFLAGS_append_husky = " -DOPIE_NO_WINDOWED "
-CXXFLAGS_append_corgi = " -DOPIE_NO_WINDOWED "
-CXXFLAGS_append_shepherd = " -DOPIE_NO_WINDOWED "
-XXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED "
+CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED "
+CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED "
do_compile() {
mkdir -p ${STAGING_INCDIR}/qpe \
diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index a268b75a1a..9df42b4335 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
DEPENDS = "uicmoc-native qte"
PROVIDES = "virtual/libqpe"
PV = "1.1.9+cvs-${CVSDATE}"
-PR = "r1"
+PR = "r2"
SRC_URI = "${HANDHELDS_CVS};module=opie/library \
file://nomax.patch;patch=1;pnum=1"
@@ -18,7 +18,9 @@ QMAKE_PROFILES = "library.pro"
EXTRA_QMAKEVARS_PRE = "CONFIG+=LIBQPE_WITHROHFEEDBACK"
EXTRA_QMAKEVARS_POST = "DESTDIR="
-CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NO_WINDOWED -DOPIE_NEW_MALLOC -fno-rtti -fno-exceptions"
+CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC -fno-rtti -fno-exceptions"
+CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED "
+CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED "
do_compile_prepend_ramses () {
ln -s custom-ramses.h custom.h