From 4399ccb649b83ce7e29e7b72629993c22141102b Mon Sep 17 00:00:00 2001 From: Bryan Roe Date: Tue, 24 Sep 2019 10:50:28 -0700 Subject: [PATCH] Updated makefile, to add NOTURBOJPEG flag --- makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/makefile b/makefile index 2f6ef87..4a346c1 100644 --- a/makefile +++ b/makefile @@ -309,12 +309,16 @@ CFLAGS += -D_LINKVM endif MACOSFLAGS = ./lib-jpeg-turbo/macos/$(ARCHNAME)/$(JPEGVER)/libturbojpeg.a else - ifeq ($(LEGACY_LD),1) - LINUXFLAGS = lib-jpeg-turbo/linux/$(ARCHNAME)/libturbojpeg.a + ifeq ($(NOTURBOJPEG),1) + LINUXFLAGS = -ljpeg 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 - MACOSFLAGS = ./lib-jpeg-turbo/macos/$(ARCHNAME)/libturbojpeg.a endif BSDFLAGS = /usr/local/lib/libjpeg.a endif