mirror of
https://github.com/QB64-Phoenix-Edition/QB64pe.git
synced 2024-09-20 02:04:44 +00:00
Revert stub_audio.cpp per suggestion in #517
This commit is contained in:
parent
d885361f9f
commit
9b25a87ebb
4 changed files with 12 additions and 10 deletions
4
Makefile
4
Makefile
|
@ -311,12 +311,10 @@ ifneq ($(filter y,$(DEP_AUDIO_MINIAUDIO)),)
|
||||||
ifeq ($(OS),osx)
|
ifeq ($(OS),osx)
|
||||||
CXXLIBS += -lpthread -lm -framework CoreAudio -framework CoreMIDI -framework AudioUnit -framework AudioToolbox
|
CXXLIBS += -lpthread -lm -framework CoreAudio -framework CoreMIDI -framework AudioUnit -framework AudioToolbox
|
||||||
endif
|
endif
|
||||||
QBLIB_NAME := $(addsuffix 1,$(QBLIB_NAME))
|
|
||||||
|
|
||||||
LICENSE_IN_USE += miniaudio stb_vorbis libxmp-lite radv2 hivelytracker qoa foo_midi ymfmidi primesynth tinysoundfont
|
LICENSE_IN_USE += miniaudio stb_vorbis libxmp-lite radv2 hivelytracker qoa foo_midi ymfmidi primesynth tinysoundfont
|
||||||
|
|
||||||
else
|
else
|
||||||
QBLIB_NAME := $(addsuffix 0,$(QBLIB_NAME))
|
EXE_LIBS += $(AUDIO_STUB_OBJS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(filter y,$(DEP_ZLIB)),)
|
ifneq ($(filter y,$(DEP_ZLIB)),)
|
||||||
|
|
|
@ -61,12 +61,6 @@ mem_block func__memsound(int32_t handle, int32_t targetChannel, int32_t passed);
|
||||||
int32_t func__sndnew(int32_t frames, int32_t channels, int32_t bits);
|
int32_t func__sndnew(int32_t frames, int32_t channels, int32_t bits);
|
||||||
void sub__midisoundbank(qbs *qbsFileName, qbs *qbsRequirements, int32_t passed);
|
void sub__midisoundbank(qbs *qbsFileName, qbs *qbsRequirements, int32_t passed);
|
||||||
|
|
||||||
#ifdef DEPENDENCY_AUDIO_MINIAUDIO
|
|
||||||
void snd_init();
|
void snd_init();
|
||||||
void snd_un_init();
|
void snd_un_init();
|
||||||
void snd_mainloop();
|
void snd_mainloop();
|
||||||
#else
|
|
||||||
static inline void snd_mainloop() { return; }
|
|
||||||
static inline void snd_init() { return; }
|
|
||||||
static inline void snd_un_init() { return; }
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -5,6 +5,11 @@ MINIAUDIO_SRCS := \
|
||||||
|
|
||||||
MINIAUDIO_OBJS := $(patsubst %.cpp,$(PATH_INTERNAL_C)/parts/audio/%.o,$(MINIAUDIO_SRCS))
|
MINIAUDIO_OBJS := $(patsubst %.cpp,$(PATH_INTERNAL_C)/parts/audio/%.o,$(MINIAUDIO_SRCS))
|
||||||
|
|
||||||
|
AUDIO_STUB_SRCS := \
|
||||||
|
stub_audio.cpp
|
||||||
|
|
||||||
|
AUDIO_STUB_OBJS := $(patsubst %.cpp,$(PATH_INTERNAL_C)/parts/audio/%.o,$(AUDIO_STUB_SRCS))
|
||||||
|
|
||||||
# DEPENDENCY_CONSOLE_ONLY is added here to keep these .cpp files from including
|
# DEPENDENCY_CONSOLE_ONLY is added here to keep these .cpp files from including
|
||||||
# the FreeGLUT headers via `libqb.h`. Ideally this is fixed properly in the future.
|
# the FreeGLUT headers via `libqb.h`. Ideally this is fixed properly in the future.
|
||||||
$(PATH_INTERNAL_C)/parts/audio/%.o: $(PATH_INTERNAL_C)/parts/audio/%.cpp
|
$(PATH_INTERNAL_C)/parts/audio/%.o: $(PATH_INTERNAL_C)/parts/audio/%.cpp
|
||||||
|
@ -15,5 +20,5 @@ AUDIO_LIB := $(PATH_INTERNAL_C)/parts/audio/audio.a
|
||||||
$(AUDIO_LIB): $(MINIAUDIO_OBJS) $(FOO_MIDI_OBJS) $(HIVELYTRACKER_OBJS) $(LIBMIDI_OBJS) $(LIBXMP_OBJS) $(PRIMESYNTH_OBJS) $(OPAL_OBJS) $(TINYSOUNDFONT_OBJS) $(YMFMIDI_OBJS) $(MA_VTABLES_OBJS)
|
$(AUDIO_LIB): $(MINIAUDIO_OBJS) $(FOO_MIDI_OBJS) $(HIVELYTRACKER_OBJS) $(LIBMIDI_OBJS) $(LIBXMP_OBJS) $(PRIMESYNTH_OBJS) $(OPAL_OBJS) $(TINYSOUNDFONT_OBJS) $(YMFMIDI_OBJS) $(MA_VTABLES_OBJS)
|
||||||
$(AR) rcs $@ $(MINIAUDIO_OBJS) $(FOO_MIDI_OBJS) $(HIVELYTRACKER_OBJS) $(LIBMIDI_OBJS) $(LIBXMP_OBJS) $(PRIMESYNTH_OBJS) $(OPAL_OBJS) $(TINYSOUNDFONT_OBJS) $(YMFMIDI_OBJS) $(MA_VTABLES_OBJS)
|
$(AR) rcs $@ $(MINIAUDIO_OBJS) $(FOO_MIDI_OBJS) $(HIVELYTRACKER_OBJS) $(LIBMIDI_OBJS) $(LIBXMP_OBJS) $(PRIMESYNTH_OBJS) $(OPAL_OBJS) $(TINYSOUNDFONT_OBJS) $(YMFMIDI_OBJS) $(MA_VTABLES_OBJS)
|
||||||
|
|
||||||
CLEAN_LIST += $(MINIAUDIO_OBJS) $(AUDIO_LIB)
|
CLEAN_LIST += $(MINIAUDIO_OBJS) $(AUDIO_LIB) $(AUDIO_STUB_OBJS)
|
||||||
|
|
||||||
|
|
5
internal/c/parts/audio/stub_audio.cpp
Normal file
5
internal/c/parts/audio/stub_audio.cpp
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
#include "audio.h"
|
||||||
|
|
||||||
|
void snd_mainloop() { return; }
|
||||||
|
void snd_init() { return; }
|
||||||
|
void snd_un_init() { return; }
|
Loading…
Reference in a new issue