From c49b4b9164cb0bfb08e113c272c669953129c5d7 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 17 Oct 2021 14:15:42 +0100 Subject: [PATCH] Fix linux and windows builds Signed-off-by: falkTX --- plugins/Makefile | 5 ++--- plugins/res2c.py | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/Makefile b/plugins/Makefile index 964bb9b..609fa5c 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -5,7 +5,6 @@ # DEP_PATH = $(abspath ../src/Rack/dep) -OBJCOPY ?= objcopy # -------------------------------------------------------------- # Import base definitions @@ -196,8 +195,8 @@ BASE_FLAGS += -pthread ifeq ($(WINDOWS),true) BASE_FLAGS += -D_USE_MATH_DEFINES -BASE_FLAGS += -Imingw-compat -BASE_FLAGS += -Imingw-std-threads +BASE_FLAGS += -I../src/mingw-compat +BASE_FLAGS += -I../src/mingw-std-threads BASE_FLAGS += -municode endif diff --git a/plugins/res2c.py b/plugins/res2c.py index 7f4f7c8..52428b5 100755 --- a/plugins/res2c.py +++ b/plugins/res2c.py @@ -32,6 +32,10 @@ def res2c(filename): print("const unsigned int %s_len = %d;\n" % (resname, fhandle.tell())) + if sys.platform != "darwin": + print("const unsigned char* _binary_%s_start = %s;\n" % (resname, resname)) + print("const unsigned char* _binary_%s_end = %s + %d;\n" % (resname, resname, fhandle.tell())) + # ----------------------------------------------------- if __name__ == '__main__':