fixing onscreen button position

diff --git a/Makefile b/Makefile
index 7d70ab1..e2838c3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #!/usr/bin/make
 
-CPPFLAGS := -I. -Iplatform $(shell sdl-config --cflags) $(shell pkg-config --cflags x11 xsp) -I/usr/include/hgw
+CPPFLAGS := -I. $(shell sdl-config --cflags) $(shell pkg-config --cflags x11 xsp) -I/usr/include/hgw
 LDLIBS := -lz $(shell sdl-config --libs) $(shell pkg-config --libs x11 xsp) -lpopt -lhgw
 
 # Default CFLAGS for building in N8x0

diff --git a/platform/sdli.cpp b/platform/sdli.cpp
index d7ff176..5696f29 100644 (file)
--- a/platform/sdli.cpp
+++ b/platform/sdli.cpp
@@ -16,18 +16,18 @@ struct TouchButton {
 #define TOUCH_BUTTON_INITIALIZER(name, x, y, w, h) \
        {SNES_##name##_MASK, 0, 0, 0, 0, x, y, w, h}
 
-TouchButton touchbuttons[] = {
+static TouchButton touchbuttons[] = {
        TOUCH_BUTTON_INITIALIZER(TL, 0, 0, 0.375, 0.0833),
        TOUCH_BUTTON_INITIALIZER(TR, 0.625, 0, 0.375, 0.0833),
-       TOUCH_BUTTON_INITIALIZER(UP, 0.125, 0, 0.125, 0.2777), //2
-       TOUCH_BUTTON_INITIALIZER(LEFT, 0.0, 0.2777, 0.125, 0.2777), //3
-       TOUCH_BUTTON_INITIALIZER(RIGHT, 0.25, 0.2777, 0.125, 0.2777), //4
-       TOUCH_BUTTON_INITIALIZER(DOWN, 0.125, 0.5555, 0.125, 0.2777), //5
+       TOUCH_BUTTON_INITIALIZER(UP, 0.125, 0.0833, 0.125, 0.2777), //2
+       TOUCH_BUTTON_INITIALIZER(LEFT, 0.0, 0.3611, 0.125, 0.2777), //3
+       TOUCH_BUTTON_INITIALIZER(RIGHT, 0.25, 0.3611, 0.125, 0.2777), //4
+       TOUCH_BUTTON_INITIALIZER(DOWN, 0.125, 0.6388, 0.125, 0.2777), //5
        TOUCH_BUTTON_INITIALIZER(START, 0, 0.9166, 0.375, 0.0833),
-       TOUCH_BUTTON_INITIALIZER(Y, 0.75, 0, 0.125, 0.2777),
-       TOUCH_BUTTON_INITIALIZER(X, 0.625, 0.2777, 0.125, 0.2777),
-       TOUCH_BUTTON_INITIALIZER(A, 0.875, 0.2777, 0.125, 0.2777),
-       TOUCH_BUTTON_INITIALIZER(B, 0.75, 0.5555, 0.125, 0.2777),
+       TOUCH_BUTTON_INITIALIZER(Y, 0.75, 0.0833, 0.125, 0.2777),
+       TOUCH_BUTTON_INITIALIZER(X, 0.625, 0.3611, 0.125, 0.2777),
+       TOUCH_BUTTON_INITIALIZER(A, 0.875, 0.3611, 0.125, 0.2777),
+       TOUCH_BUTTON_INITIALIZER(B, 0.75, 0.6388, 0.125, 0.2777),
        TOUCH_BUTTON_INITIALIZER(SELECT, 0.625, 0.9166, 0.375, 0.0833),
 };