From dd5b0a6fbb72768731e1e48c41dbc1a5efb87b87 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Mon, 18 Jun 2018 03:41:02 -0400 Subject: [PATCH] Fix Mac embedded resources --- compile.mk | 2 +- include/util/common.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compile.mk b/compile.mk index 8cd8886f..ebb705ef 100644 --- a/compile.mk +++ b/compile.mk @@ -82,5 +82,5 @@ ifdef ARCH_WIN endif ifdef ARCH_MAC # Apple makes this needlessly complicated, so just generate a C file with an array. - xxd -i $< | $(CC) -c -o $@ -xc - + xxd -i $< | $(CC) $(MAC_SDK_FLAGS) -c -o $@ -xc - endif diff --git a/include/util/common.hpp b/include/util/common.hpp index 49ee2967..b734a01c 100644 --- a/include/util/common.hpp +++ b/include/util/common.hpp @@ -71,7 +71,7 @@ to get its size in bytes. // Use output from `xxd -i` #define BINARY(sym) extern unsigned char sym[]; extern unsigned int sym##len #define BINARY_START(sym) ((void*) sym) - #define BINARY_END(sym) ((void*) sym + sym##len) + #define BINARY_END(sym) ((void*) sym + sym##_len) #define BINARY_SIZE(sym) (sym##len) #else #define BINARY(sym) extern char _binary_##sym##_start, _binary_##sym##_end, _binary_##sym##_size