Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Sryder13 2014-08-30 14:09:25 +01:00
commit 0ee18be33b

View file

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