Merge branch 'master' into next

This commit is contained in:
Alam Ed Arias 2014-09-05 20:23:23 -04:00
commit cd1ab74bcd

View file

@ -386,7 +386,7 @@ OBJDUMP_OPTS?=--wide --source --line-numbers
LD=$(CC)
ifdef SDL
INTERFACE=sdl2
INTERFACE=sdl
OBJDIR:=$(OBJDIR)/SDL
endif