pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add generic sdl platform

Browse source
This commit is contained in:
Chips-fr 2016-01-24 17:42:00 +01:00
parent 2951f7f5cf
commit 8a73441c54
3 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Makefile
View file

@ -6,12 +6,13 @@ ifeq ($(PLATFORM),rpi2)
CPU_FLAGS += -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard CPU_FLAGS += -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
DEFS += -DRASPBERRY DEFS += -DRASPBERRY
HAVE_NEON = 1 HAVE_NEON = 1
HAVE_DISPMANX = 1
USE_PICASSO96 = 1 USE_PICASSO96 = 1
else ifeq ($(PLATFORM),rpi1) else ifeq ($(PLATFORM),rpi1)
CPU_FLAGS += -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard CPU_FLAGS += -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard
HAVE_DISPMANX = 1
DEFS += -DRASPBERRY DEFS += -DRASPBERRY
else ifeq ($(PLATFORM),armv6) else ifeq ($(PLATFORM),generic-sdl)
CPU_FLAGS += -march=armv6j -mfpu=vfp -mfloat-abi=hard
endif endif
NAME = uae4arm NAME = uae4arm
@ -137,7 +138,6 @@ OBJS = \
src/od-pandora/pandora.o \ src/od-pandora/pandora.o \
src/od-pandora/pandora_filesys.o \ src/od-pandora/pandora_filesys.o \
src/od-pandora/pandora_gui.o \ src/od-pandora/pandora_gui.o \
src/od-rasp/rasp_gfx.o \
src/od-pandora/pandora_mem.o \ src/od-pandora/pandora_mem.o \
src/od-pandora/sigsegv_handler.o \ src/od-pandora/sigsegv_handler.o \
src/od-pandora/menu/menu_config.o \ src/od-pandora/menu/menu_config.o \
@ -169,6 +169,13 @@ OBJS = \
src/od-pandora/gui/PanelSavestate.o \ src/od-pandora/gui/PanelSavestate.o \
src/od-pandora/gui/main_window.o \ src/od-pandora/gui/main_window.o \
src/od-pandora/gui/Navigation.o src/od-pandora/gui/Navigation.o
ifeq ($(HAVE_DISPMANX), 1)
OBJS += src/od-rasp/rasp_gfx.o
else
OBJS += src/od-pandora/pandora_gfx.o
endif
ifdef PANDORA ifdef PANDORA
OBJS += src/od-pandora/gui/sdltruetypefont.o OBJS += src/od-pandora/gui/sdltruetypefont.o
endif endif

6
src/od-pandora/pandora_gfx.cpp
View file

@ -8,7 +8,7 @@
#include "custom.h" #include "custom.h"
#include "drawing.h" #include "drawing.h"
#include "events.h" #include "events.h"
#include "osdep/inputmode.h" #include "od-pandora/inputmode.h"
#include "savestate.h" #include "savestate.h"
#include "picasso96.h" #include "picasso96.h"
@ -139,10 +139,12 @@ static void open_screen(struct uae_prefs *p)
} }
else else
{ {
#ifdef PICASSO96
if(picasso_vidinfo.height < 480) if(picasso_vidinfo.height < 480)
snprintf(layersize, 20, "%dx480", picasso_vidinfo.width); snprintf(layersize, 20, "%dx480", picasso_vidinfo.width);
else else
snprintf(layersize, 20, "%dx%d", picasso_vidinfo.width, picasso_vidinfo.height); snprintf(layersize, 20, "%dx%d", picasso_vidinfo.width, picasso_vidinfo.height);
#endif
#ifndef WIN32 #ifndef WIN32
setenv("SDL_OMAP_LAYER_SIZE", layersize, 1); setenv("SDL_OMAP_LAYER_SIZE", layersize, 1);
#endif #endif
@ -167,7 +169,9 @@ static void open_screen(struct uae_prefs *p)
} }
else else
{ {
#ifdef PICASSO96
prSDLScreen = SDL_SetVideoMode(picasso_vidinfo.width, picasso_vidinfo.height, 16, SDL_HWSURFACE|SDL_FULLSCREEN|SDL_DOUBLEBUF); prSDLScreen = SDL_SetVideoMode(picasso_vidinfo.width, picasso_vidinfo.height, 16, SDL_HWSURFACE|SDL_FULLSCREEN|SDL_DOUBLEBUF);
#endif
} }
if(prSDLScreen != NULL) if(prSDLScreen != NULL)
{ {

2
src/od-pandora/sysconfig.h
View file

@ -30,7 +30,7 @@
/* #define CPUEMU_12 */ /* cycle-exact cpu&blitter */ /* #define CPUEMU_12 */ /* cycle-exact cpu&blitter */
/* #define ACTION_REPLAY */ /* Action Replay 1/2/3 support */ /* #define ACTION_REPLAY */ /* Action Replay 1/2/3 support */
#if !defined(RASPBERRY) #if !defined(RASPBERRY)
#define PICASSO96 /* Picasso96 display card emulation */ /* #define PICASSO96 */ /* Picasso96 display card emulation */
#define UAEGFX_INTERNAL /* built-in libs:picasso96/uaegfx.card */ #define UAEGFX_INTERNAL /* built-in libs:picasso96/uaegfx.card */
#endif #endif
/* #define BSDSOCKET */ /* bsdsocket.library emulation */ /* #define BSDSOCKET */ /* bsdsocket.library emulation */