Put osdcore.o into libutil.a to avoid linking errors on debug builds.

This is a workaround. All osd_printf functions are in reality core
functions given they are built around delegates and abuse delegates
heavily. Therefore they should be moved to util at some point. (nw)
This commit is contained in:
couriersud 2015-01-17 15:32:40 +01:00
parent d061d9594c
commit 0c10c6794e
3 changed files with 1 additions and 2 deletions

View File

@ -39,6 +39,7 @@ OBJDIRS += \
#-------------------------------------------------
UTILOBJS = \
$(OSDOBJ)/osdcore.o \
$(LIBOBJ)/util/astring.o \
$(LIBOBJ)/util/avhuff.o \
$(LIBOBJ)/util/aviio.o \

View File

@ -404,7 +404,6 @@ OBJDIRS += $(SDLOBJ) \
#-------------------------------------------------
OSDCOREOBJS = \
$(OSDOBJ)/osdcore.o \
$(SDLOBJ)/strconv.o \
$(SDLOBJ)/sdldir.o \
$(SDLOBJ)/sdlfile.o \

View File

@ -344,7 +344,6 @@ LIBS += -lcomdlg32
#-------------------------------------------------
OSDCOREOBJS = \
$(OSDOBJ)/osdcore.o \
$(WINOBJ)/main.o \
$(WINOBJ)/strconv.o \
$(WINOBJ)/windir.o \