Fix macOS build
This commit is contained in:
parent
36c6aadcd0
commit
289d8a80f2
2 changed files with 19 additions and 10 deletions
18
deps/Makefile
vendored
18
deps/Makefile
vendored
|
@ -16,20 +16,24 @@ include ../dpf/Makefile.base.mk
|
||||||
# --------------------------------------------------------------
|
# --------------------------------------------------------------
|
||||||
# override VCV arch.mk stuff so we can build more architectures
|
# override VCV arch.mk stuff so we can build more architectures
|
||||||
|
|
||||||
ifeq ($(CPU_ARM),true)
|
ifeq ($(CPU_AARCH64),true)
|
||||||
ARCH_NAME = arm
|
ARCH_NAME = aarch64
|
||||||
MACHINE = i686-bring-forth-the-rack
|
MACHINE = x86_64-bring-forth-the-rack
|
||||||
else ifeq ($(CPU_ARM64),true)
|
else ifeq ($(CPU_ARM64),true)
|
||||||
ARCH_NAME = arm64
|
ARCH_NAME = arm64
|
||||||
MACHINE = x86_64-bring-forth-the-rack
|
MACHINE = x86_64-bring-forth-the-rack
|
||||||
else ifeq ($(CPU_AARCH64),true)
|
else ifeq ($(CPU_ARM),true)
|
||||||
ARCH_NAME = aarch64
|
ARCH_NAME = arm
|
||||||
MACHINE = x86_64-bring-forth-the-rack
|
MACHINE = i686-bring-forth-the-rack
|
||||||
else
|
else
|
||||||
MACHINE = $(TARGET_MACHINE)
|
MACHINE = $(TARGET_MACHINE)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(MACOS_OR_WINDOWS),true)
|
ifeq ($(MACOS),true)
|
||||||
|
MACHINE_SUFFIX = -darwin
|
||||||
|
else ifeq ($(WINDOWS),true)
|
||||||
|
MACHINE_SUFFIX = -mingw32
|
||||||
|
else
|
||||||
MACHINE_SUFFIX = -linux
|
MACHINE_SUFFIX = -linux
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -290,10 +290,15 @@ $(TARGET): $(PLUGIN_OBJS)
|
||||||
$(SILENT)rm -f $@
|
$(SILENT)rm -f $@
|
||||||
$(SILENT)$(AR) crs $@ $^
|
$(SILENT)$(AR) crs $@ $^
|
||||||
|
|
||||||
$(BUILD_DIR)/%.bin.o: % res2c.py
|
$(BUILD_DIR)/%.bin.c: % res2c.py
|
||||||
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
|
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
|
||||||
@echo "Generating and Compiling $<"
|
@echo "Generating $*.bin.c"
|
||||||
$(shell python3 ./res2c.py $< | $(CC) -x c - $(BUILD_C_FLAGS) -c -o $@)
|
$(SILENT)python3 ./res2c.py $< > $@
|
||||||
|
|
||||||
|
$(BUILD_DIR)/%.bin.o: $(BUILD_DIR)/%.bin.c
|
||||||
|
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
|
||||||
|
@echo "Compiling $*.bin"
|
||||||
|
$(SILENT)$(CC) $< $(BUILD_C_FLAGS) -c -o $@
|
||||||
|
|
||||||
$(BUILD_DIR)/plugins.cpp.o: plugins.cpp
|
$(BUILD_DIR)/plugins.cpp.o: plugins.cpp
|
||||||
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
|
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue