mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-05 15:40:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update d3d_set_osd_msg

Browse Source
This commit is contained in:
twinaphex 2014-11-09 20:27:51 +01:00
parent 54ca78fef7
commit bb327684aa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apple/iOS/Makefile
View File

@ -47,8 +47,8 @@ COMMON_FLAGS := -DIOS -DHAVE_GRIFFIN -DHAVE_LOCATION -DHAVE_RGUI -DHAVE_MENU -DH
COMMON_FLAGS += -DHAVE_CAMERA
COMMON_IOS_FLAGS := -Wno-deprecated-declarations -Wno-error
COMMON_IOS_OBJCFLAGS := -fobjc-arc
INCDIR := -I$(SRC_DIR) -I$(SRC_DIR)/libretro-sdk/include
retroarch_CFLAGS += $(COMMON_FLAGS) $(COMMON_IOS_FLAGS) $(COMMON_IOS_OBJCFLAGS) $(INCDIR)
retroarch_CCFLAGS += $(COMMON_FLAGS) $(COMMON_IOS_FLAGS) $(COMMON_IOS_OBJCFLAGS) $(INCDIR)
INCFLAGS := -I$(SRC_DIR) -I$(SRC_DIR)/libretro-sdk/include
retroarch_CFLAGS += $(COMMON_FLAGS) $(COMMON_IOS_FLAGS) $(COMMON_IOS_OBJCFLAGS) $(INCFLAGS)
retroarch_CCFLAGS += $(COMMON_FLAGS) $(COMMON_IOS_FLAGS) $(COMMON_IOS_OBJCFLAGS) $(INCFLAGS)
include $(THEOS_MAKE_PATH)/application.mk

2
gfx/d3d/d3d.cpp
View File

@ -461,7 +461,7 @@ static void d3d_apply_state_changes(void *data)
}
static void d3d_set_osd_msg(void *data, const char *msg,
const struct font_params *params)
const struct font_params *params, void *font)
{
d3d_video_t *d3d = (d3d_video_t*)data;