frontend: maemo: some refactoring

diff --git a/Makefile b/Makefile
index 4a1e61c..5b2bef7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -175,10 +175,7 @@ OBJS += maemo/hildon.o maemo/main.o maemo/maemo_xkb.o frontend/pl_gun_ts.o
 maemo/%.o: maemo/%.c
 USE_PLUGIN_LIB = 1
 LDFLAGS += $(shell pkg-config --libs hildon-1 libpulse)
-EXTRA_CFLAGS +=  $(shell pkg-config --cflags hildon-1) -DHAVE_TSLIB
-#EXTRA_CFLAGS += -DMAEMO -DMAEMO_CHANGES -march=armv7-a -O3 -mtune=cortex-a8 -mfpu=neon -funsafe-math-optimizations \
-#                -mstructure-size-boundary=32 -falign-functions=32 -falign-loops
-CFLAGS += $(EXTRA_CFLAGS)
+CFLAGS += $(shell pkg-config --cflags hildon-1) -DHAVE_TSLIB
 CFLAGS += `pkg-config --cflags glib-2.0 libosso dbus-1 hildon-fm-2`
 LDFLAGS += `pkg-config --libs glib-2.0 libosso dbus-1 hildon-fm-2`
 endif

diff --git a/configure b/configure
index 8b5cbda..50378ca 100755 (executable)
--- a/configure
+++ b/configure
@@ -295,10 +295,7 @@ generic)
   need_sdl="yes"
   ;;
 maemo)
-  maemo_cflags=`pkg-config --cflags hildon-1`
-  maemo_ldlibs=`pkg-config --libs hildon-1`
-  CFLAGS="$CFLAGS -DMAEMO -DMAEMO_CHANGES $maemo_cflags"
-  MAIN_LDLIBS="$MAIN_LDLIBS $maemo_ldlibs"
+  CFLAGS="$CFLAGS -DMAEMO -DMAEMO_CHANGES"
   ;;
 libretro)
   CFLAGS="$CFLAGS -fPIC"

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index f045abb..72b3395 100644 (file)
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -582,19 +582,7 @@ static void update_input(void)
        in_keystate = actions[IN_BINDTYPE_PLAYER12];
 }
 #else /* MAEMO */
-#include <gtk/gtk.h>
-static void update_input(void)
-{
-       extern int g_maemo_opts;
-       extern int maemo_x11_update_keys();
-       if (g_maemo_opts&8)
-               maemo_x11_update_keys();
-       else{
-               /* process GTK+ events */
-               while (gtk_events_pending())
-                       gtk_main_iteration();
-       }
-}
+extern void update_input(void);
 #endif
 
 void pl_update_gun(int *xn, int *yn, int *xres, int *yres, int *in)

diff --git a/maemo/hildon.c b/maemo/hildon.c
index 4bdd1de..bd895c9 100644 (file)
--- a/maemo/hildon.c
+++ b/maemo/hildon.c
@@ -772,15 +772,19 @@ void *plat_gvideo_flip(void)
                }
        }
 
+       return pl_vout_buf;
+}
+
+// for frontend/plugin_lib.c
+void update_input(void)
+{
        if (g_maemo_opts & 8)
                maemo_x11_update_keys();
-       else{
-               //process GTK+ events 
-       while (gtk_events_pending())
-               gtk_main_iteration();
+       else {
+               /* process GTK+ events */
+               while (gtk_events_pending())
+                       gtk_main_iteration();
        }
-
-       return pl_vout_buf;
 }
 
 int omap_enable_layer(int enabled)