This commit is contained in:
twinaphex 2015-07-25 00:03:50 +02:00
parent 04404bfe38
commit 5b84a02fc0
9 changed files with 1 additions and 51 deletions

View File

@ -245,7 +245,6 @@ ifeq ($(NEED_DEINTERLACER), 1)
endif
MEDNAFEN_SOURCES := $(MEDNAFEN_DIR)/mednafen.cpp \
$(MEDNAFEN_DIR)/math_ops.cpp \
$(MEDNAFEN_DIR)/settings.cpp \
$(MEDNAFEN_DIR)/general.cpp \
$(MEDNAFEN_DIR)/state.cpp \

View File

@ -61,7 +61,6 @@ CORE_SOURCES += $(MEDNAFEN_LIBRETRO_DIR)/scrc32.cpp
endif
MEDNAFEN_SOURCES := $(MEDNAFEN_DIR)/mednafen.cpp \
$(MEDNAFEN_DIR)/math_ops.cpp \
$(MEDNAFEN_DIR)/settings.cpp \
$(MEDNAFEN_DIR)/general.cpp \
$(MEDNAFEN_DIR)/state.cpp \

View File

@ -1,36 +0,0 @@
/* Mednafen - Multi-system Emulator
*
* 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
*/
#include "mednafen.h"
#include "math_ops.h"
// Source: http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2
// Rounds up to the nearest power of 2.
uint32 round_up_pow2(uint32 v)
{
v--;
v |= v >> 1;
v |= v >> 2;
v |= v >> 4;
v |= v >> 8;
v |= v >> 16;
v++;
v += (v == 0);
return(v);
}

View File

@ -3,7 +3,7 @@
// Source: http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2
// Rounds up to the nearest power of 2.
static INLINE uint64 round_up_pow2(uint64 v)
static INLINE uint32 round_up_pow2(uint32 v)
{
v--;
v |= v >> 1;
@ -11,7 +11,6 @@ static INLINE uint64 round_up_pow2(uint64 v)
v |= v >> 4;
v |= v >> 8;
v |= v >> 16;
v |= v >> 32;
v++;
v += (v == 0);

View File

@ -211,9 +211,6 @@
<File
RelativePath="..\..\mednafen\general.cpp">
</File>
<File
RelativePath="..\..\mednafen\math_ops.cpp">
</File>
<File
RelativePath="..\..\mednafen\md5.cpp">
</File>

View File

@ -31,7 +31,6 @@
<ClCompile Include="..\..\mednafen\endian.cpp" />
<ClCompile Include="..\..\mednafen\file.cpp" />
<ClCompile Include="..\..\mednafen\general.cpp" />
<ClCompile Include="..\..\mednafen\math_ops.cpp" />
<ClCompile Include="..\..\mednafen\md5.cpp" />
<ClCompile Include="..\..\mednafen\mednafen.cpp" />
<ClCompile Include="..\..\mednafen\mempatcher.cpp" />

View File

@ -41,9 +41,6 @@
<ClCompile Include="..\..\mednafen\general.cpp">
<Filter>Source Files\mednafen</Filter>
</ClCompile>
<ClCompile Include="..\..\mednafen\math_ops.cpp">
<Filter>Source Files\mednafen</Filter>
</ClCompile>
<ClCompile Include="..\..\mednafen\md5.cpp">
<Filter>Source Files\mednafen</Filter>
</ClCompile>

View File

@ -15,7 +15,6 @@
<ClCompile Include="..\..\mednafen\endian.cpp" />
<ClCompile Include="..\..\mednafen\file.cpp" />
<ClCompile Include="..\..\mednafen\general.cpp" />
<ClCompile Include="..\..\mednafen\math_ops.cpp" />
<ClCompile Include="..\..\mednafen\md5.cpp" />
<ClCompile Include="..\..\mednafen\mednafen.cpp" />
<ClCompile Include="..\..\mednafen\mempatcher.cpp" />

View File

@ -41,9 +41,6 @@
<ClCompile Include="..\..\mednafen\general.cpp">
<Filter>Source Files\mednafen</Filter>
</ClCompile>
<ClCompile Include="..\..\mednafen\math_ops.cpp">
<Filter>Source Files\mednafen</Filter>
</ClCompile>
<ClCompile Include="..\..\mednafen\md5.cpp">
<Filter>Source Files\mednafen</Filter>
</ClCompile>