diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-15 18:23:17 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-15 18:23:17 +0100 |
| commit | a25da5c491ac2a3820be7aaa7fa507fe7ca8b354 (patch) | |
| tree | d8162d4d8d6aaf5f129e203b6bc9d3ccead522f7 /packages/scummvm/scummvm_0.9.1.bb | |
| parent | 9e167064390ce3bff7425be5c002ed3f1e7eb1d1 (diff) | |
| parent | 828ced10e6eaf2048a8fd7ee7263807fab9d784d (diff) | |
Merge commit 'origin/org.openembedded.dev' into holger/openmoko-merges
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}" } |