mirror of
https://github.com/mpv-player/mpv.git
synced 2026-10-29 07:06:59 +08:00
Move the generation of osdep/mplayer-rc.o back to the top-level Makefile,
having it as a part of osdep/libosdep.a is not enough. based on a patch by Zuxy Meng, zuxy.meng gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21489 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
@@ -68,6 +68,9 @@ LIBS_MENCODER = libmpcodecs/libmpencoders.a \
|
||||
OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
|
||||
OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
|
||||
|
||||
# Having this in libosdep.a is not enough.
|
||||
OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o
|
||||
|
||||
MPLAYER_DEPS = $(OBJS_MPLAYER) $(LIBS_MPLAYER) $(COMMON_LIBS)
|
||||
MENCODER_DEPS = $(OBJS_MENCODER) $(LIBS_MENCODER) $(COMMON_LIBS)
|
||||
|
||||
@@ -220,6 +223,9 @@ Gui/libgui.a:
|
||||
osdep/libosdep.a:
|
||||
$(MAKE) -C osdep
|
||||
|
||||
osdep/mplayer-rc.o:
|
||||
$(MAKE) -C osdep
|
||||
|
||||
input/libinput.a:
|
||||
$(MAKE) -C input
|
||||
|
||||
|
||||
@@ -15,7 +15,6 @@ SRCS= shmem.c \
|
||||
mmap_anon.c \
|
||||
|
||||
SRCS-$(MACOSX_FINDER_SUPPORT) += macosx_finder_args.c
|
||||
SRCS-$(TARGET_WIN32) += mplayer-rc.c
|
||||
|
||||
getch = getch2.c
|
||||
timer = timer-lx.c
|
||||
|
||||
Reference in New Issue
Block a user