summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/qte/qte-mt-static_2.3.12.bb2
-rw-r--r--packages/qte/qte-mt_2.3.12.bb2
-rw-r--r--packages/snes9x/snes9x-sdl-qpe_1.39.bb6
3 files changed, 8 insertions, 2 deletions
diff --git a/packages/qte/qte-mt-static_2.3.12.bb b/packages/qte/qte-mt-static_2.3.12.bb
index c6e4f72667..9210d85dc3 100644
--- a/packages/qte/qte-mt-static_2.3.12.bb
+++ b/packages/qte/qte-mt-static_2.3.12.bb
@@ -1,6 +1,8 @@
require qte-common_${PV}.inc
PR = "r4"
+DEFAULT_PREFERENCE = "-1"
+
EXTRA_OECONF += "-static -thread"
do_stage() {
diff --git a/packages/qte/qte-mt_2.3.12.bb b/packages/qte/qte-mt_2.3.12.bb
index 90e84fe38d..704081e639 100644
--- a/packages/qte/qte-mt_2.3.12.bb
+++ b/packages/qte/qte-mt_2.3.12.bb
@@ -1,6 +1,8 @@
require qte-common_${PV}.inc
PR = "r2"
+DEFAULT_PREFERENCE = "-1"
+
EXTRA_OECONF += "-thread"
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/snes9x/snes9x-sdl-qpe_1.39.bb b/packages/snes9x/snes9x-sdl-qpe_1.39.bb
index 4e8a294d2b..adf49650d9 100644
--- a/packages/snes9x/snes9x-sdl-qpe_1.39.bb
+++ b/packages/snes9x/snes9x-sdl-qpe_1.39.bb
@@ -3,7 +3,7 @@ SECTION = "opie/games"
PRIORITY = "optional"
DEPENDS = "libsdl-qpe"
LICENSE = "snes9x"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://www.vanille.de/mirror/snes9x-sdl-${PV}.tar.bz2 \
file://compile.patch;patch=1"
@@ -13,10 +13,12 @@ FILESPATH = "${FILE_DIRNAME}/${PN}-${PV}:${FILE_DIRNAME}/snes9x-sdl-${PV}:${FILE
inherit qmake-base
+QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
+
do_compile() {
oe_runmake CC="${CC}" CCC="${CXX}" \
INCLUDES="-I${STAGING_INCDIR} `sdl-config --cflags`" \
- LDLIBS="`sdl-config --libs` -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${STAGING_LIBDIR} -lqpe -lqte"
+ LDLIBS="`sdl-config --libs` -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${STAGING_LIBDIR} -lqpe -l${QT_LIBRARY}"
}
do_install() {