Skip to content

Commit 512b895

Browse files
committed
Consolidate melody assets under web
This drops the duplicated top-level assets directory and point melody generation to 'web/assets/melodies'. It makes wasm asset prep a no-op directory ensure step and update list-melodies to read from the web location so all paths are consistent.
1 parent 300e736 commit 512b895

File tree

8 files changed

+4
-283
lines changed

8 files changed

+4
-283
lines changed

Makefile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ TEST_TARGET = test_runner
1919
# Melody selection: set MELODY to change the song
2020
# Available: happy_birthday, twinkle (default: happy_birthday)
2121
MELODY ?= happy_birthday
22-
MELODY_SRC = assets/melodies/$(MELODY).txt
22+
MELODY_SRC = web/assets/melodies/$(MELODY).txt
2323
MELODY_HDR = melody.h
2424

2525
# Melody converter tool
@@ -83,10 +83,8 @@ $(WASM_OUT): $(WASM_SRCS) $(HDRS)
8383

8484
# Copy melody files to web directory for deployment
8585
copy-melodies:
86-
@rm -rf $(WASM_DIR)/assets
87-
@mkdir -p $(WASM_DIR)/assets
88-
@cp -r assets/melodies $(WASM_DIR)/assets/
89-
@echo "Copied melody files to $(WASM_DIR)/assets/melodies/"
86+
@mkdir -p $(WASM_DIR)/assets/melodies
87+
@echo "Melody files reside in $(WASM_DIR)/assets/melodies/"
9088

9189
wasm-clean:
9290
$(RM) $(WASM_DIR)/picosynth.js $(WASM_DIR)/picosynth.wasm
@@ -104,7 +102,7 @@ serve: wasm
104102
# List available melodies
105103
list-melodies:
106104
@echo "Available melodies:"
107-
@ls -1 assets/melodies/*.txt 2>/dev/null | sed 's|assets/melodies/||;s|\.txt||' | while read m; do echo " $$m"; done
105+
@ls -1 web/assets/melodies/*.txt 2>/dev/null | sed 's|web/assets/melodies/||;s|\.txt||' | while read m; do echo " $$m"; done
108106
@echo ""
109107
@echo "Usage: make MELODY=<name>"
110108
@echo "Example: make MELODY=twinkle"

assets/melodies/frere_jacques.txt

Lines changed: 0 additions & 50 deletions
This file was deleted.

assets/melodies/happy_birthday.txt

Lines changed: 0 additions & 40 deletions
This file was deleted.

assets/melodies/jingle_bells.txt

Lines changed: 0 additions & 30 deletions
This file was deleted.

assets/melodies/london_bridge.txt

Lines changed: 0 additions & 36 deletions
This file was deleted.

assets/melodies/mary_lamb.txt

Lines changed: 0 additions & 31 deletions
This file was deleted.

assets/melodies/ode_to_joy.txt

Lines changed: 0 additions & 34 deletions
This file was deleted.

assets/melodies/twinkle.txt

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)