diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-03-30 16:57:59 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-03-30 16:57:59 +0000 |
| commit | 09cad80ea333b45f0df46b82c78744d3be54c879 (patch) | |
| tree | 2b1b7f215ab39f7eec7326ddb7788861a676a3e8 /scummvm | |
| parent | af450e8dbbd887ca6037bc7ad930d7f15dd04345 (diff) | |
Merge
2004/03/29 11:11:49-05:00 local!kergoth
Bug in scummvm build.. we werent being explicit about configure options, so it was poking around in native headers to determine if we had things like libvorbis and libogg. Fixed.
2004/03/29 11:11:23-05:00 local!kergoth
Bugfixes in pango and appweb per the recent oe metadata handling change.
BKrev: 4069a7174MMf0zvSv3smX-syqMLJLA
Diffstat (limited to 'scummvm')
| -rw-r--r-- | scummvm/scummvm_0.5.1.oe | 17 | ||||
| -rw-r--r-- | scummvm/scummvm_0.6.0.oe | 14 |
2 files changed, 22 insertions, 9 deletions
diff --git a/scummvm/scummvm_0.5.1.oe b/scummvm/scummvm_0.5.1.oe index ebdd6bb1f3..37bccd4667 100644 --- a/scummvm/scummvm_0.5.1.oe +++ b/scummvm/scummvm_0.5.1.oe @@ -1,14 +1,23 @@ DESCRIPTION = "Virtual Machine for LucasArts Adventures" SECTION = "base" PRIORITY = "optional" -RDEPENDS = "libc6 libsdl-qpe libmad" -DEPENDS = "virtual/libc libsdl-qpe libmad" +DEPENDS = "virtual/libc libsdl-qpe libmad libvorbis libogg" -SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tgz" +SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2" inherit autotools libtool -EXTRA_OECONF = "--backend=sdl" +EXTRA_OECONF = "--backend=sdl \ + --with-sdl-prefix=${STAGING_BINDIR}/.. \ + --disable-alsa \ + --with-ogg-prefix=${STAGING_LIBDIR}/.. \ + --with-vorbis-prefix=${STAGING_LIBDIR}/.. \ + --disable-mpeg2 \ + --with-mad-prefix=${STAGING_BINDIR}/.." + +do_configure() { + ./configure ${EXTRA_OECONF} +} do_compile() { oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" DEFINES="-DUNIX -DQTOPIA" diff --git a/scummvm/scummvm_0.6.0.oe b/scummvm/scummvm_0.6.0.oe index b23fcfc2fe..37bccd4667 100644 --- a/scummvm/scummvm_0.6.0.oe +++ b/scummvm/scummvm_0.6.0.oe @@ -1,18 +1,22 @@ DESCRIPTION = "Virtual Machine for LucasArts Adventures" SECTION = "base" PRIORITY = "optional" -RDEPENDS = "libc6 libsdl-qpe libmad" -DEPENDS = "virtual/libc libsdl-qpe libmad" +DEPENDS = "virtual/libc libsdl-qpe libmad libvorbis libogg" SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2" inherit autotools libtool -export CC = "${HOST_PREFIX}gcc" -export CXX = "${HOST_PREFIX}g++" +EXTRA_OECONF = "--backend=sdl \ + --with-sdl-prefix=${STAGING_BINDIR}/.. \ + --disable-alsa \ + --with-ogg-prefix=${STAGING_LIBDIR}/.. \ + --with-vorbis-prefix=${STAGING_LIBDIR}/.. \ + --disable-mpeg2 \ + --with-mad-prefix=${STAGING_BINDIR}/.." do_configure() { - ./configure --backend=sdl --with-sdl-prefix=${STAGING_BINDIR}/.. + ./configure ${EXTRA_OECONF} } do_compile() { |