Yessiest
/
libretro-mpv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix linking errors 

Now this actually compiles.

Signed-off-by: Mahyar Koshkouei <mahyar.koshkouei@gmail.com>
This commit is contained in:
Mahyar Koshkouei 2017-12-28 19:19:44 +00:00
parent 4a20f83572
commit 7346cea266
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -104,7 +104,7 @@ else
SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=link.T -Wl,--no-undefined SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=link.T -Wl,--no-undefined
endif endif
LDFLAGS += $(LIBM) -lmpv LDFLAGS += $(LIBM) -lmpv -lGL
LIBRETRO-COM = -Ilibretro-common/include LIBRETRO-COM = -Ilibretro-common/include
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
@ -113,7 +113,7 @@ else
CFLAGS += -O3 CFLAGS += -O3
endif endif
OBJECTS := mpv-libretro.o libretro-common/glsm/glsm.o libretro-common/gfx/gl_capabilities.o OBJECTS := mpv-libretro.o libretro-common/glsym/rglgen.o libretro-common/glsm/glsm.o
CFLAGS += -Wall -pedantic $(LIBRETRO-COM) $(fpic) CFLAGS += -Wall -pedantic $(LIBRETRO-COM) $(fpic)
ifeq ($(GLES), 1) ifeq ($(GLES), 1)

18
mpv-libretro.c
View File

@ -38,16 +38,6 @@ static void fallback_log(enum retro_log_level level, const char *fmt, ...)
va_end(va); va_end(va);
} }
void *VidExt_GL_GetProcAddress(const char* Proc)
{
glsm_ctx_proc_address_t proc_info;
proc_info.addr = NULL;
if (!glsm_ctl(GLSM_CTL_PROC_ADDRESS_GET, NULL))
return NULL;
return proc_info.addr(Proc);
}
void retro_init(void) void retro_init(void)
{ {
return; return;
@ -244,8 +234,12 @@ bool retro_unserialize(const void *data_, size_t size)
static void *get_proc_address_mpv(void *fn_ctx, const char *name) static void *get_proc_address_mpv(void *fn_ctx, const char *name)
{ {
printf("name: %s\n", name); printf("name: %s\n", name);
return hw_render.get_proc_address(name); glsm_ctx_proc_address_t proc_info;
// return proc_cb(name); proc_info.addr = NULL;
if (!glsm_ctl(GLSM_CTL_PROC_ADDRESS_GET, NULL))
return NULL;
return proc_info.addr(name);
} }
bool retro_load_game(const struct retro_game_info *info) bool retro_load_game(const struct retro_game_info *info)