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

Avoid trying to load custom palette if path is NULL

Browse Source
This commit is contained in:
twinaphex 2014-06-20 22:10:13 +02:00
parent d4b0c27e44
commit 5dae5d06bc
9 changed files with 4 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -39,9 +39,7 @@ endif
CORE_DEFINE := -DWANT_PCE_FAST_EMU -DWANT_STEREO_SOUND
CORE_DIR := $(MEDNAFEN_DIR)/pce_fast
CORE_SOURCES := \
$(CORE_DIR)/huc.cpp \
$(CORE_DIR)/huc6280.cpp \
CORE_SOURCES := $(CORE_DIR)/huc6280.cpp \
$(CORE_DIR)/input.cpp \
$(CORE_DIR)/pcecd.cpp \
$(CORE_DIR)/pcecd_drive.cpp \

3
jni/Android.mk
View File

@ -44,8 +44,7 @@ NEED_CRC32 = 1
CORE_DEFINE := -DWANT_PCE_FAST_EMU
CORE_DIR := $(MEDNAFEN_DIR)/pce_fast
CORE_SOURCES := $(CORE_DIR)/huc.cpp \
$(CORE_DIR)/huc6280.cpp \
CORE_SOURCES := $(CORE_DIR)/huc6280.cpp \
$(CORE_DIR)/input.cpp \
$(CORE_DIR)/pcecd.cpp \
$(CORE_DIR)/pcecd_drive.cpp \

18
mednafen/pce_fast/huc.cpp
View File

@ -1,18 +0,0 @@
/* Mednafen - Multi-system Emulator
*
* Portions of this file Copyright (C) 2004 Ki
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/

2
mednafen/pce_fast/vdc.cpp
View File

@ -1557,6 +1557,8 @@ void VDC_Power(void)
static bool LoadCustomPalette(const char *path) MDFN_COLD;
static bool LoadCustomPalette(const char *path)
{
if (path[0] == '\0')
return false;
MDFN_printf(_("Loading custom palette from \"%s\"...\n"), path);
MDFN_indent(1);

6
msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj
View File

@ -340,12 +340,6 @@
<Filter
Name="pce_fast"
Filter="">
<File
RelativePath="..\..\..\mednafen\pce_fast\hes.cpp">
</File>
<File
RelativePath="..\..\..\mednafen\pce_fast\huc.cpp">
</File>
<File
RelativePath="..\..\..\mednafen\pce_fast\huc6280.cpp">
</File>

2
msvc/msvc-2010-360/msvc-2010-360.vcxproj
View File

@ -55,8 +55,6 @@
<ClCompile Include="..\..\..\mednafen\MemoryStream.cpp" />
<ClCompile Include="..\..\..\mednafen\mempatcher.cpp" />
<ClCompile Include="..\..\..\mednafen\okiadpcm.cpp" />
<ClCompile Include="..\..\..\mednafen\pce_fast\hes.cpp" />
<ClCompile Include="..\..\..\mednafen\pce_fast\huc.cpp" />
<ClCompile Include="..\..\..\mednafen\pce_fast\huc6280.cpp" />
<ClCompile Include="..\..\..\mednafen\pce_fast\input.cpp" />
<ClCompile Include="..\..\..\mednafen\pce_fast\pce.cpp" />

6
msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters
View File

@ -218,12 +218,6 @@
<ClCompile Include="..\..\..\mednafen\tremor\vorbisfile.c">
<Filter>Source Files\mednafen\tremor</Filter>
</ClCompile>
<ClCompile Include="..\..\..\mednafen\pce_fast\hes.cpp">
<Filter>Source Files\mednafen\pce_fast</Filter>
</ClCompile>
<ClCompile Include="..\..\..\mednafen\pce_fast\huc.cpp">
<Filter>Source Files\mednafen\pce_fast</Filter>
</ClCompile>
<ClCompile Include="..\..\..\mednafen\pce_fast\huc6280.cpp">
<Filter>Source Files\mednafen\pce_fast</Filter>
</ClCompile>

2
msvc/msvc-2010/msvc-2010.vcxproj
View File

@ -39,8 +39,6 @@
<ClCompile Include="..\..\..\mednafen\MemoryStream.cpp" />
<ClCompile Include="..\..\..\mednafen\mempatcher.cpp" />
<ClCompile Include="..\..\..\mednafen\okiadpcm.cpp" />
<ClCompile Include="..\..\..\mednafen\pce_fast\hes.cpp" />
<ClCompile Include="..\..\..\mednafen\pce_fast\huc.cpp" />
<ClCompile Include="..\..\..\mednafen\pce_fast\huc6280.cpp" />
<ClCompile Include="..\..\..\mednafen\pce_fast\input.cpp" />
<ClCompile Include="..\..\..\mednafen\pce_fast\pce.cpp" />

6
msvc/msvc-2010/msvc-2010.vcxproj.filters
View File

@ -218,12 +218,6 @@
<ClCompile Include="..\..\..\mednafen\tremor\vorbisfile.c">
<Filter>Source Files\mednafen\tremor</Filter>
</ClCompile>
<ClCompile Include="..\..\..\mednafen\pce_fast\hes.cpp">
<Filter>Source Files\mednafen\pce_fast</Filter>
</ClCompile>
<ClCompile Include="..\..\..\mednafen\pce_fast\huc.cpp">
<Filter>Source Files\mednafen\pce_fast</Filter>
</ClCompile>
<ClCompile Include="..\..\..\mednafen\pce_fast\huc6280.cpp">
<Filter>Source Files\mednafen\pce_fast</Filter>
</ClCompile>