From 1d83dbe9b698c71d3d09f4efaacafb2a11cb8a11 Mon Sep 17 00:00:00 2001 From: dinkc64 Date: Wed, 1 Nov 2023 17:52:01 -0400 Subject: [PATCH] update linux makefiles --- makefile.pi | 6 ++---- makefile.sdl | 5 ++--- makefile.sdl2 | 7 ++----- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/makefile.pi b/makefile.pi index 7dd1e7c5c..cc949e75c 100644 --- a/makefile.pi +++ b/makefile.pi @@ -43,7 +43,7 @@ srcdir = src/ include makefile.burn_rules # Platform-specific -alldir += burner burner/pi burner/sdl dep/libs/libpng dep/libs/lib7z \ +alldir += burner burner/pi burner/sdl dep/libs/libspng dep/libs/lib7z \ dep/libs/zlib intf intf/video intf/video/scalers intf/video/pi \ intf/audio intf/audio/sdl intf/input intf/input/pi intf/cd \ intf/cd/sdl intf/perfcount intf/perfcount/pi dep/generated \ @@ -58,9 +58,7 @@ depobj += neocdlist.o \ gzread.o gzwrite.o infback.o inffast.o inflate.o inftrees.o \ trees.o uncompr.o zutil.o \ \ - png.o pngerror.o pngget.o pngmem.o pngpread.o pngread.o \ - pngrio.o pngrtran.o pngrutil.o pngset.o pngtrans.o pngwio.o \ - pngwrite.o pngwtran.o pngwutil.o \ + spng.o \ \ aud_dsp.o aud_interface.o cd_interface.o inp_interface.o \ interface.o lowpass2.o vid_interface.o vid_softfx.o \ diff --git a/makefile.sdl b/makefile.sdl index 02fa9ae0d..8b76e22bd 100644 --- a/makefile.sdl +++ b/makefile.sdl @@ -49,7 +49,7 @@ srcdir = src/ include makefile.burn_rules # Platform stuff -alldir += burner burner/sdl burner/sdl dep/libs/libpng dep/libs/lib7z dep/libs/zlib intf intf/video \ +alldir += burner burner/sdl burner/sdl dep/libs/libspng dep/libs/lib7z dep/libs/zlib intf intf/video \ intf/video/scalers intf/video/sdl intf/audio intf/audio/sdl intf/input intf/input/sdl intf/cd intf/cd/sdl \ intf/perfcount intf/perfcount/sdl dep/generated @@ -60,8 +60,7 @@ depobj += neocdlist.o \ adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o gzwrite.o infback.o inffast.o inflate.o inftrees.o \ trees.o uncompr.o zutil.o \ \ - png.o pngerror.o pngget.o pngmem.o pngpread.o pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o pngtrans.o pngwio.o \ - pngwrite.o pngwtran.o pngwutil.o \ + spng.o \ \ aud_dsp.o aud_interface.o cd_interface.o inp_interface.o interface.o lowpass2.o vid_interface.o \ vid_softfx.o vid_support.o \ diff --git a/makefile.sdl2 b/makefile.sdl2 index e27551a6b..1ecace0d2 100644 --- a/makefile.sdl2 +++ b/makefile.sdl2 @@ -69,12 +69,9 @@ depobj += neocdlist.o \ inpdipsw.o vid_sdl2opengl.o vid_sdl2.o inputbuf.o replay.o sdl2_gui.o sdl2_inprint.o input_sdl2.o stated.o ifndef FORCE_SYSTEM_LIBPNG -alldir += dep/libs/libpng +alldir += dep/libs/libspng -depobj += png.o \ - \ - pngerror.o pngget.o pngmem.o pngpread.o pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o pngtrans.o pngwio.o \ - pngwrite.o pngwtran.o pngwutil.o +depobj += spng.o \ endif ifdef FORCE_PULSE_AUDIO