diff options
author | Denis 'Gnutoo' Carikli <GNUtoo@no-log.org> | 2010-02-13 09:11:33 +0100 |
---|---|---|
committer | Denis 'Gnutoo' Carikli <GNUtoo@no-log.org> | 2010-02-13 09:11:33 +0100 |
commit | 4a0b75c5a0b696b210662c3b15cba223f6b59922 (patch) | |
tree | 3dc3c41b51af13ea1b685fe978afab4e33a8a7f0 /recipes/wesnoth/wesnoth_1.6.5.bb | |
parent | 5635777f38f3d86ff0b3ae9e2e5a518e38c22105 (diff) |
Revert "wesnoth: only compile tiny GUI when screen is smaller than 800x480(smallgui)"
This reverts commit a4124738f4b572c37ff6d082c7decf7387cde1d2.
We shouldn't make use of USE flags-like functionalities in non machine feeds,
And we can't put every recipe in machine feed.
I think the best way is to do a wesnoth-highres recipe
Diffstat (limited to 'recipes/wesnoth/wesnoth_1.6.5.bb')
-rw-r--r-- | recipes/wesnoth/wesnoth_1.6.5.bb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/recipes/wesnoth/wesnoth_1.6.5.bb b/recipes/wesnoth/wesnoth_1.6.5.bb index 3c8a451970..cd1a50d2bc 100644 --- a/recipes/wesnoth/wesnoth_1.6.5.bb +++ b/recipes/wesnoth/wesnoth_1.6.5.bb @@ -3,8 +3,7 @@ HOMEPAGE = "http://www.wesnoth.org/" SECTION = "games" LICENSE = "GPL" -DEPENDS = "freetype libsdl-image libsdl-mixer libsdl-net libsdl-ttf zlib boost pango libpng \ -${@base_ifelse(( int(bb.data.getVar('MACHINE_DISPLAY_WIDTH_PIXELS', d, 1) ) < 800 ) or ( int(bb.data.getVar('MACHINE_DISPLAY_HEIGHT_PIXELS',d,1) )< 480 ),"imagemagick-native","")}" +DEPENDS = "freetype libsdl-image libsdl-mixer libsdl-net libsdl-ttf zlib boost imagemagick-native pango libpng" PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/wesnoth/${PN}-${PV}.tar.bz2;name=tarball" @@ -16,7 +15,7 @@ ARM_INSTRUCTION_SET = "arm" inherit cmake EXTRA_OECMAKE = "\ - ${@base_ifelse( ( ( int(bb.data.getVar('MACHINE_DISPLAY_WIDTH_PIXELS', d, 1) ) < 800 ) or ( int(bb.data.getVar('MACHINE_DISPLAY_HEIGHT_PIXELS',d,1) ) < 480 ) ),"-DGUI=tiny","")} \ + -DGUI=tiny \ -DENABLE_EDITOR=ON \ -DENABLE_LOW_MEM=ON \ -DENABLE_FRIBIDI=OFF \ |