From aeb3a98df2bfd1aea15e9dfc2aa21eea21c79d47 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Sun, 1 Jul 2018 16:30:58 +0100 Subject: [PATCH] [SDL] don't include libchdr The makefiles don't reference any of its sources, leading to build errors. I'd fix this myself, but even when adding the relevant sources, I get errors about multiply-defined types. --- sdl/Makefile.sdl1 | 2 +- sdl/Makefile.sdl2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdl/Makefile.sdl1 b/sdl/Makefile.sdl1 index 51e4d9c..1bc2c25 100644 --- a/sdl/Makefile.sdl1 +++ b/sdl/Makefile.sdl1 @@ -32,7 +32,7 @@ CFLAGS = `sdl-config --cflags` -march=i686 -O6 -fomit-frame-pointer -Wall -Wn #-g -ggdb -pg #-fomit-frame-pointer #LDFLAGS = -pg -DEFINES = -DLSB_FIRST -DUSE_16BPP_RENDERING -DUSE_LIBTREMOR -DUSE_LIBCHDR -DMAXROMSIZE=33554432 -DHAVE_YM3438_CORE +DEFINES = -DLSB_FIRST -DUSE_16BPP_RENDERING -DUSE_LIBTREMOR -DMAXROMSIZE=33554432 -DHAVE_YM3438_CORE ifneq ($(OS),Windows_NT) DEFINES += -DHAVE_ALLOCA_H diff --git a/sdl/Makefile.sdl2 b/sdl/Makefile.sdl2 index 52543c9..ae10b68 100644 --- a/sdl/Makefile.sdl2 +++ b/sdl/Makefile.sdl2 @@ -32,7 +32,7 @@ CFLAGS = `sdl2-config --cflags` -march=i686 -O6 -fomit-frame-pointer -Wall -W #-g -ggdb -pg #-fomit-frame-pointer #LDFLAGS = -pg -DEFINES = -DLSB_FIRST -DUSE_16BPP_RENDERING -DUSE_LIBTREMOR -DUSE_LIBCHDR -DMAXROMSIZE=33554432 -DHAVE_YM3438_CORE +DEFINES = -DLSB_FIRST -DUSE_16BPP_RENDERING -DUSE_LIBTREMOR -DMAXROMSIZE=33554432 -DHAVE_YM3438_CORE ifneq ($(OS),Windows_NT) DEFINES += -DHAVE_ALLOCA_H