[SDL] added LIBCHDR support

This commit is contained in:
EkeEke 2018-07-03 00:12:36 +02:00
parent 04d2b001fe
commit 7af5a0cdf4
2 changed files with 63 additions and 3 deletions

View File

@ -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 -DMAXROMSIZE=33554432 -DHAVE_YM3438_CORE
DEFINES = -DLSB_FIRST -DUSE_16BPP_RENDERING -DUSE_LIBTREMOR -DUSE_LIBCHDR -DMAXROMSIZE=33554432 -DHAVE_YM3438_CORE
ifneq ($(OS),Windows_NT)
DEFINES += -DHAVE_ALLOCA_H
@ -42,6 +42,8 @@ SRCDIR = ../core
INCLUDES = -I$(SRCDIR) -I$(SRCDIR)/z80 -I$(SRCDIR)/m68k -I$(SRCDIR)/sound -I$(SRCDIR)/input_hw -I$(SRCDIR)/cart_hw -I$(SRCDIR)/cart_hw/svp -I$(SRCDIR)/cd_hw -I$(SRCDIR)/ntsc -I$(SRCDIR)/tremor -I$(SRCDIR)/../sdl -I$(SRCDIR)/../sdl/sdl1
LIBS = `sdl-config --libs` -lz -lm
CHDLIBDIR = $(SRCDIR)/cd_hw/libchdr
OBJDIR = ./build_sdl
OBJECTS = $(OBJDIR)/z80.o
@ -125,6 +127,25 @@ OBJECTS += $(OBJDIR)/bitwise.o \
$(OBJDIR)/vorbisfile.o \
$(OBJDIR)/window.o
OBJECTS += $(OBJDIR)/bitstream.o \
$(OBJDIR)/chd.o \
$(OBJDIR)/flac.o \
$(OBJDIR)/huffman.o \
$(OBJDIR)/bitmath.o \
$(OBJDIR)/bitreader.o \
$(OBJDIR)/cpu.o \
$(OBJDIR)/crc.o \
$(OBJDIR)/fixed.o \
$(OBJDIR)/float.o \
$(OBJDIR)/format.o \
$(OBJDIR)/lpc.o \
$(OBJDIR)/md5.o \
$(OBJDIR)/memory.o \
$(OBJDIR)/stream_decoder.o \
$(OBJDIR)/LzFind.o \
$(OBJDIR)/LzmaDec.o \
$(OBJDIR)/LzmaEnc.o \
ifeq ($(OS),Windows_NT)
OBJECTS += $(OBJDIR)/icon.o
endif
@ -169,10 +190,19 @@ $(OBJDIR)/%.o : $(SRCDIR)/ntsc/%.c $(SRCDIR)/ntsc/%.h
$(OBJDIR)/%.o : $(SRCDIR)/tremor/%.c $(SRCDIR)/tremor/%.h
$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@
$(OBJDIR)/%.o : $(SRCDIR)/tremor/%.c
$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@
$(OBJDIR)/%.o : $(CHDLIBDIR)/src/%.c
$(CC) -c $(FLAGS) $(INCLUDES) -I$(CHDLIBDIR)/src -I$(CHDLIBDIR)/deps/libFLAC/include -I$(CHDLIBDIR)/deps/lzma -I$(CHDLIBDIR)/deps/zlib $< -o $@
$(OBJDIR)/%.o : $(CHDLIBDIR)/deps/libFLAC/%.c
$(CC) -c $(FLAGS) -I$(CHDLIBDIR)/deps/libFLAC/include -DPACKAGE_VERSION=\"1.3.2\" -DFLAC_API_EXPORTS -DFLAC__HAS_OGG=0 -DHAVE_LROUND -DHAVE_STDINT_H -DHAVE_SYS_PARAM_H $< -o $@
$(OBJDIR)/%.o : $(CHDLIBDIR)/deps/lzma/%.c
$(CC) -c $(FLAGS) -I$(CHDLIBDIR)/deps/lzma -D_7ZIP_ST $< -o $@
$(OBJDIR)/%.o : $(SRCDIR)/../sdl/%.c $(SRCDIR)/../sdl/%.h
$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@

View File

@ -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 -DMAXROMSIZE=33554432 -DHAVE_YM3438_CORE
DEFINES = -DLSB_FIRST -DUSE_16BPP_RENDERING -DUSE_LIBTREMOR -DUSE_LIBCHDR -DMAXROMSIZE=33554432 -DHAVE_YM3438_CORE
ifneq ($(OS),Windows_NT)
DEFINES += -DHAVE_ALLOCA_H
@ -42,6 +42,8 @@ SRCDIR = ../core
INCLUDES = -I$(SRCDIR) -I$(SRCDIR)/z80 -I$(SRCDIR)/m68k -I$(SRCDIR)/sound -I$(SRCDIR)/input_hw -I$(SRCDIR)/cart_hw -I$(SRCDIR)/cart_hw/svp -I$(SRCDIR)/cd_hw -I$(SRCDIR)/ntsc -I$(SRCDIR)/tremor -I$(SRCDIR)/../sdl -I$(SRCDIR)/../sdl/sdl2
LIBS = `sdl2-config --libs` -lz -lm
CHDLIBDIR = $(SRCDIR)/cd_hw/libchdr
OBJDIR = ./build_sdl2
OBJECTS = $(OBJDIR)/z80.o
@ -125,6 +127,25 @@ OBJECTS += $(OBJDIR)/bitwise.o \
$(OBJDIR)/vorbisfile.o \
$(OBJDIR)/window.o
OBJECTS += $(OBJDIR)/bitstream.o \
$(OBJDIR)/chd.o \
$(OBJDIR)/flac.o \
$(OBJDIR)/huffman.o \
$(OBJDIR)/bitmath.o \
$(OBJDIR)/bitreader.o \
$(OBJDIR)/cpu.o \
$(OBJDIR)/crc.o \
$(OBJDIR)/fixed.o \
$(OBJDIR)/float.o \
$(OBJDIR)/format.o \
$(OBJDIR)/lpc.o \
$(OBJDIR)/md5.o \
$(OBJDIR)/memory.o \
$(OBJDIR)/stream_decoder.o \
$(OBJDIR)/LzFind.o \
$(OBJDIR)/LzmaDec.o \
$(OBJDIR)/LzmaEnc.o \
ifeq ($(OS),Windows_NT)
OBJECTS += $(OBJDIR)/icon.o
endif
@ -173,6 +194,15 @@ $(OBJDIR)/%.o : $(SRCDIR)/tremor/%.c $(SRCDIR)/tremor/%.h
$(OBJDIR)/%.o : $(SRCDIR)/tremor/%.c
$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@
$(OBJDIR)/%.o : $(CHDLIBDIR)/src/%.c
$(CC) -c $(FLAGS) $(INCLUDES) -I$(CHDLIBDIR)/src -I$(CHDLIBDIR)/deps/libFLAC/include -I$(CHDLIBDIR)/deps/lzma -I$(CHDLIBDIR)/deps/zlib $< -o $@
$(OBJDIR)/%.o : $(CHDLIBDIR)/deps/libFLAC/%.c
$(CC) -c $(FLAGS) -I$(CHDLIBDIR)/deps/libFLAC/include -DPACKAGE_VERSION=\"1.3.2\" -DFLAC_API_EXPORTS -DFLAC__HAS_OGG=0 -DHAVE_LROUND -DHAVE_STDINT_H -DHAVE_SYS_PARAM_H $< -o $@
$(OBJDIR)/%.o : $(CHDLIBDIR)/deps/lzma/%.c
$(CC) -c $(FLAGS) -I$(CHDLIBDIR)/deps/lzma -D_7ZIP_ST $< -o $@
$(OBJDIR)/%.o : $(SRCDIR)/../sdl/%.c $(SRCDIR)/../sdl/%.h
$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@