RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-04 23:07:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

libretro, fix classic_arm builds, minor cleanup

Browse source
This commit is contained in:
kub 2022-04-20 00:00:43 +02:00
parent a5085db3ea
commit 36b2f2931f
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile.libretro
View file

@ -334,7 +334,7 @@ else ifeq ($(platform), classic_armv7_a7)
fpic := -fPIC
SHARED := -shared -Wl,--no-undefined,-Bsymbolic
CFLAGS += -Ofast \
-flto=4 -fwhole-program -fuse-linker-plugin \
-flto=4 -fuse-linker-plugin \
-fdata-sections -ffunction-sections -Wl,--gc-sections \
-fno-stack-protector -fno-ident -fomit-frame-pointer \
-falign-functions=1 -falign-jumps=1 -falign-loops=1 \
@ -363,7 +363,7 @@ else ifeq ($(platform), classic_armv8_a35)
fpic := -fPIC
SHARED := -shared -Wl,--no-undefined,-Bsymbolic
CFLAGS += -Ofast \
-flto -fwhole-program -fuse-linker-plugin \
-flto -fuse-linker-plugin \
-fdata-sections -ffunction-sections -Wl,--gc-sections \
-fno-stack-protector -fno-ident -fomit-frame-pointer \
-falign-functions=1 -falign-jumps=1 -falign-loops=1 \
@ -715,4 +715,4 @@ include Makefile
ifeq ($(platform), osx)
pico/cd/libchdr/src/libchdr_chd.o: CFLAGS += -D__MACTYPES__=1
endif
endif

4
platform/common/common.mak
View file

@ -200,8 +200,8 @@ $(FR)cpu/cyclone/Cyclone.h:
$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/$(CYCLONE_CONFIG)
@echo building Cyclone...
@export CC=$(CYCLONE_CC) CXX=$(CYCLONE_CXX) CFLAGS=-O2; \
make -C $(R)cpu/cyclone/ CONFIG_FILE=../$(CYCLONE_CONFIG) HAVE_ARMv6=$(HAVE_ARMv6)
@export CC=$(CYCLONE_CC) CXX=$(CYCLONE_CXX) CFLAGS=-O2 CXXFLAGS=-O2 CPPFLAGS="" LDFLAGS="" && \
make -C $(R)cpu/cyclone/ CONFIG_FILE=../$(CYCLONE_CONFIG) HAVE_ARMv6=$(HAVE_ARMv6)
$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/cyclone/*.cpp $(FR)cpu/cyclone/*.h

3
platform/common/mp3_drmp3.c
View file

@ -9,10 +9,13 @@
#include <stdio.h>
#include <pico/pico_int.h>
#ifdef USE_LIBRETRO_VFS
// Ugh, drmp3 tries to use wfopen on windows, which breaks libretro VFS...
#define __acrt_iob_func __acrt_iob_func2
#define _wfopen_s(p,m) NULL
#define _wfopen(p,m) NULL
#endif
#define DR_MP3_IMPLEMENTATION
#include "dr_libs/dr_mp3.h"
#include "mp3.h"

4
platform/libretro/libretro.c
View file

@ -616,7 +616,7 @@ void retro_set_environment(retro_environment_t cb)
static const struct retro_system_content_info_override content_overrides[] = {
{
"gen|smd|md|32x|sms|68k|sgd|pco", /* extensions */
"gen|smd|md|32x|sms|gg|sg|68k|sgd|pco", /* extensions */
#if defined(LOW_MEMORY)
true, /* need_fullpath */
#else
@ -2276,7 +2276,7 @@ void retro_run(void)
buff = (char*)vout_buf + vout_offset;
#endif
video_cb((short *)buff, vout_width, vout_height, vout_width * 2);
video_cb((short *)buff, vout_width, vout_height, vout_width * 2);
}
void retro_init(void)