Skip to content

Shared.mk and make.sh are fixed work on MacOS #112

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
ReyeMe merged 1 commit into from
Mar 12, 2026
Merged

Shared.mk and make.sh are fixed work on MacOS #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions saturnringlib/shared.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ convert_audio_to_raw() { \
else \
sox "$$audiofile" -t raw -r 44100 -e signed-integer -b 16 -c 2 "$$rawfile"; \
fi; \
size=$$(stat -c%s "$$rawfile"); \
size=$$(stat -f%z "$$rawfile" 2>/dev/null || stat -c%s "$$rawfile"); \
target_sectors=$$((size / 2352)); \
if [ $$((size % 2352)) -ne 0 ]; then \
target_sectors=$$((target_sectors + 1)); \
Expand All @@ -359,8 +359,8 @@ endef
add_audio_to_bin_cue: create_bin_cue
@$(CONVERT_AUDIO_TO_RAW); \
track=2; \
total_size=$$(stat -c%s "$(BUILD_BIN)"); \
sectors=$$((total_size / 2352)); \
total_size=$$(stat -f%z "$(BUILD_BIN)" 2>/dev/null || stat -c%s "$(BUILD_BIN)"); \
sectors=$$((total_size / 2352)); \
echo "Starting with $$total_size bytes ($$sectors sectors)"; \
# Find audio files and convert them to raw \
if [ -f "$(MUSIC_DIR)/tracklist" ]; then \
Expand Down Expand Up @@ -429,7 +429,7 @@ add_audio_to_bin_cue: create_bin_cue
exit 1; \
fi; \
echo ' INDEX 01' $$msf >> "$(BUILD_CUE)"; \
size=$$(stat -c%s "$$i"); \
size=$$(stat -f%z "$$i" 2>/dev/null || stat -c%s "$$i"); \
if [ $$((size % 2352)) -ne 0 ]; then \
echo " ERROR: File $$i is not sector-aligned ($$size bytes)"; \
echo " File size must be a multiple of 2352 bytes"; \
Expand Down
10 changes: 9 additions & 1 deletion tools/scripts/make.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,15 @@ else
export COMPILER_DIR=../../Compiler;
fi

export PATH=${COMPILER_DIR}/linux/sh2eb-elf/bin:${PATH};
host_platform="$(uname -s)"
if [ "$host_platform" = "Darwin" ]; then
export PATH=${COMPILER_DIR}/mac/sh2eb-elf/bin:${PATH};
elif [ "$host_platform" = "Linux" ]; then
export PATH=${COMPILER_DIR}/linux/sh2eb-elf/bin:${PATH};
else
echo "Unsupported host platform: $host_platform"
exit 1
fi

if [[ $# -eq 0 ]]; then
printf "\033[91mNo target specified! Defaulting to debug...\033[0m\r\n"
Expand Down
Loading