From 647311cde14cdfd10c9b87c0b7d91e084e905697 Mon Sep 17 00:00:00 2001 From: "R. Belmont" Date: Thu, 29 Mar 2012 21:56:18 +0000 Subject: Allow compilation with compatible system-installed versions of libjpeg and libflac [wallyweek, R. Belmont] --- makefile | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) (limited to 'makefile') diff --git a/makefile b/makefile index 07f802b3e4a..eb6e573258b 100644 --- a/makefile +++ b/makefile @@ -211,6 +211,12 @@ BUILD_EXPAT = 1 # uncomment next line to build zlib as part of MAME build BUILD_ZLIB = 1 +# uncomment next line to build libflac as part of MAME build +BUILD_FLAC = 1 + +# uncomment next line to build jpeglib as part of MAME build +BUILD_JPEGLIB = 1 + # uncomment next line to include the symbols # SYMBOLS = 1 @@ -411,7 +417,14 @@ DEFS += -DUSE_NETWORK endif # need to ensure FLAC functions are statically linked +ifeq ($(BUILD_FLAC),1) DEFS += -DFLAC__NO_DLL +endif + +# define USE_SYSTEM_JPEGLIB if library shipped with MAME is not used +ifneq ($(BUILD_JPEGLIB),1) +DEFS += -DUSE_SYSTEM_JPEGLIB +endif @@ -620,14 +633,31 @@ LIBS += -lz ZLIB = endif +# add flac library +ifeq ($(BUILD_FLAC),1) +INCPATH += -I$(SRC)/lib/util +FLAC_LIB = $(OBJ)/libflac.a +# $(OBJ)/libflac++.a +else +LIBS += -lFLAC +FLAC_LIB = +endif + +# add jpeglib image library +ifeq ($(BUILD_JPEGLIB),1) +INCPATH += -I$(SRC)/lib/libjpeg +JPEG_LIB = $(OBJ)/libjpeg.a +else +LIBS += -ljpeg +JPEG_LIB = +endif + # add SoftFloat floating point emulation library SOFTFLOAT = $(OBJ)/libsoftfloat.a # add formats emulation library FORMATS_LIB = $(OBJ)/libformats.a -JPEG_LIB = $(OBJ)/libjpeg.a - #------------------------------------------------- # 'default' target needs to go here, before the # include files which define additional targets @@ -637,9 +667,6 @@ default: maketree buildtools emulator all: default tools -FLAC_LIB = $(OBJ)/libflac.a -# $(OBJ)/libflac++.a - 7Z_LIB = $(OBJ)/lib7z.a -- cgit v1.2.3