admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(MSVC 360) Build fixes

Browse Source
This commit is contained in:
Twinaphex
2014-04-15 02:09:56 -07:00
parent dcdc9b3baa
commit ca248e6bda
5 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/boards/__serial.h
View File

@@ -3,10 +3,8 @@
#include <stdio.h> #include <stdio.h>
#ifdef _WIN32 && !defined(_XBOX) #ifdef _WIN32
#include <windows.h> typedef int BOOL;
#else
#define BOOL int
#ifndef TRUE #ifndef TRUE
#define TRUE 1 #define TRUE 1

20
src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
View File

@@ -859,14 +859,6 @@
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs> <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs> <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\boards\konami-qtai.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
</ClCompile>
<ClCompile Include="..\..\..\..\boards\KS7012.c"> <ClCompile Include="..\..\..\..\boards\KS7012.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs> <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs> <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
@@ -963,6 +955,7 @@
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs> <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs> <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\boards\mihunche.c" />
<ClCompile Include="..\..\..\..\boards\mmc1.c"> <ClCompile Include="..\..\..\..\boards\mmc1.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs> <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs> <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
@@ -1251,6 +1244,7 @@
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs> <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs> <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\fceu-memory.c" />
<ClCompile Include="..\..\..\..\fceu.c"> <ClCompile Include="..\..\..\..\fceu.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs> <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs> <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
@@ -1467,14 +1461,6 @@
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs> <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs> <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\memory.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
</ClCompile>
<ClCompile Include="..\..\..\..\movie.c"> <ClCompile Include="..\..\..\..\movie.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs> <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs> <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
@@ -1836,4 +1822,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

12
src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters
View File

@@ -413,9 +413,6 @@
<ClCompile Include="..\..\..\..\boards\kof97.c"> <ClCompile Include="..\..\..\..\boards\kof97.c">
<Filter>Source Files\boards</Filter> <Filter>Source Files\boards</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\boards\konami-qtai.c">
<Filter>Source Files\boards</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\boards\KS7012.c"> <ClCompile Include="..\..\..\..\boards\KS7012.c">
<Filter>Source Files\boards</Filter> <Filter>Source Files\boards</Filter>
</ClCompile> </ClCompile>
@@ -581,9 +578,6 @@
<ClCompile Include="..\..\..\..\md5.c"> <ClCompile Include="..\..\..\..\md5.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\memory.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\movie.c"> <ClCompile Include="..\..\..\..\movie.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@@ -617,6 +611,12 @@
<ClCompile Include="..\..\..\..\wave.c"> <ClCompile Include="..\..\..\..\wave.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\fceu-memory.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\boards\mihunche.c">
<Filter>Source Files\boards</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\src-fceumm\input\suborkb.h"> <ClInclude Include="..\src-fceumm\input\suborkb.h">

8
src/fceu-memory.c
View File

@@ -65,8 +65,8 @@ void FASTAPASS(3) FCEU_memmove(void *d, void *s, uint32 l) {
if (t & 3) { // Not 4-byte aligned and/or length is not a multiple of 4. if (t & 3) { // Not 4-byte aligned and/or length is not a multiple of 4.
uint8 *tmpd, *tmps; uint8 *tmpd, *tmps;
tmpd = d; tmpd = (uint8*)d;
tmps = s; tmps = (uint8*)s;
for (x = l; x; x--) { // This could be optimized further, though(more tests could be performed). for (x = l; x; x--) { // This could be optimized further, though(more tests could be performed).
*tmpd = *tmps; *tmpd = *tmps;
@@ -76,8 +76,8 @@ void FASTAPASS(3) FCEU_memmove(void *d, void *s, uint32 l) {
} else { } else {
uint32 *tmpd, *tmps; uint32 *tmpd, *tmps;
tmpd = d; tmpd = (uint32*)d;
tmps = s; tmps = (uint32*)s;
for (x = l >> 2; x; x--) { for (x = l >> 2; x; x--) {
*tmpd = *tmps; *tmpd = *tmps;

2
src/state.h
View File

@@ -34,7 +34,7 @@ void FCEUSS_CheckStates(void);
typedef struct { typedef struct {
void *v; void *v;
uint32 s; uint32 s;
char desc[4]; char desc[5];
} SFORMAT; } SFORMAT;
void ResetExState(void (*PreSave)(void), void (*PostSave)(void)); void ResetExState(void (*PreSave)(void), void (*PostSave)(void));