libretro/vice-libretro
1
0
Fork 0
mirror of https://github.com/libretro/vice-libretro.git synced 2025-02-07 17:16:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DTV makefile SID fix

Browse Source
This commit is contained in:
Tony Jansson 2020-09-23 20:43:08 +03:00
parent 4a77d255cc
commit 0e0a572f11
3 changed files with 13 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Makefile.x64dtv
View File

@ -19,9 +19,7 @@ INCFLAGS += \
-I$(EMU)/lib/p64 \
-I$(EMU)/monitor \
-I$(EMU)/raster \
-I$(EMU)/resid \
-I$(EMU)/residfp \
-I$(EMU)/residfp/builders/residfp-builder/residfp \
-I$(EMU)/resid-dtv \
-I$(EMU)/rtc \
-I$(EMU)/samplerdrv \
-I$(EMU)/socketdrv \
@ -33,36 +31,14 @@ INCFLAGS += \
-I$(EMU)/video
SOURCES_CXX += \
$(EMU)/resid/dac.cc \
$(EMU)/resid/envelope.cc \
$(EMU)/resid/extfilt.cc \
$(EMU)/resid/filter.cc \
$(EMU)/resid/pot.cc \
$(EMU)/resid/sid.cc \
$(EMU)/resid/version.cc \
$(EMU)/resid/voice.cc \
$(EMU)/resid/wave.cc \
$(EMU)/resid-dtv/envelope.cc \
$(EMU)/resid-dtv/extfilt.cc \
$(EMU)/resid-dtv/filter.cc \
$(EMU)/resid-dtv/sid.cc \
$(EMU)/resid-dtv/version.cc \
$(EMU)/resid-dtv/voice.cc \
$(EMU)/resid-dtv/wave.cc \
$(EMU)/sid/resid-dtv.cc \
$(EMU)/sid/resid-33.cc \
$(EMU)/sid/resid.cc \
$(EMU)/sid/resid-fp.cc \
$(EMU)/residfp/builders/residfp-builder/residfp/version.cc \
$(EMU)/residfp/builders/residfp-builder/residfp/Dac.cpp \
$(EMU)/residfp/builders/residfp-builder/residfp/EnvelopeGenerator.cpp \
$(EMU)/residfp/builders/residfp-builder/residfp/ExternalFilter.cpp \
$(EMU)/residfp/builders/residfp-builder/residfp/Filter.cpp \
$(EMU)/residfp/builders/residfp-builder/residfp/Filter6581.cpp \
$(EMU)/residfp/builders/residfp-builder/residfp/Filter8580.cpp \
$(EMU)/residfp/builders/residfp-builder/residfp/FilterModelConfig.cpp \
$(EMU)/residfp/builders/residfp-builder/residfp/FilterModelConfig8580.cpp \
$(EMU)/residfp/builders/residfp-builder/residfp/Integrator.cpp \
$(EMU)/residfp/builders/residfp-builder/residfp/Integrator8580.cpp \
$(EMU)/residfp/builders/residfp-builder/residfp/OpAmp.cpp \
$(EMU)/residfp/builders/residfp-builder/residfp/resample/SincResampler.cpp \
$(EMU)/residfp/builders/residfp-builder/residfp/SID.cpp \
$(EMU)/residfp/builders/residfp-builder/residfp/Spline.cpp \
$(EMU)/residfp/builders/residfp-builder/residfp/WaveformCalculator.cpp \
$(EMU)/residfp/builders/residfp-builder/residfp/WaveformGenerator.cpp
SOURCES_C += \
$(EMU)/alarm.c \

2
vice/src/resid-dtv/siddtvdefs.h
View File

@ -60,7 +60,7 @@ extern "C"
#ifndef __VERSION_CC__
extern const char* resid_version_string;
#else
const char* resid_version_string = VERSION;
const char* resid_version_string = 0;
#endif
}

8
vice/src/sid/sid.c
View File

@ -56,7 +56,7 @@
#ifdef HAVE_RESID
#include "resid.h"
#ifdef __LIBRETRO__
#if defined(__LIBRETRO__) && !defined(__X64DTV__)
extern sid_engine_t resid33_hooks;
extern sid_engine_t residfp_hooks;
#endif
@ -346,7 +346,7 @@ sound_t *sid_sound_machine_open(int chipno)
if (sidengine == SID_ENGINE_RESID) {
sid_engine = resid_hooks;
}
#ifdef __LIBRETRO__
#if defined(__LIBRETRO__) && !defined(__X64DTV__)
if (sidengine == SID_ENGINE_RESID33) {
sid_engine = resid33_hooks;
}
@ -568,7 +568,7 @@ int sid_sound_machine_cycle_based(void)
return 0;
#ifdef HAVE_RESID
case SID_ENGINE_RESID:
#ifdef __LIBRETRO__
#if defined(__LIBRETRO__) && !defined(__X64DTV__)
case SID_ENGINE_RESID33:
case SID_ENGINE_RESIDFP:
#endif
@ -618,7 +618,7 @@ static void set_sound_func(void)
sid_store_func = sound_store;
sid_dump_func = sound_dump;
}
#ifdef __LIBRETRO__
#if defined(__LIBRETRO__) && !defined(__X64DTV__)
if (sid_engine_type == SID_ENGINE_RESID33) {
sid_read_func = sound_read;
sid_store_func = sound_store;