From 7d5617254ad8adbef261b23a3a320563b5e0edd1 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Sat, 3 Mar 2018 17:33:14 +0000 Subject: [PATCH] fix building on OSX requires latest bin2s from https://github.com/devkitPro/general-tools --- Makefile.pc | 9 ++++++++- common/common.h | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile.pc b/Makefile.pc index c148eb8..43c50df 100644 --- a/Makefile.pc +++ b/Makefile.pc @@ -1,7 +1,14 @@ +HOST_OS := $(shell uname -s) + +ifeq ($(strip $(HOST_OS)),Darwin) +BIN2S_FLAGS := --apple-llvm +endif + + # canned command sequence for binary data #--------------------------------------------------------------------------------- define bin2o - bin2s $< | $(AS) -o $(@) + bin2s $(BIN2S_FLAGS) $< | $(AS) -o $(@) echo "extern const u8" `(echo $( `(echo $(> `(echo $(> `(echo $( #include #include +#ifndef __APPLE__ #include +#endif #include #ifdef SWITCH #include