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

Merge remote-tracking branch 'origin/master' into dev

Browse source
This commit is contained in:
Dimitris Panokostas 2019-08-05 16:10:06 +02:00
commit a1e035af08
3 changed files with 49 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Makefile
View file

@ -145,12 +145,53 @@ AARCH64 = 1
else ifeq ($(PLATFORM),vero4k)
USE_SDL2 = 1
CFLAGS += -march=armv8-a -mtune=cortex-a53 -mfpu=neon-fp-armv8
CFLAGS += -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -ftree-vectorize -funsafe-math-optimizations
CPPFLAGS += -I/opt/vero3/include -DARMV6_ASSEMBLY -D_FILE_OFFSET_BITS=64 -DARMV6T2 -DUSE_ARMNEON -DARM_HAS_DIV -DUSE_SDL2 -DMALI_GPU -DUSE_RENDER_THREAD -DFASTERCYCLES
LDFLAGS += -L/opt/vero3/lib
HAVE_NEON = 1
NAME = amiberry-vero4k
# Amlogic S905/S905X/S912 (AMLGXBB/AMLGXL/AMLGXM) e.g. Khadas VIM1/2 / S905X2 (AMLG12A) & S922X/A311D (AMLG12B) e.g. Khadas VIM3 - 32-bit userspace
else ifneq (,$(findstring AMLG,$(PLATFORM)))
USE_SDL2 = 1
CFLAGS += -march=armv8-a+crc -mfloat-abi=hard -mfpu=neon-fp-armv8
CPPFLAGS += -DARMV6_ASSEMBLY -D_FILE_OFFSET_BITS=64 -DARMV6T2 -DUSE_ARMNEON -DARM_HAS_DIV -DUSE_SDL2 -DUSE_RENDER_THREAD -DFASTERCYCLES
HAVE_NEON = 1
ifneq (,$(findstring AMLG12,$(PLATFORM)))
ifneq (,$(findstring AMLG12B,$(PLATFORM)))
CFLAGS += -mtune=cortex-a73.cortex-a53
NAME = amiberry-AMLG12B
else
CFLAGS += -mtune=cortex-a53
NAME = amiberry-AMLG12A
endif
else ifneq (,$(findstring AMLGX,$(PLATFORM)))
CFLAGS += -mtune=cortex-a53
CPPFLAGS += -DMALI_GPU
NAME = amiberry-AMLGX
endif
# Rockchip RK3288 e.g. Asus Tinker Board / RK3328 e.g. PINE64 Rock64 / RK3399 e.g. PINE64 RockPro64 - 32-bit userspace
else ifneq (,$(findstring RK,$(PLATFORM)))
USE_SDL2 = 1
CPPFLAGS += -DARMV6_ASSEMBLY -D_FILE_OFFSET_BITS=64 -DARMV6T2 -DUSE_ARMNEON -DARM_HAS_DIV -DUSE_SDL2 -DFASTERCYCLES -DUSE_RENDER_THREAD -DMALI_GPU
HAVE_NEON = 1
ifneq (,$(findstring RK33,$(PLATFORM)))
CFLAGS += -march=armv8-a+crc -mfloat-abi=hard -mfpu=neon-fp-armv8
ifneq (,$(findstring RK3399,$(PLATFORM)))
CFLAGS += -mtune=cortex-a72.cortex-a53
NAME = amiberry-RK3399
else ifneq (,$(findstring RK3328,$(PLATFORM)))
CFLAGS += -mtune=cortex-a53
NAME = amiberry-RK3328
endif
else ifneq (,$(findstring RK3288,$(PLATFORM)))
CFLAGS += -march=armv7ve -mtune=cortex-a17 -mfloat-abi=hard -mfpu=neon-vfpv4
NAME = amiberry-RK3288
endif
else ifeq ($(PLATFORM),tinker)
USE_SDL2 = 1
CFLAGS += -march=armv7-a -mtune=cortex-a17 -mfpu=neon-vfpv4

6
src/main.cpp
View file

@ -731,12 +731,18 @@ static int real_main2 (int argc, TCHAR **argv)
{
#ifdef USE_SDL1
int ret = SDL_Init(SDL_INIT_NOPARACHUTE | SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_JOYSTICK);
#elif USE_SDL2
// Some gamepads need this extra time to come up or they wont be detected
int ret = SDL_Init(SDL_INIT_JOYSTICK); // Init everything else later when we need it
#endif
#if defined (USE_SDL1) || defined (USE_SDL2)
if (ret < 0)
{
printf("SDL could not initialize! SDL_Error: %s\n", SDL_GetError());
abort();
}
#endif
keyboard_settrans();
set_config_changed();
if (restart_config[0]) {

2
src/osdep/amiberry_gfx.cpp
View file

@ -341,7 +341,7 @@ int graphics_setup(void)
}
}
#elif USE_SDL2
if (SDL_Init(SDL_INIT_EVERYTHING) != 0)
if (SDL_Init(SDL_INIT_EVERYTHING & ~SDL_INIT_JOYSTICK) != 0) // Everything except joystick, which was initialised earlier
{
SDL_Log("SDL could not initialize! SDL_Error: %s\n", SDL_GetError());
abort();