diff --git a/run/framebuffer_app.inc b/run/framebuffer_app.inc
index a005db0..58a00dd 100644
--- a/run/framebuffer_app.inc
+++ b/run/framebuffer_app.inc
@@ -9,45 +9,22 @@
# app_config - start node(s) of init for running the application
#
+create_boot_directory
+
+import_from_depot genodelabs/src/[base_src] \
+ genodelabs/pkg/[drivers_interactive_pkg] \
+ genodelabs/src/init
+
+
if {![info exists fb_config]} {
set fb_config {} }
-
-#
-# Build
-#
-
-append build_components {
- core init
- drivers/timer
- drivers/framebuffer drivers/input
-}
-
-lappend_if [have_spec usb] build_components drivers/usb
-
-source ${genode_dir}/repos/base/run/platform_drv.inc
-
-# override default platform driver policy
-proc platform_drv_policy {} {
- return {
-
-
-
- }
-}
-
-append_platform_drv_build_components
-
-build $build_components
-
-create_boot_directory
+set fd [open [run_dir]/genode/fb_drv.config w]
+puts $fd $fb_config
+close $fd
-#
-# Generate config
-#
-
-append config {
+install_config {
@@ -60,82 +37,38 @@ append config {
+
- }
-append_platform_drv_config
+
-if {[have_spec sdl]} {
-append config {
-
-
+
+
+
+
+
+
+
+
-
-
- }
-append config $fb_config
-append config {
- }
-}
+
+
+
-if {[have_spec framebuffer]} {
-append config {
-
-
-
- }
-append config $fb_config
-append config {
- }
-}
-
-append_if [have_spec ps2] config {
-
-
-
- }
-
-append_if [expr ![have_spec ps2] && [have_spec usb]] config {
-
-
-
-
-
- }
-
-append config {
- }
+
-append config $app_config
+} $app_config {
-append config {
}
-install_config $config
-
-
-#
-# Boot modules
-#
-
-# generic modules
-append boot_modules { core init timer ld.lib.so }
-
-# platform-specific modules
-lappend_if [have_spec linux] boot_modules fb_sdl
-lappend_if [have_spec framebuffer] boot_modules fb_drv
-lappend_if [have_spec ps2] boot_modules ps2_drv
-lappend_if [have_spec usb] boot_modules usb_drv
-
-append_platform_drv_boot_modules
+build $build_components
build_boot_image $boot_modules
-
run_genode_until forever
diff --git a/run/ltris.run b/run/ltris.run
index 22f31c1..e68823a 100644
--- a/run/ltris.run
+++ b/run/ltris.run
@@ -13,16 +13,17 @@ set app_config {
-
+
-
-
-
-
-
-
-
+
+
+
+
+ 2000-01-01 00:00
+
+
+
}
@@ -39,4 +40,6 @@ set boot_modules {
ltris_data.tar
}
+set fb_config {}
+
source ${genode_dir}/repos/world/run/framebuffer_app.inc
diff --git a/run/numptyphysics.run b/run/numptyphysics.run
index a7ce826..280aab4 100644
--- a/run/numptyphysics.run
+++ b/run/numptyphysics.run
@@ -13,13 +13,14 @@ set app_config {
-
-
-
-
-
-
-
+
+
+
+
+ 2000-01-01 00:00
+
+
+
}
diff --git a/run/supertux.run b/run/supertux.run
index fb7d48d..46331bb 100644
--- a/run/supertux.run
+++ b/run/supertux.run
@@ -11,13 +11,14 @@ set app_config {
-
-
-
-
-
-
-
+
+
+
+
+ 2000-01-01 00:00
+
+
+
}
diff --git a/run/tuxmath.run b/run/tuxmath.run
index 0b3ef53..b535d74 100644
--- a/run/tuxmath.run
+++ b/run/tuxmath.run
@@ -4,12 +4,13 @@ set app_config {
-
-
-
-
-
-
+
+
+
+
+ 2000-01-01 00:00
+
+
}
diff --git a/src/app/ltris/target.mk b/src/app/ltris/target.mk
index c67bdfb..0345879 100644
--- a/src/app/ltris/target.mk
+++ b/src/app/ltris/target.mk
@@ -1,5 +1,5 @@
TARGET = ltris
-LIBS = libc libm stdcxx sdlmain sdl sdl_mixer
+LIBS = libc libm stdcxx sdlmain sdl sdl_mixer pthread
LTRIS_DIR := $(call select_from_ports,ltris)/src/app/ltris
@@ -7,7 +7,7 @@ LTRIS_DIR := $(call select_from_ports,ltris)/src/app/ltris
VERSION := $(shell grep "^ VERSION" $(LTRIS_DIR)/configure | sed "s/.*=//")
CC_OPT += -DHI_DIR=\"/var\" -DSRC_DIR=\"/\" \
- -DVERSION=\"$(VERSION)\"
+ -DVERSION=\"$(VERSION)\" -Dinline=
INC_DIR += $(LTRIS_DIR)/src
SRC_C := $(notdir $(wildcard $(LTRIS_DIR)/src/*.c))