From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 25 Oct 2004 10:19:32 +0000 (+0000)
Subject: fix linking of qpe-sdl apps by defining CONFIG+=qt and LIBS+=-lqpe in palmtop.oeclass
X-Git-Tag: Release-2010-05/1~16465
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bfdcfa25e0d78d2bd4e09b933441bad09a729f0;p=openembedded.git

fix linking of qpe-sdl apps by defining CONFIG+=qt and LIBS+=-lqpe in palmtop.oeclass

BKrev: 417cd334TIfnD_KeJDWvabdMprnW0g
---

diff --git a/brickout/brickout_2002.06.09.oe b/brickout/brickout_2002.06.09.oe
index d249834c0f..aab6ba1575 100644
--- a/brickout/brickout_2002.06.09.oe
+++ b/brickout/brickout_2002.06.09.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "libsdl-qpe libsdl-mixer libsdl-image"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.sonic.net/pub/users/nbs/unix/agenda/brickout/src/brickout-${PV}.tar.gz \
            file://directories.patch;patch=1"
@@ -12,7 +12,7 @@ SRC_URI = "ftp://ftp.sonic.net/pub/users/nbs/unix/agenda/brickout/src/brickout-$
 inherit palmtop
 
 EXTRA_QMAKEVARS_POST += " INCLUDEPATH+=${STAGING_INCDIR}/SDL LIBS+=-lSDL LIBS+=-lSDL_mixer LIBS+=-lSDLmain \
-			LIBS+=-lSDL_image LIBS+=-lpthread CONFIG+=qt LIBS+=-lqpe TARGET=brickout DEFINES+=USE_SDL "
+			LIBS+=-lSDL_image LIBS+=-lpthread TARGET=brickout DEFINES+=USE_SDL "
 
 do_configure_prepend() {
         qmake -project -o brickout.pro
diff --git a/classes/palmtop.oeclass b/classes/palmtop.oeclass
index e69de29bb2..c7740c266b 100644
--- a/classes/palmtop.oeclass
+++ b/classes/palmtop.oeclass
@@ -0,0 +1,10 @@
+# basically a placeholder for something more fancy
+# for now, just declare some things
+
+inherit qmake
+
+EXTRA_QMAKEVARS_POST_append = " DEFINES+=QWS LIBS+=-lqpe CONFIG+=qt"
+
+DEPENDS_prepend = "virtual/libqpe uicmoc-native "
+
+FILES_${PN} = "${palmtopdir}"
diff --git a/gemdropx/gemdropx_0.9.oe b/gemdropx/gemdropx_0.9.oe
index ef572c850d..3b2dbadf83 100644
--- a/gemdropx/gemdropx_0.9.oe
+++ b/gemdropx/gemdropx_0.9.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.newbreedsoftware.com/gemdropx/"
 DEPENDS = "virtual/libqpe libsdl-qpe"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/src/gemdropx-${PV}.tar.gz \
            file://directories.patch;patch=1 \
@@ -14,7 +14,7 @@ SRC_URI = "ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/src/gemdropx-${PV}.
 inherit palmtop
 
 EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/SDL LIBS+=-lSDL LIBS+=-lSDL_mixer \
-			LIBS+=-lSDLmain LIBS+=-lSDL_image LIBS+=-lpthread CONFIG+=qte"
+			LIBS+=-lSDLmain LIBS+=-lSDL_image LIBS+=-lpthread"
 
 do_configure_prepend() {
         qmake -project -o gemdropx.pro