snes9x-sdl-qpe: fix linking

NOTE: shouldn't sdl-config take care about that in the qpe case?

diff --git a/packages/snes9x/snes9x-sdl-qpe_1.39.bb b/packages/snes9x/snes9x-sdl-qpe_1.39.bb
index 6d9fadf..4e8a294 100644 (file)
--- a/packages/snes9x/snes9x-sdl-qpe_1.39.bb
+++ b/packages/snes9x/snes9x-sdl-qpe_1.39.bb
@@ -2,20 +2,21 @@ DESCRIPTION = "Super Nintendo Emulator based on SDL, QtE Palmtop Environments Ed
 SECTION = "opie/games"
 PRIORITY = "optional"
 DEPENDS = "libsdl-qpe"
-PR = "r2"
 LICENSE = "snes9x"
+PR = "r3"
+
 SRC_URI = "http://www.vanille.de/mirror/snes9x-sdl-${PV}.tar.bz2 \
           file://compile.patch;patch=1"
 S = "${WORKDIR}/snes9x-sdl-${PV}"
 
 FILESPATH = "${FILE_DIRNAME}/${PN}-${PV}:${FILE_DIRNAME}/snes9x-sdl-${PV}:${FILE_DIRNAME}/snes9x-sdl:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
-FILES_${PN} = "${palmtopdir}/bin/snes9x"
+inherit qmake-base
 
 do_compile() {
        oe_runmake CC="${CC}" CCC="${CXX}" \
                   INCLUDES="-I${STAGING_INCDIR} `sdl-config --cflags`" \
-                  LDLIBS="`sdl-config --libs` -Wl,-rpath-link,${STAGING_LIBDIR} -lqpe -lqte"
+                  LDLIBS="`sdl-config --libs` -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${STAGING_LIBDIR} -lqpe -lqte"
 }
 
 do_install() {
@@ -23,3 +24,4 @@ do_install() {
        install -m 0755 snes9x ${D}${palmtopdir}/bin/snes9x
 }
 
+FILES_${PN} = "${palmtopdir}/bin/snes9x"

diff --git a/packages/snes9x/snes9x-sdl_1.39.bb b/packages/snes9x/snes9x-sdl_1.39.bb
index 9c37b12..ce6f5fa 100644 (file)
--- a/packages/snes9x/snes9x-sdl_1.39.bb
+++ b/packages/snes9x/snes9x-sdl_1.39.bb
@@ -2,14 +2,13 @@ DESCRIPTION = "Super Nintendo Emulator based on SDL"
 SECTION = "games"
 PRIORITY = "optional"
 DEPENDS = "virtual/libsdl zlib"
-PR = "r2"
 LICENSE = "snes9x"
+PR = "r2"
+
 SRC_URI = "http://www.vanille.de/mirror/snes9x-sdl-${PV}.tar.bz2 \
           file://compile.patch;patch=1"
 S = "${WORKDIR}/snes9x-sdl-${PV}"
 
-FILES_${PN} = "${bindir}/snes9x"
-
 do_compile() {
        oe_runmake CC="${CC}" CCC="${CXX} -fno-rtti -fno-exceptions" \
                   INCLUDES="-I${STAGING_INCDIR} `sdl-config --cflags`" \
@@ -21,3 +20,4 @@ do_install() {
        install -m 0755 snes9x ${D}${bindir}/snes9x
 }
 
+FILES_${PN} = "${bindir}/snes9x"