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

Merge pull request #1709 from heuripedes/master

Browse Source 
stuff
This commit is contained in:
Twinaphex 2015-05-19 20:16:20 +02:00
commit 337b37fc49
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -78,6 +78,12 @@ endif
RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ)) RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
RARCH_JOYCONFIG_OBJ := $(addprefix $(OBJDIR)/,$(JOYCONFIG_OBJ)) RARCH_JOYCONFIG_OBJ := $(addprefix $(OBJDIR)/,$(JOYCONFIG_OBJ))
ifneq ($(SANITIZER),)
CFLAGS := -fsanitize=$(SANITIZER) $(CFLAGS)
CXXFLAGS := -fsanitize=$(SANITIZER) $(CXXFLAGS)
LDFLAGS := -fsanitize=$(SANITIZER) $(LDLAGS)
endif
all: $(TARGET) $(JTARGET) config.mk all: $(TARGET) $(JTARGET) config.mk
-include $(RARCH_OBJ:.o=.d) $(RARCH_JOYCONFIG_OBJ:.o=.d) -include $(RARCH_OBJ:.o=.d) $(RARCH_JOYCONFIG_OBJ:.o=.d)

4
gfx/drivers_font/gl_raster_font.c
View File

@ -29,8 +29,8 @@
font_color[ 4 * (6 * i + c) + 1] = color[1]; \ font_color[ 4 * (6 * i + c) + 1] = color[1]; \
font_color[ 4 * (6 * i + c) + 2] = color[2]; \ font_color[ 4 * (6 * i + c) + 2] = color[2]; \
font_color[ 4 * (6 * i + c) + 3] = color[3]; \ font_color[ 4 * (6 * i + c) + 3] = color[3]; \
font_lut_tex_coord[ 4 * (6 * i + c) + 0] = gl->coords.lut_tex_coord[0]; \ font_lut_tex_coord[ 2 * (6 * i + c) + 0] = gl->coords.lut_tex_coord[0]; \
font_lut_tex_coord[ 4 * (6 * i + c) + 1] = gl->coords.lut_tex_coord[1]; \ font_lut_tex_coord[ 2 * (6 * i + c) + 1] = gl->coords.lut_tex_coord[1]; \
} while(0) } while(0)
#define MAX_MSG_LEN_CHUNK 64 #define MAX_MSG_LEN_CHUNK 64

2
retroarch.c
View File

@ -1117,7 +1117,7 @@ int rarch_main_init(int argc, char *argv[])
if (global->verbosity) if (global->verbosity)
{ {
char str[PATH_MAX_LENGTH]; char str[PATH_MAX_LENGTH] = {0};
RARCH_LOG_OUTPUT("=== Build ======================================="); RARCH_LOG_OUTPUT("=== Build =======================================");
rarch_info_get_capabilities(RARCH_CAPABILITIES_CPU, str, sizeof(str)); rarch_info_get_capabilities(RARCH_CAPABILITIES_CPU, str, sizeof(str));

9
runloop.c
View File

@ -948,19 +948,16 @@ void rarch_main_state_free(void)
void rarch_main_global_free(void) void rarch_main_global_free(void)
{ {
global_t *global = NULL;
event_command(EVENT_CMD_TEMPORARY_CONTENT_DEINIT); event_command(EVENT_CMD_TEMPORARY_CONTENT_DEINIT);
event_command(EVENT_CMD_SUBSYSTEM_FULLPATHS_DEINIT); event_command(EVENT_CMD_SUBSYSTEM_FULLPATHS_DEINIT);
event_command(EVENT_CMD_RECORD_DEINIT); event_command(EVENT_CMD_RECORD_DEINIT);
event_command(EVENT_CMD_LOG_FILE_DEINIT); event_command(EVENT_CMD_LOG_FILE_DEINIT);
global = global_get_ptr(); if (!g_extern)
if (!global)
return; return;
free(global); free(g_extern);
g_extern = NULL;
} }
bool rarch_main_verbosity(void) bool rarch_main_verbosity(void)