Skip to content

Commit 4e831c9

Browse files
committed
build: wire HAVE_ROPUS
Makefile.common gains a HAVE_ROPUS block following the rmodtracker precedent, adding formats/opus/ropus.o and pulling in audio_transfer.o when no other audio decoder already has; qb defaults it to yes; griffin defines it and includes ropus.c next to the other single-file decoders, extending the audio_transfer condition.
1 parent b0bd617 commit 4e831c9

3 files changed

Lines changed: 21 additions & 1 deletion

File tree

Makefile.common

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2074,6 +2074,20 @@ endif
20742074
endif
20752075
endif
20762076

2077+
ifeq ($(HAVE_ROPUS), 1)
2078+
DEFINES += -DHAVE_ROPUS
2079+
OBJ += $(LIBRETRO_COMM_DIR)/formats/opus/ropus.o
2080+
ifneq ($(HAVE_BUILTINFLAC),1)
2081+
ifneq ($(HAVE_RVORBIS),1)
2082+
ifneq ($(HAVE_RMP3),1)
2083+
ifneq ($(HAVE_RMODTRACKER),1)
2084+
OBJ += $(LIBRETRO_COMM_DIR)/formats/audio_transfer.o
2085+
endif
2086+
endif
2087+
endif
2088+
endif
2089+
endif
2090+
20772091
ifeq ($(HAVE_BUILTINFLAC),1)
20782092
HAVE_FLAC = 1
20792093
DEFINES += -DHAVE_FLAC -DHAVE_RFLAC -DHAVE_STDINT_H -DHAVE_LROUND -DFLAC__HAS_OGG=0 \

griffin/griffin.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535

3636
#define HAVE_RMODTRACKER 1
3737

38+
#define HAVE_ROPUS 1
39+
3840
#if defined(HAVE_ZLIB) || defined(HAVE_7ZIP)
3941
#define HAVE_COMPRESSION 1
4042
#endif
@@ -1011,7 +1013,10 @@ DRIVERS
10111013
#if defined(HAVE_RMP3)
10121014
#include "../libretro-common/formats/mp3/rmp3.c"
10131015
#endif
1014-
#if defined(HAVE_RFLAC) || defined(HAVE_RVORBIS) || defined(HAVE_RMP3) || defined(HAVE_RMODTRACKER)
1016+
#ifdef HAVE_ROPUS
1017+
#include "../libretro-common/formats/opus/ropus.c"
1018+
#endif
1019+
#if defined(HAVE_RFLAC) || defined(HAVE_RVORBIS) || defined(HAVE_RMP3) || defined(HAVE_RMODTRACKER) || defined(HAVE_ROPUS)
10151020
#include "../libretro-common/formats/audio_transfer.c"
10161021
#endif
10171022
#include "../libretro-common/audio/audio_mixer.c"

qb/config.params.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ HAVE_STB_FONT=yes # stb_truetype font support
134134
HAVE_STB_IMAGE=yes # stb image loading support
135135
HAVE_RVORBIS=yes # stb vorbis support
136136
HAVE_RMODTRACKER=yes # rmodtracker MOD/S3M/XM support
137+
HAVE_ROPUS=yes # ropus Opus audio support
137138
HAVE_XVIDEO=no # XVideo support
138139
HAVE_V4L2=auto # Video4linux2 support
139140
HAVE_NEON=no # ARM NEON optimizations

0 commit comments

Comments
 (0)