Skip to content

AudioWorklet driver, misc. emscripten fixes #17750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 10, 2025
Merged

AudioWorklet driver, misc. emscripten fixes #17750

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05cefc9
AudioWorklet driver, misc. emscripten fixes
BinBashBanana Mar 29, 2025
393e1b4
Fixes for #17750
BinBashBanana Mar 30, 2025
4d95024
Makefile compatibility fixes
BinBashBanana Apr 1, 2025
f5a056b
Fix safari file uploads
BinBashBanana Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions Makefile.emscripten
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, I like these improvements to my sketch for cross platform sed. I’ll review the code changes once I do some testing tomorrow.

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ else
TARGET := $(LIBRETRO)_libretro.js
endif
endif
TARGET_BASE := $(subst .js,,$(TARGET))

OS = Emscripten
OBJ :=
Expand Down Expand Up @@ -293,18 +294,24 @@ RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))

all: $(TARGET)

$(libretro_new) : $(libretro)
mv -f $(libretro) $(libretro_new)
$(libretro_new): ;

mv_libretro:
mv -f $(libretro) $(libretro_new) || true

# until emscripten adds something like WASM_WORKERS=2 but for audio worklets, DIY.
$(TARGET): $(RARCH_OBJ) $(libretro_new)
ifeq ($(HAVE_AUDIOWORKLET), 1)
$(TARGET): $(RARCH_OBJ) $(libretro_new) mv_libretro
@$(if $(Q), $(shell echo echo "LD $@ \<obj\> $(libretro_new) $(LIBS) $(LDFLAGS)"),)
$(Q)$(LD) -o $@ $(RARCH_OBJ) $(libretro_new) $(LIBS) $(LDFLAGS)
$(Q)tr -d '\n' < "$(TARGET_BASE).aw.js" | sed -e "s/[\/&]/\\\\&/g" -e "s/'/\\\\\\\\&/g" > _audioworklet.js
$(Q)sed -i.bak -e "s/\"$(TARGET_BASE)\.aw\.js\"/URL.createObjectURL(new Blob(['$$(cat _audioworklet.js)'],{type:'text\/javascript'}))/" -- "$@"
$(Q)rm -f "$(TARGET_BASE).aw.js" _audioworklet.js "$@".bak
else
$(TARGET): $(RARCH_OBJ) $(libretro_new) mv_libretro
@$(if $(Q), $(shell echo echo "LD $@ \<obj\> $(libretro_new) $(LIBS) $(LDFLAGS)"),)
$(Q)$(LD) -o $@ $(RARCH_OBJ) $(libretro_new) $(LIBS) $(LDFLAGS)
@if [ "$(HAVE_AUDIOWORKLET)" = 1 ]; then\
tr -d '\n' < "$${TARGET%%\.js}.aw.js" | sed -e "s/[\/&]/\\\\&/g" -e "s/'/\\\\\\\\&/g" > _audioworklet.js;\
sed -i "s/\"$${TARGET%%\.js}\.aw\.js\"/URL.createObjectURL(new Blob(['$$(cat _audioworklet.js)'],{type:'text\/javascript'}))/" "$@";\
rm "$${TARGET%%\.js}.aw.js" _audioworklet.js;\
fi
endif

$(OBJDIR)/%.o: %.c
@mkdir -p $(dir $@)
Expand All @@ -320,4 +327,4 @@ clean:
rm -rf $(OBJDIR)
rm -f $(TARGET)

.PHONY: all clean
.PHONY: all clean mv_libretro
Loading