libretro/beetle-pce-fast-libretro
1
0
Fork 0
mirror of https://github.com/libretro/beetle-pce-fast-libretro.git synced 2024-11-27 01:50:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2012-11-24 06:29:37 +01:00
parent 24ee1d3fc1
commit 3196114a9e
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -33,6 +33,7 @@ ifeq ($(core), psx)
NEED_BPP = 32
NEED_BLIP = 1
NEED_DEINTERLACER = 1
NEED_STEREO_SOUND = 1
CORE_DEFINE := -DWANT_PSX_EMU
CORE_DIR := $(MEDNAFEN_DIR)/psx
CORE_SOURCES := $(CORE_DIR)/psx.cpp \
@ -64,7 +65,8 @@ else ifeq ($(core), pce-fast)
NEED_BPP = 16
NEED_BLIP = 1
NEED_CD = 1
NEED_SCSI_CD = 1
NEED_STEREO_SOUND = 1
NEED_SCSI_CD = 1
NEED_CRC32 = 1
CORE_DEFINE := -DWANT_PCE_FAST_EMU
CORE_DIR := $(MEDNAFEN_DIR)/pce_fast-0924
@ -90,6 +92,7 @@ else ifeq ($(core), wswan)
core = wswan
NEED_BPP = 16
NEED_BLIP = 1
NEED_STEREO_SOUND = 1
CORE_DEFINE := -DWANT_WSWAN_EMU
CORE_DIR := $(MEDNAFEN_DIR)/wswan-0922
@ -109,6 +112,10 @@ ifeq ($(NEED_BLIP), 1)
RESAMPLER_SOURCES += $(MEDNAFEN_DIR)/sound/Blip_Buffer.cpp
endif
ifeq ($(NEED_STEREO_SOUND), 1)
SOUND_DEFINE := -DWANT_STEREO_SOUND
endif
CORE_INCDIR := -I$(CORE_DIR)
ifeq ($(platform), unix)
@ -303,7 +310,7 @@ LDFLAGS += $(fpic) $(SHARED)
FLAGS += $(fpic) $(NEW_GCC_FLAGS)
FLAGS += -I. -Imednafen -Imednafen/include -Imednafen/intl $(CORE_INCDIR)
FLAGS += $(ENDIANNESS_DEFINES) -DSIZEOF_DOUBLE=8 $(WARNINGS) -DMEDNAFEN_VERSION=\"0.9.26\" -DPACKAGE=\"mednafen\" -DMEDNAFEN_VERSION_NUMERIC=926 -DPSS_STYLE=1 -DMPC_FIXED_POINT $(CORE_DEFINE) -DSTDC_HEADERS -D__STDC_LIMIT_MACROS -D__LIBRETRO__ -DNDEBUG -D_LOW_ACCURACY_ $(EXTRA_INCLUDES)
FLAGS += $(ENDIANNESS_DEFINES) -DSIZEOF_DOUBLE=8 $(WARNINGS) -DMEDNAFEN_VERSION=\"0.9.26\" -DPACKAGE=\"mednafen\" -DMEDNAFEN_VERSION_NUMERIC=926 -DPSS_STYLE=1 -DMPC_FIXED_POINT $(CORE_DEFINE) -DSTDC_HEADERS -D__STDC_LIMIT_MACROS -D__LIBRETRO__ -DNDEBUG -D_LOW_ACCURACY_ $(EXTRA_INCLUDES) $(SOUND_DEFINE)
ifeq ($(IS_X86), 1)
FLAGS += -DARCH_X86

6
mednafen/sound/Blip_Buffer.cpp
View File

@ -23,10 +23,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
#include BLARGG_ENABLE_OPTIMIZER
#endif
#if defined(WANT_PSX_EMU)
#define SOUND_STEREO 1
#endif
int const silent_buf_size = 1; // size used for Silent_Blip_Buffer
Blip_Buffer::Blip_Buffer()
@ -225,7 +221,7 @@ long Blip_Buffer::read_samples( blip_sample_t* BLIP_RESTRICT out, long max_sampl
int const bass = BLIP_READER_BASS( *this );
BLIP_READER_BEGIN( reader, *this );
#ifndef SOUND_STEREO
#ifndef WANT_STEREO_SOUND
if ( !stereo )
{
for ( blip_long n = count; n; --n )

8
mednafen/sound/Stereo_Buffer.cpp
View File

@ -13,10 +13,6 @@ for more details. You should have received a copy of the GNU General
Public License along with Stereo_Buffer; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#if defined(WANT_PSX_EMU)
#define SOUND_STEREO 1
#endif
Stereo_Buffer::Stereo_Buffer() {
}
@ -81,7 +77,7 @@ long Stereo_Buffer::read_samples( blip_sample_t* out, long max_samples )
bufs [1].remove_samples( count );
bufs [2].remove_samples( count );
}
#ifndef SOUND_STEREO
#ifndef WANT_STEREO_SOUND
else
{
mix_mono( out, count );
@ -157,7 +153,7 @@ void Stereo_Buffer::mix_stereo( float* out, long count )
left.end( bufs [1] );
}
#ifndef SOUND_STEREO
#ifndef WANT_STEREO_SOUND
void Stereo_Buffer::mix_mono( blip_sample_t* out, long count )
{
Blip_Reader in;