From c65ae059d040ed9f61b2f48fb99e30f44c75914c Mon Sep 17 00:00:00 2001 From: Bryan Roe Date: Tue, 20 Aug 2019 11:29:36 -0700 Subject: [PATCH] Added additional build flags: FSWATCH_DISABLE LEGACY_LD to allow building on CentOS 5.11 --- makefile | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index e520a67..fda6a32 100644 --- a/makefile +++ b/makefile @@ -302,10 +302,18 @@ LINUXKVMSOURCES = meshcore/KVM/Linux/linux_kvm.c meshcore/KVM/Linux/linux_events MACOSKVMSOURCES = meshcore/KVM/MacOS/mac_kvm.c meshcore/KVM/MacOS/mac_events.c meshcore/KVM/MacOS/mac_tile.c meshcore/KVM/Linux/linux_compression.c CFLAGS += -D_LINKVM ifneq ($(JPEGVER),) - LINUXFLAGS = -l:lib-jpeg-turbo/linux/$(ARCHNAME)/$(JPEGVER)/libturbojpeg.a + ifeq ($(LEGACY_LD),1) + LINUXFLAGS = lib-jpeg-turbo/linux/$(ARCHNAME)/$(JPEGVER)/libturbojpeg.a + else + LINUXFLAGS = -l:lib-jpeg-turbo/linux/$(ARCHNAME)/$(JPEGVER)/libturbojpeg.a + endif MACOSFLAGS = ./lib-jpeg-turbo/macos/$(ARCHNAME)/$(JPEGVER)/libturbojpeg.a else - LINUXFLAGS = -l:lib-jpeg-turbo/linux/$(ARCHNAME)/libturbojpeg.a + ifeq ($(LEGACY_LD),1) + LINUXFLAGS = lib-jpeg-turbo/linux/$(ARCHNAME)/libturbojpeg.a + else + LINUXFLAGS = -l:lib-jpeg-turbo/linux/$(ARCHNAME)/libturbojpeg.a + endif MACOSFLAGS = ./lib-jpeg-turbo/macos/$(ARCHNAME)/libturbojpeg.a endif BSDFLAGS = /usr/local/lib/libjpeg.a @@ -359,6 +367,10 @@ ifeq ($(IFADDR_DISABLE),1) CFLAGS += -DNO_IFADDR endif +ifeq ($(FSWATCH_DISABLE),1) +CFLAGS += -D_NOFSWATCHER +endif + GCCTEST := $(shell $(CC) meshcore/dummy.c -o /dev/null -no-pie > /dev/null 2>&1 ; echo $$? ) ifeq ($(GCCTEST),0) LDFLAGS += -no-pie