diff options
author | R. Belmont <rb6502@users.noreply.github.com> | 2012-01-16 17:06:42 +0000 |
---|---|---|
committer | R. Belmont <rb6502@users.noreply.github.com> | 2012-01-16 17:06:42 +0000 |
commit | f6b2c736c49559120fc45f72ccaac12502b0eb0f (patch) | |
tree | f66cbeb7b67460a593c0f32dcb6c4dd992799e7e /makefile | |
parent | e981a9771ed60592dacc16e84bd0f049ce9928f3 (diff) |
Add libjpeg; converted Sliver to decompress pictures on the fly [David Haywood, R. Belmont]
Diffstat (limited to 'makefile')
-rw-r--r-- | makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -621,7 +621,7 @@ 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 @@ -725,7 +725,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) $(FORMATS_LIB) $(ZLIB) $(LIBOCORE) $(RESFILE) +$(EMULATOR): $(VERSIONOBJ) $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DEVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBCPU) $(LIBEMU) $(LIBDASM) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(SOFTFLOAT) $(JPEG_LIB) $(FORMATS_LIB) $(ZLIB) $(LIBOCORE) $(RESFILE) @echo Linking $@... $(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $^ $(LIBS) -o $@ ifeq ($(TARGETOS),win32) |