From 74d76a9e748ad3ad767ee50aac8074c8d8dbe947 Mon Sep 17 00:00:00 2001 From: "Javier S. Pedro" Date: Thu, 27 Aug 2009 00:24:13 +0200 Subject: [PATCH] fremantle build fixes --- debian/rules | 3 +-- gui/Makefile | 4 ++-- gui/plugin.c | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index a90f33a..f736176 100755 --- a/debian/rules +++ b/debian/rules @@ -34,8 +34,7 @@ else ifneq (,$(findstring arm,$(DEB_BUILD_GNU_TYPE))) # Fixes hang while exiting on Diablo. CFLAGS += -static-libgcc else # x86 - echo "This package does not build in x86" - exit 1 + crash endif configure: configure-stamp diff --git a/gui/Makefile b/gui/Makefile index 85e8d4a..9d7acce 100644 --- a/gui/Makefile +++ b/gui/Makefile @@ -8,7 +8,7 @@ LDFLAGS:=-export-dynamic -avoid-version -module -shared -Wl,-z,defs #GAME_VERSION GAME_SHARE_PATH=/usr/share/games/drnoksnes/ GAME_PLUGIN_PATH=/usr/lib/drnoksnes_plugin.so -GAME_CONF_PATH=/usr/share/games/drnoksnes/drnoksnes.conf +GAME_CONF_PATH=$(GAME_SHARE_PATH)/drnoksnes.conf GAME_BIN_PATH=/usr/games/drnoksnes GAME_GAME_PATH=/usr/games/wrapper/games/drnoksnes.game GAME_BANNER_PATH=/usr/share/pixmaps/osso-games-startup-drnoksnes.png @@ -38,7 +38,7 @@ clean: data: $(DATA_FILES) install: all - mkdir -p $(DESTDIR)$(GAME_SHARE_PATH) + install -d $(DESTDIR)$(GAME_SHARE_PATH) install drnoksnes_plugin.so $(DESTDIR)$(GAME_PLUGIN_PATH) install -m 0644 drnoksnes.conf $(DESTDIR)$(GAME_CONF_PATH) install -m 0644 drnoksnes.desktop $(DESTDIR)/usr/share/applications/hildon/ diff --git a/gui/plugin.c b/gui/plugin.c index 937ac11..79e0fe7 100644 --- a/gui/plugin.c +++ b/gui/plugin.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "../platform/hgw.h" #include "plugin.h" -- 1.7.9.5