From 99a2c8c9cda0133d249b854e031d1a35632b9dfa Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Wed, 23 Feb 2005 15:40:12 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/23 15:43:21+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/23 15:13:42+01:00 (none)!koen scummvm_0.6.1b.bb, scummvm.inc, scummvm-qpe_0.6.1b.bb: force libsdl-qpe with qpe build 2005/02/23 14:40:23+01:00 (none)!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into lieve.(none):/data/build/oe/clean-tree/openembedded 2005/02/23 14:39:51+01:00 (none)!koen split scummvm into scummvm.inc, scummvm-qpe.bb and scummvm.bb 2005/02/23 14:01:29+01:00 uni-frankfurt.de!mickeyl re-enable non-inlining of opie images into libqpe now that decoration drawing has been fixed upstream. BKrev: 421ca3dcb9j0-UXXcX77r2f2sdRsEw --- packages/libqpe/libqpe-opie_cvs.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages/libqpe') diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb index d496600354..7e1cdc7a32 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 = "r4" +PR = "r5" SRC_URI = "${HANDHELDS_CVS};module=opie/library \ file://nomax.patch;patch=1;pnum=1" @@ -16,8 +16,8 @@ inherit qmake QMAKE_PROFILES = "library.pro" EXTRA_QMAKEVARS_PRE = "CONFIG+=LIBQPE_WITHROHFEEDBACK" -# EXTRA_QMAKEVARS_POST = "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES" -EXTRA_QMAKEVARS_POST = "DESTDIR=" +EXTRA_QMAKEVARS_POST = "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES" +# EXTRA_QMAKEVARS_POST = "DESTDIR=" CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC -fno-rtti -fno-exceptions" CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED " -- cgit 1.2.3-korg