ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win32: fix msvc build

This commit is contained in:
OV2 2012-12-19 21:18:38 +01:00
parent c9c0936fd5
commit 369615f808
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
input/dinput.c
View File

@ -178,7 +178,7 @@ static bool dinput_keyboard_pressed(struct dinput_input *di, unsigned key)
if (key >= RETROK_LAST) if (key >= RETROK_LAST)
return false; return false;
unsigned sym = input_translate_rk_to_keysym(key); unsigned sym = input_translate_rk_to_keysym((retro_key)key);
return di->state[sym] & 0x80; return di->state[sym] & 0x80;
} }

9
msvc/msvc-2010/RetroArch-msvc2010.vcxproj
View File

@ -167,14 +167,13 @@
</ClCompile> </ClCompile>
<ClCompile Include="..\..\audio\ext_audio.c"> <ClCompile Include="..\..\audio\ext_audio.c">
</ClCompile> </ClCompile>
<ClCompile Include="..\..\audio\hermite.c">
</ClCompile>
<ClCompile Include="..\..\audio\null.c"> <ClCompile Include="..\..\audio\null.c">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\nullaudio.obj</ObjectFileName> <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\nullaudio.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\nullaudio.obj</ObjectFileName> <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\nullaudio.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\nullaudio.obj</ObjectFileName> <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\nullaudio.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\nullaudio.obj</ObjectFileName> <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\nullaudio.obj</ObjectFileName>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\audio\sinc.c" />
<ClCompile Include="..\..\audio\utils.c"> <ClCompile Include="..\..\audio\utils.c">
</ClCompile> </ClCompile>
<ClCompile Include="..\..\audio\xaudio-c\xaudio-c.c"> <ClCompile Include="..\..\audio\xaudio-c\xaudio-c.c">
@ -185,8 +184,10 @@
</ClCompile> </ClCompile>
<ClCompile Include="..\..\gfx\d3d9\d3d9.cpp" /> <ClCompile Include="..\..\gfx\d3d9\d3d9.cpp" />
<ClCompile Include="..\..\gfx\d3d9\render_chain.cpp" /> <ClCompile Include="..\..\gfx\d3d9\render_chain.cpp" />
<ClCompile Include="..\..\gfx\fonts\freetype.c"> <ClCompile Include="..\..\gfx\fonts\bitmapfont.c" />
</ClCompile> <ClCompile Include="..\..\gfx\fonts\fonts.c" />
<ClCompile Include="..\..\gfx\fonts\gl_font.c" />
<ClCompile Include="..\..\gfx\fonts\gl_raster_font.c" />
<ClCompile Include="..\..\gfx\shader_cg.c" /> <ClCompile Include="..\..\gfx\shader_cg.c" />
<ClCompile Include="..\..\performance.c"> <ClCompile Include="..\..\performance.c">
</ClCompile> </ClCompile>

21
msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
View File

@ -105,9 +105,6 @@
<ClCompile Include="..\..\audio\ext_audio.c"> <ClCompile Include="..\..\audio\ext_audio.c">
<Filter>Source Files\audio</Filter> <Filter>Source Files\audio</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\audio\hermite.c">
<Filter>Source Files\audio</Filter>
</ClCompile>
<ClCompile Include="..\..\audio\null.c"> <ClCompile Include="..\..\audio\null.c">
<Filter>Source Files\audio</Filter> <Filter>Source Files\audio</Filter>
</ClCompile> </ClCompile>
@ -177,9 +174,6 @@
<ClCompile Include="..\..\audio\xaudio-c\xaudio-c.c"> <ClCompile Include="..\..\audio\xaudio-c\xaudio-c.c">
<Filter>Source Files\audio</Filter> <Filter>Source Files\audio</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\gfx\fonts\freetype.c">
<Filter>Source Files\gfx\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\d3d9\d3d9.cpp"> <ClCompile Include="..\..\gfx\d3d9\d3d9.cpp">
<Filter>Source Files\gfx\d3d9</Filter> <Filter>Source Files\gfx\d3d9</Filter>
</ClCompile> </ClCompile>
@ -189,6 +183,21 @@
<ClCompile Include="..\..\gfx\shader_cg.c"> <ClCompile Include="..\..\gfx\shader_cg.c">
<Filter>Source Files\gfx</Filter> <Filter>Source Files\gfx</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\gfx\fonts\gl_font.c">
<Filter>Source Files\gfx\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\audio\sinc.c">
<Filter>Source Files\audio</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\fonts\gl_raster_font.c">
<Filter>Source Files\gfx\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\fonts\bitmapfont.c">
<Filter>Source Files\gfx\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\fonts\fonts.c">
<Filter>Source Files\gfx\fonts</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="resource.h"> <ClInclude Include="resource.h">