summaryrefslogtreecommitdiffstatshomepage
path: root/makefile
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2012-01-22 18:38:22 +0000
committer R. Belmont <rb6502@users.noreply.github.com>2012-01-22 18:38:22 +0000
commit8703f92910d418a2d7fb053e587b7551d20168ec (patch)
tree36f57be7940b7b0ba5e861d090b81adfd7829651 /makefile
parent91ac2846be8b8370b6b873ad3be6462415e9dc24 (diff)
Added FLAC (lossless audio) codec support plus experimental hooks in samples and chdman. Bumped up CHD-CD hunk size to get better compression ratios on both zlib and flac. [David Haywood, R. Belmont]
Diffstat (limited to 'makefile')
-rw-r--r--makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/makefile b/makefile
index ecda0106f50..e68136992ff 100644
--- a/makefile
+++ b/makefile
@@ -632,7 +632,9 @@ default: maketree buildtools emulator
all: default tools
+FLAC_LIB = $(OBJ)/libflac.a $(OBJ)/libflac++.a
+FLAC_LIB = $(OBJ)/libflac.a $(OBJ)/libflac++.a
#-------------------------------------------------
# defines needed by multiple make files
@@ -725,7 +727,7 @@ ifndef EXECUTABLE_DEFINED
# always recompile the version string
$(VERSIONOBJ): $(DRVLIBS) $(LIBOSD) $(LIBCPU) $(LIBEMU) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(ZLIB) $(SOFTFLOAT) $(FORMATS_LIB) $(LIBOCORE) $(RESFILE)
-$(EMULATOR): $(VERSIONOBJ) $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DEVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBCPU) $(LIBEMU) $(LIBDASM) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(SOFTFLOAT) $(JPEG_LIB) $(FORMATS_LIB) $(ZLIB) $(LIBOCORE) $(RESFILE)
+$(EMULATOR): $(VERSIONOBJ) $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DEVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBCPU) $(LIBEMU) $(LIBDASM) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(SOFTFLOAT) $(JPEG_LIB) $(FLAC_LIB) $(FORMATS_LIB) $(ZLIB) $(LIBOCORE) $(RESFILE)
@echo Linking $@...
$(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $^ $(LIBS) -o $@
ifeq ($(TARGETOS),win32)