tsiry-sandratraina.com / rockbox-zig
A modern Music Player Daemon based on Rockbox open source high quality audio player
libadwaita audio rust zig deno mpris rockbox mpd
fork atom

rbutil: Fix native Windows build for tools.

- When make on Windows finds sh.exe it will try to use that. We use
cmd.exe calls when detecting Windows, so make sure we use cmd.exe as
shell.
- Add missing Windows compatibility to tomcrypt Makefile.

Change-Id: Iaef133ca27472a5ddf449174d540983f15c66aea

Dominik Riebeling 1801dcc9 884d8922

+14 -2
unified split
+1
rbutil/libtools.make
··· 22 22 # Get directory this Makefile is in for relative paths. 23 23 TOP := $(dir $(lastword $(MAKEFILE_LIST))) 24 24 ifeq ($(OS),Windows_NT) 25 + SHELL = cmd.exe 25 26 mkdir = if not exist $(subst /,\,$(1)) mkdir $(subst /,\,$(1)) 26 27 rm = if exist $(subst /,\,$(1)) del /q /s $(subst /,\,$(1)) 27 28 else
+1
tools/rbspeex/Makefile
··· 12 12 endif 13 13 14 14 ifeq ($(OS),Windows_NT) 15 + SHELL = cmd.exe 15 16 mkdir = if not exist $(subst /,\,$(1)) mkdir $(subst /,\,$(1)) 16 17 rm = if exist $(subst /,\,$(1)) del /q /s $(subst /,\,$(1)) 17 18 else
+1
tools/ucl/src/Makefile
··· 13 13 endif 14 14 15 15 ifeq ($(OS),Windows_NT) 16 + SHELL = cmd.exe 16 17 mkdir = if not exist $(subst /,\,$(1)) mkdir $(subst /,\,$(1)) 17 18 else 18 19 mkdir = mkdir -p $(1)
+11 -2
utils/tomcrypt/Makefile
··· 13 13 SILENT := @ 14 14 endif 15 15 16 + ifeq ($(OS),Windows_NT) 17 + SHELL = cmd.exe 18 + mkdir = if not exist $(subst /,\,$(1)) mkdir $(subst /,\,$(1)) 19 + rm = if exist $(subst /,\,$(1)) del /q /s $(subst /,\,$(1)) 20 + else 21 + mkdir = mkdir -p $(1) 22 + rm = rm -rf $(1) 23 + endif 24 + 16 25 CFLAGS := -O3 -g -std=c99 -Wall $(DEFINES) -Isrc/headers 17 26 LDFLAGS := 18 27 ··· 38 47 39 48 $(BUILD_DIR)/%.o: %.c 40 49 $(info CC $(notdir $@)) 41 - $(SILENT)mkdir -p $(dir $@) 50 + $(SILENT)$(call mkdir, $(dir $@)) 42 51 $(SILENT)$(CROSS)$(CC) $(CFLAGS) -c -o $@ $< 43 52 44 53 clean: 45 - rm -fr $(BUILDDIR) $(LIB) 54 + $(call rm,$(BUILDDIR) $(LIB))