Mercurial > mplayer.hg
changeset 35901:243a307dccbd
build: Split mp_msg-related object files and link libraries.
This avoids a host of problems when GNU Make starts mucking with -l flags.
| author | diego |
|---|---|
| date | Sun, 17 Mar 2013 22:20:59 +0000 |
| parents | 01ed7a1aec2d |
| children | 681e44b3b0ec |
| files | Makefile |
| diffstat | 1 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sun Mar 17 22:20:57 2013 +0000 +++ b/Makefile Sun Mar 17 22:20:59 2013 +0000 @@ -797,7 +797,7 @@ ./$< `$(CC) -dumpversion` %$(EXESUF): %.c - $(CC) $(CC_DEPFLAGS) $(CFLAGS) -o $@ $^ + $(CC) $(CC_DEPFLAGS) $(CFLAGS) -o $@ $^ $(LIBS) %.ho: %.h $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $< @@ -1009,11 +1009,13 @@ ###### tests / tools ####### -TEST_OBJS = mp_msg.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm +MP_MSG_LIBS = -ltermcap -lm +MP_MSG_OBJS = mp_msg.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -libvo/aspecttest$(EXESUF): libvo/aspect.o libvo/geometry.o $(TEST_OBJS) +libvo/aspecttest$(EXESUF): libvo/aspect.o libvo/geometry.o $(MP_MSG_OBJS) +libvo/aspecttest$(EXESUF): LIBS = $(MP_MSG_LIBS) -LOADER_TEST_OBJS = $(SRCS_WIN32_EMULATION:.c=.o) $(SRCS_QTX_EMULATION:.S=.o) ffmpeg/libavutil/libavutil.a osdep/mmap_anon.o cpudetect.o path.o $(TEST_OBJS) +LOADER_TEST_OBJS = $(SRCS_WIN32_EMULATION:.c=.o) $(SRCS_QTX_EMULATION:.S=.o) ffmpeg/libavutil/libavutil.a osdep/mmap_anon.o cpudetect.o path.o $(MP_MSG_OBJS) loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS) @@ -1047,7 +1049,8 @@ TOOLS/bmovl-test$(EXESUF): -lSDL_image TOOLS/subrip$(EXESUF): path.o sub/vobsub.o sub/spudec.o sub/unrar_exec.o \ - ffmpeg/libswscale/libswscale.a ffmpeg/libavutil/libavutil.a $(TEST_OBJS) + ffmpeg/libswscale/libswscale.a ffmpeg/libavutil/libavutil.a $(MP_MSG_OBJS) +TOOLS/subrip$(EXESUF): LIBS = $(MP_MSG_LIBS) TOOLS/vfw2menc$(EXESUF): -lwinmm -lole32