merge of 3a6c0a29d29ed10272278e0c212ee87508ffe416

     and 3d32d5cfdac5307f5ee1b8a7f9cf0f1c79278f03

3 files changed, 46 insertions, 27 deletions

diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass
index 523c3d71bb..fb2f539589 100644
--- a/classes/palmtop.bbclass
+++ b/classes/palmtop.bbclass
@@ -1,10 +1,16 @@
-# basically a placeholder for something more fancy
-# for now, just declare some things
+# this build class sets up qmake variables to
+#   * build using the Qt Windowing System (QWS)
+#   * use qt
+#   * link against supc++ instead of stdc++  
+#   * use threads, if requested via PALMTOP_USE_MULTITHREADED_QT = "yes"
+# inherit this class to build programs against libqpe
+# inherit opie if you want to build programs against libopie2
 
 inherit qmake
 
-EXTRA_QMAKEVARS_POST_append = " DEFINES+=QWS LIBS+=-lqpe CONFIG+=qt LIBS-=-lstdc++ LIBS+=-lsupc++"
+EXTRA_QMAKEVARS_POST += "DEFINES+=QWS LIBS+=-lqpe CONFIG+=qt LIBS-=-lstdc++ LIBS+=-lsupc++"
+EXTRA_QMAKEVARS_POST += "${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "CONFIG+=thread", "",d)}'
 
-DEPENDS_prepend = "virtual/libqpe uicmoc-native "
+DEPENDS_prepend = "virtual/libqpe1 uicmoc-native "
 
 FILES_${PN} = "${palmtopdir}"
diff --git a/classes/qmake.bbclass b/classes/qmake.bbclass
index 3a06b1af9f..4f2fceff35 100644
--- a/classes/qmake.bbclass
+++ b/classes/qmake.bbclass
@@ -49,7 +49,7 @@ qmake_do_configure() {
 
 #oenote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'"
 	unset QMAKESPEC || true
-	${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling qmake on $PROFILES"
+	${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES"
 }
 
 EXPORT_FUNCTIONS do_configure
diff --git a/classes/sdl.bbclass b/classes/sdl.bbclass
index 541812ed93..d458a144c7 100644
--- a/classes/sdl.bbclass
+++ b/classes/sdl.bbclass
@@ -1,27 +1,40 @@
-FILES_${PN} += '${libdir}/perl5'
+#
+# (C) Michael 'Mickey' Lauer <mickey@Vanille.de>
+#
 
-sdl_do_configure () {
-        if [ -x ${S}/configure ] ; then
-                cfgcmd="${S}/configure \
-                    -GL -GLU"
-                oenote "Running $cfgcmd..."
-                $cfgcmd || oefatal "oe_runconf failed"
-		if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
-			. ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh
-			sed -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:; s:\(SITEARCHEXP = \).*:\1${sitearchexp}:; s:\(INSTALLVENDORLIB = \).*:\1${D}${libdir}/perl5:; s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5:" < Makefile > Makefile.new
-			mv Makefile.new Makefile
-		fi
-        else
-                oefatal "no configure script found"
-        fi
-}
+DEPENDS += "virtual/libsdl libsdl-mixer libsdl-image"
 
-sdl_do_compile () {
-        oe_runmake PASTHRU_INC="${CFLAGS}"
-}
+APPDESKTOP ?= "${PN}.desktop"
+APPNAME ?= "${PN}"
+APPIMAGE ?= "${PN}.png"
 
-sdl_do_install () {
-	oe_runmake install_vendor
+sdl_do_sdl_install() {
+	install -d ${D}${palmtopdir}/bin
+	install -d ${D}${palmtopdir}/pics
+	install -d ${D}${palmtopdir}/apps/Games
+	ln -sf ${bindir}/${APPNAME} ${D}${palmtopdir}/bin/${APPNAME}
+	install -m 0644 ${APPIMAGE} ${D}${palmtopdir}/pics/${APPIMAGE}
+
+	if [ -e "${APPDESKTOP}" ]
+	then
+		install -m 0644 ${APPDESKTOP} ${D}${palmtopdir}/Games/${APPDESKTOP}
+	else
+		echo ${APPDESKTOP} not present, creating one on-the-fly...
+		cat >${D}${palmtopdir}/apps/Games/${PN}.desktop <<EOF
+[Desktop Entry]
+Note=Auto Generated... this may be not what you want
+Comment=${DESCRIPTION}
+Exec=${APPNAME}
+Icon=${APPIMAGE}
+Type=Application
+Name=${PN}
+EOF
+	fi
 }
 
-EXPORT_FUNCTIONS do_configure do_compile do_install
+EXPORT_FUNCTIONS do_sdl_install
+addtask sdl_install after do_compile before do_populate_staging
+
+PACKAGES += "${PN}-opie"
+RDEPENDS_${PN}-opie += "${PN}"
+FILES_${PN}-opie = "${palmtopdir}"