mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-02 14:54:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build fix MinGW.

Browse Source
This commit is contained in:
Themaister 2014-03-09 15:49:20 +01:00
parent 813a2daaa0
commit 6a45de307d
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.win
View File

@ -150,7 +150,7 @@ else
endif endif
ifeq ($(HAVE_D3D9), 1) ifeq ($(HAVE_D3D9), 1)
OBJ += gfx/d3d9/d3d.o gfx/d3d9/d3d9_pc.o gfx/d3d9/render_chain.o gfx/fonts/d3d_font.o gfx/fonts/d3d_w32_font.o OBJ += gfx/d3d9/d3d.o gfx/d3d9/render_chain.o gfx/fonts/d3d_font.o gfx/fonts/d3d_w32_font.o gfx/context/d3d_ctx.o
DEFINES += -DHAVE_WIN32_D3D9 DEFINES += -DHAVE_WIN32_D3D9
LIBS += -ld3d9 -lcg -lcgD3D9 -ld3dx9 -ldxguid LIBS += -ld3d9 -lcg -lcgD3D9 -ld3dx9 -ldxguid
endif endif

0
gfx/context/d3d_ctx.c → gfx/context/d3d_ctx.cpp
View File

6
gfx/d3d9/d3d.cpp
View File

@ -136,7 +136,7 @@ void d3d_recompute_pass_sizes(void *data)
} }
#ifndef DONT_HAVE_STATE_TRACKER #ifndef DONT_HAVE_STATE_TRACKER
static bool d3d_init_imports(void *data) bool d3d_init_imports(void *data)
{ {
d3d_video_t *d3d = (d3d_video_t*)data; d3d_video_t *d3d = (d3d_video_t*)data;
if (!d3d->shader.variables) if (!d3d->shader.variables)
@ -236,7 +236,7 @@ bool d3d_init_chain(void *data, const video_info_t *video_info)
} }
#ifdef HAVE_FBO #ifdef HAVE_FBO
static bool d3d_init_multipass(void *data) bool d3d_init_multipass(void *data)
{ {
d3d_video_t *d3d = (d3d_video_t*)data; d3d_video_t *d3d = (d3d_video_t*)data;
config_file_t *conf = config_file_new(d3d->cg_shader.c_str()); config_file_t *conf = config_file_new(d3d->cg_shader.c_str());
@ -318,7 +318,7 @@ void d3d_set_font_rect(void *data, font_params_t *params)
#endif #endif
} }
static bool d3d_init_singlepass(void *data) bool d3d_init_singlepass(void *data)
{ {
d3d_video_t *d3d = (d3d_video_t*)data; d3d_video_t *d3d = (d3d_video_t*)data;
memset(&d3d->shader, 0, sizeof(d3d->shader)); memset(&d3d->shader, 0, sizeof(d3d->shader));

2
griffin/griffin.c
View File

@ -100,7 +100,7 @@ VIDEO CONTEXT
#if defined(__CELLOS_LV2__) #if defined(__CELLOS_LV2__)
#include "../gfx/context/ps3_ctx.c" #include "../gfx/context/ps3_ctx.c"
#elif defined(_XBOX) #elif defined(_XBOX)
#include "../gfx/context/d3d_ctx.c" #include "../gfx/context/d3d_ctx.cpp"
#elif defined(ANDROID) #elif defined(ANDROID)
#include "../gfx/context/androidegl_ctx.c" #include "../gfx/context/androidegl_ctx.c"
#elif defined(__BLACKBERRY_QNX__) #elif defined(__BLACKBERRY_QNX__)

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

@ -225,7 +225,7 @@
<ClCompile Include="..\..\frontend\menu\menu_context.c" /> <ClCompile Include="..\..\frontend\menu\menu_context.c" />
<ClCompile Include="..\..\frontend\info\core_info.c" /> <ClCompile Include="..\..\frontend\info\core_info.c" />
<ClCompile Include="..\..\gfx\d3d9\d3d.cpp" /> <ClCompile Include="..\..\gfx\d3d9\d3d.cpp" />
<ClCompile Include="..\..\gfx\context\d3d_ctx.c" /> <ClCompile Include="..\..\gfx\context\d3d_ctx.cpp" />
<ClCompile Include="..\..\gfx\d3d9\render_chain.cpp" /> <ClCompile Include="..\..\gfx\d3d9\render_chain.cpp" />
<ClCompile Include="..\..\gfx\fonts\bitmapfont.c" /> <ClCompile Include="..\..\gfx\fonts\bitmapfont.c" />
<ClCompile Include="..\..\gfx\fonts\d3d_font.c" /> <ClCompile Include="..\..\gfx\fonts\d3d_font.c" />

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

@ -228,7 +228,7 @@
<ClCompile Include="..\..\frontend\info\core_info.c"> <ClCompile Include="..\..\frontend\info\core_info.c">
<Filter>frontend\menu\info</Filter> <Filter>frontend\menu\info</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\gfx\context\d3d_ctx.c"> <ClCompile Include="..\..\gfx\context\d3d_ctx.cpp">
<Filter>gfx\context</Filter> <Filter>gfx\context</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
@ -297,4 +297,4 @@
<UniqueIdentifier>{bc290b55-620e-4351-b3b8-4d7a0a3b8792}</UniqueIdentifier> <UniqueIdentifier>{bc290b55-620e-4351-b3b8-4d7a0a3b8792}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>