summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--makefile37
-rw-r--r--src/lib/libjpeg/jpeglib.h9
-rw-r--r--src/lib/util/flac.h5
3 files changed, 45 insertions, 6 deletions
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
diff --git a/src/lib/libjpeg/jpeglib.h b/src/lib/libjpeg/jpeglib.h
index 9f57e8d596c..ea9ac43796f 100644
--- a/src/lib/libjpeg/jpeglib.h
+++ b/src/lib/libjpeg/jpeglib.h
@@ -11,6 +11,13 @@
* and perhaps jerror.h if they want to know the exact error codes.
*/
+#ifdef USE_SYSTEM_JPEGLIB
+#ifndef XMD_H
+#define XMD_H
+#endif
+#include <jpeglib.h>
+#else
+
#ifndef JPEGLIB_H
#define JPEGLIB_H
@@ -1156,5 +1163,5 @@ struct jpeg_color_quantizer { long dummy; };
}
#endif
#endif
-
#endif /* JPEGLIB_H */
+#endif /* USE_SYSTEM_JPEGLIB */
diff --git a/src/lib/util/flac.h b/src/lib/util/flac.h
index 911b7269424..f379d52521f 100644
--- a/src/lib/util/flac.h
+++ b/src/lib/util/flac.h
@@ -44,7 +44,12 @@
#include "osdcore.h"
#include "corefile.h"
+
+#ifdef FLAC__NO_DLL
#include "../../lib/libflac/include/flac/all.h"
+#else
+#include <FLAC/all.h>
+#endif
//**************************************************************************