aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeddy Wing2018-10-29 18:43:12 +0100
committerTeddy Wing2018-10-29 18:43:12 +0100
commit12c83c5f8a12f621a6dc4d49cb14c4a919685e62 (patch)
treed97f236b45097cc7833607b2c71213bd4a4ea0e1
parentbdc68a7f797cf9a33175cc1510215d609af2afad (diff)
downloadDomeKey-12c83c5f8a12f621a6dc4d49cb14c4a919685e62.tar.bz2
Rename `sounds.h` to `sound_data.h`
I want to make a Cocoa class called `Sounds`, but `Sounds.h` would conflict with this file.
-rw-r--r--DomeKey/sound_data.h (renamed from DomeKey/sounds.h)6
-rw-r--r--Makefile8
2 files changed, 7 insertions, 7 deletions
diff --git a/DomeKey/sounds.h b/DomeKey/sound_data.h
index 230e006..1d86870 100644
--- a/DomeKey/sounds.h
+++ b/DomeKey/sound_data.h
@@ -1,5 +1,5 @@
-#ifndef SOUNDS_H
-#define SOUNDS_H
+#ifndef SOUND_DATA_H
+#define SOUND_DATA_H
unsigned char sounds_mode_activated_mp3[] = {
0xff, 0xfb, 0x90, 0x64, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x69, 0x00, 0x00,
@@ -5442,4 +5442,4 @@ unsigned char sounds_mode_deactivated_mp3[] = {
};
unsigned int sounds_mode_deactivated_mp3_len = 32600;
-#endif /* SOUNDS_H */
+#endif /* SOUND_DATA_H */
diff --git a/Makefile b/Makefile
index 0955ce3..4f4868e 100644
--- a/Makefile
+++ b/Makefile
@@ -29,11 +29,11 @@ clean:
run: build
$(DEBUG_PRODUCT) --daemon
-DomeKey/sounds.h: sounds/*.mp3
+DomeKey/sound_data.h: sounds/*.mp3
: > $@
- echo '#ifndef SOUNDS_H' >> $@
- echo '#define SOUNDS_H' >> $@
+ echo '#ifndef SOUND_DATA_H' >> $@
+ echo '#define SOUND_DATA_H' >> $@
echo >> $@
$(foreach f,$^,xxd -include $(f) >> $@;)
echo >> $@
- echo '#endif /* SOUNDS_H */' >> $@
+ echo '#endif /* SOUND_DATA_H */' >> $@