mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-02 19:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

msvc build fix.

Browse Source
This commit is contained in:
aliaspider 2018-03-25 23:11:31 +01:00
parent ae4b604a6f
commit 88d1c1fdca
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/drivers/d3d11.c
View File

@ -1270,15 +1270,15 @@ static bool d3d11_gfx_frame(
}
else if (video_info->statistics_show)
{
struct font_params *osd_params = (struct font_params*)
&video_info->osd_stat_params;
struct font_params* osd_params = (struct font_params*)&video_info->osd_stat_params;
if (osd_params)
{
D3D11SetViewports(context, 1, &d3d11->viewport);
D3D11SetBlendState(d3d11->context, d3d11->blend_enable, NULL, D3D11_DEFAULT_SAMPLE_MASK);
D3D11SetVertexBuffer(context, 0, d3d11->sprites.vbo, sizeof(d3d11_sprite_t), 0);
font_driver_render_msg(video_info, NULL, video_info->stat_text,
font_driver_render_msg(
video_info, NULL, video_info->stat_text,
(const struct font_params*)&video_info->osd_stat_params);
}
}
@ -1443,7 +1443,7 @@ static void d3d11_gfx_set_osd_msg(
if (d3d11)
{
if (d3d11->sprites.enabled)
font_driver_render_msg(video_info, font, msg, params);
font_driver_render_msg(video_info, font, msg, (const struct font_params*)params);
else
printf("OSD msg: %s\n", msg);
}

2
gfx/drivers/d3d9.c
View File

@ -1072,7 +1072,7 @@ static void d3d9_set_osd_msg(void *data,
d3d->renderchain_driver->set_font_rect(d3d, params);
d3d9_begin_scene(d3d->dev);
font_driver_render_msg(video_info, font, msg, params);
font_driver_render_msg(video_info, font, msg, (const struct font_params *)params);
d3d9_end_scene(d3d->dev);
}

2
gfx/drivers/gdi_gfx.c
View File

@ -498,7 +498,7 @@ static void gdi_set_osd_msg(void *data,
const char *msg,
const void *params, void *font)
{
font_driver_render_msg(video_info, font, msg, params);
font_driver_render_msg(video_info, font, msg, (const struct font_params *)params);
}
static void gdi_get_video_output_size(void *data,

2
gfx/drivers/gl.c
View File

@ -853,7 +853,7 @@ static void gl_set_osd_msg(void *data,
const char *msg,
const void *params, void *font)
{
font_driver_render_msg(video_info, font, msg, params);
font_driver_render_msg(video_info, font, msg, (const struct font_params *)params);
}
#if defined(HAVE_MENU)

2
gfx/drivers/vulkan.c
View File

@ -2219,7 +2219,7 @@ static void vulkan_set_osd_msg(void *data,
const char *msg,
const void *params, void *font)
{
font_driver_render_msg(video_info, font, msg, params);
font_driver_render_msg(video_info, font, msg, (const struct font_params *)params);
}
static uintptr_t vulkan_load_texture(void *video_data, void *data,

3
pkg/msvc/msvc-2015/RetroArch-msvc2015.vcxproj
View File

@ -233,6 +233,7 @@
<AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\gfx\include\dxsdk;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
<AdditionalOptions>/bigobj</AdditionalOptions>
<FloatingPointModel>Fast</FloatingPointModel>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
@ -376,4 +377,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>