From b0d0a3b3a34cbbc0da421faecf3fca39622bb7ac Mon Sep 17 00:00:00 2001
From: PoroCYon <pcy@national.shitposting.agency>
Date: Tue, 18 Sep 2018 16:49:01 +0200
Subject: [PATCH] fix symbol names in bin2o-generated header files sometimes
 being invalid C identifiers

---
 dka64/rules/base_rules      | 6 +++---
 dkarm-eabi/rules/base_rules | 6 +++---
 dkppc/rules/base_rules      | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dka64/rules/base_rules b/dka64/rules/base_rules
index 1b8a273..15894db 100644
--- a/dka64/rules/base_rules
+++ b/dka64/rules/base_rules
@@ -33,8 +33,8 @@ include $(DEVKITPRO)/devkitA64/base_tools
 #---------------------------------------------------------------------------------
 define bin2o
 	bin2s $< | $(AS) -o $(@)
-	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(<F) | tr . _)`.h
-	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(<F) | tr . _)`.h
-	echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(<F) | tr . _)`.h
+	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`"_end[];" > `(echo $(<F) | tr . _)`.h
+	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`"[];" >> `(echo $(<F) | tr . _)`.h
+	echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`_size";" >> `(echo $(<F) | tr . _)`.h
 endef
 
diff --git a/dkarm-eabi/rules/base_rules b/dkarm-eabi/rules/base_rules
index 1cd4953..d8dbdb3 100644
--- a/dkarm-eabi/rules/base_rules
+++ b/dkarm-eabi/rules/base_rules
@@ -104,8 +104,8 @@ export PORTLIBS_PATH	:=	$(DEVKITPRO)/portlibs
 #---------------------------------------------------------------------------------
 define bin2o
 	bin2s $< | $(AS) -o $(@)
-	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(<F) | tr . _)`.h
-	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(<F) | tr . _)`.h
-	echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(<F) | tr . _)`.h
+	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`"_end[];" > `(echo $(<F) | tr . _)`.h
+	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`"[];" >> `(echo $(<F) | tr . _)`.h
+	echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`_size";" >> `(echo $(<F) | tr . _)`.h
 endef
 
diff --git a/dkppc/rules/base_rules b/dkppc/rules/base_rules
index bbbf2bf..ed7aa13 100644
--- a/dkppc/rules/base_rules
+++ b/dkppc/rules/base_rules
@@ -37,9 +37,9 @@ include $(DEVKITPPC)/base_tools
 #---------------------------------------------------------------------------------
 define bin2o
 	bin2s -a 32 $< | $(AS) -o $(@)
-	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(<F) | tr . _)`.h
-	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(<F) | tr . _)`.h
-	echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(<F) | tr . _)`.h
+	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`"_end[];" > `(echo $(<F) | tr . _)`.h
+	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`"[];" >> `(echo $(<F) | tr . _)`.h
+	echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`_size";" >> `(echo $(<F) | tr . _)`.h
 endef