From 00215652384a4d8c47130ab9acd5ef2347b6e146 Mon Sep 17 00:00:00 2001 From: Chips Date: Sun, 31 Jul 2016 23:27:47 +0200 Subject: [PATCH] Solve compilation issue in gles platform --- Makefile | 2 +- src/od-gles/gles_gfx.cpp | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 5105f023..24e41b1d 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ else ifeq ($(PLATFORM),generic-sdl) else ifeq ($(PLATFORM),gles) # For Raspberry Pi uncomment the two below lines #LDFLAGS += -lbcm_host - #CPU_FLAGS="-mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard" + #CPU_FLAGS= -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard MORE_CFLAGS += -DARMV6T2 HAVE_GLES_DISPLAY = 1 HAVE_NEON = 1 diff --git a/src/od-gles/gles_gfx.cpp b/src/od-gles/gles_gfx.cpp index 5423d3cd..6ae7c659 100644 --- a/src/od-gles/gles_gfx.cpp +++ b/src/od-gles/gles_gfx.cpp @@ -10,7 +10,6 @@ #include "custom.h" #include "xwin.h" #include "drawing.h" -#include "od-pandora/inputmode.h" #include "savestate.h" #include "picasso96.h" @@ -251,11 +250,6 @@ void flush_screen () { //SDL_UnlockSurface (prSDLScreen); - if (show_inputmode) - { - inputmode_redraw(); - } - if (savestate_state == STATE_DOSAVE) { @@ -409,8 +403,8 @@ int graphics_init (void) if (!init_colors ()) return 0; - buttonstate[0] = buttonstate[1] = buttonstate[2] = 0; - keyboard_init(); + //buttonstate[0] = buttonstate[1] = buttonstate[2] = 0; + //keyboard_init(); return 1; }