diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-03 16:22:16 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-03 16:22:16 +0100 |
| commit | c0fcc31726c8c0ae90657512bd95bc983d1a8e4b (patch) | |
| tree | 3b59e0fae49e720712c76424056eb568f002be51 /packages/scummvm/scummvm_0.9.1.bb | |
| parent | edbb2e054166f3414e8a604a2b4f2ef8d775c02a (diff) | |
| parent | 0d2c29eaff64c853bdd73b9cbf01fbe39020db46 (diff) | |
Merge branch 'holger/enterprise' into org.openembedded.dev
Diffstat (limited to 'packages/scummvm/scummvm_0.9.1.bb')
| -rw-r--r-- | packages/scummvm/scummvm_0.9.1.bb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/packages/scummvm/scummvm_0.9.1.bb b/packages/scummvm/scummvm_0.9.1.bb index 39f3a76d14..7b6c9238a4 100644 --- a/packages/scummvm/scummvm_0.9.1.bb +++ b/packages/scummvm/scummvm_0.9.1.bb @@ -1,6 +1,7 @@ require scummvm.inc -DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib mpeg2dec" +DEPENDS = "virtual/libsdl libvorbis libogg zlib \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}" SRC_URI += "file://makefile-nostrip.patch;patch=1 \ file://scummvm-targetcheck.patch;patch=1" @@ -15,8 +16,10 @@ EXTRA_OECONF += "--enable-lure \ " do_compile() { - oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \ - DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2" + oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" \ + LDFLAGS="${LDFLAGS} ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '-lmpeg2', d)}" \ + DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '-DUSE_MAD -DUSE_MPEG2', d}" } |