CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-21 20:22:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix MinGW compile.

Browse Source
This commit is contained in:
Themaister 2014-01-22 16:38:42 +01:00
parent 8c9e1a5f5c
commit 6c5d481f2d
6 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.win
View File

@ -142,7 +142,7 @@ else
endif
ifeq ($(HAVE_D3D9), 1)
OBJ += gfx/d3d9/d3d.o gfx/d3d9/d3d9_pc.o gfx/d3d9/render_chain.o
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
DEFINES += -DHAVE_WIN32_D3D9
LIBS += -ld3d9 -lcg -lcgD3D9 -ld3dx9 -ldxguid
endif

4
gfx/d3d9/d3d.cpp
View File

@ -26,8 +26,6 @@
#include "../../compat/posix_string.h"
#include "../../performance.h"
static void d3d_render_msg(void *data, const char *msg, void *userdata);
#ifndef _XBOX
#define HAVE_MONITOR
#define HAVE_WINDOW
@ -1139,4 +1137,4 @@ const video_driver_t video_d3d = {
d3d_get_overlay_interface,
#endif
d3d_get_poke_interface
};
};

8
gfx/fonts/d3d_font.h
View File

@ -19,6 +19,10 @@
#include <stdint.h>
#include "../../boolean.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct d3d_font_renderer
{
bool (*init)(void *data, const char *font_path, unsigned font_size);
@ -34,5 +38,9 @@ extern const d3d_font_renderer_t d3d_win32_font;
const d3d_font_renderer_t *d3d_font_init_first(void *data,
const char *font_path, unsigned font_size);
#ifdef __cplusplus
}
#endif
#endif

0
gfx/fonts/d3d_w32_font.c → gfx/fonts/d3d_w32_font.cpp
View File

8
gfx/gfx_context.h
View File

@ -23,6 +23,10 @@
#include "../config.h"
#endif
#ifdef __cplusplus
extern "C" {
#endif
#define MAX_EGLIMAGE_TEXTURES 32
enum gfx_ctx_api
@ -115,5 +119,9 @@ extern const gfx_ctx_driver_t gfx_ctx_null;
const gfx_ctx_driver_t *gfx_ctx_find_driver(const char *ident); // Finds driver with ident. Does not initialize.
const gfx_ctx_driver_t *gfx_ctx_init_first(enum gfx_ctx_api api, unsigned major, unsigned minor); // Finds first suitable driver and initializes.
#ifdef __cplusplus
}
#endif
#endif

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

@ -227,7 +227,7 @@
<ClCompile Include="..\..\gfx\d3d9\render_chain.cpp" />
<ClCompile Include="..\..\gfx\fonts\bitmapfont.c" />
<ClCompile Include="..\..\gfx\fonts\d3d_font.c" />
<ClCompile Include="..\..\gfx\fonts\d3d_w32_font.c" />
<ClCompile Include="..\..\gfx\fonts\d3d_w32_font.cpp" />
<ClCompile Include="..\..\gfx\fonts\fonts.c" />
<ClCompile Include="..\..\gfx\fonts\gl_font.c" />
<ClCompile Include="..\..\gfx\fonts\gl_raster_font.c" />
@ -331,4 +331,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>