summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--osdep/Makefile1
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 3348f9273c..5aa871c821 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/osdep/Makefile b/osdep/Makefile
index 005bf0033e..0040ffd4ad 100644
--- a/osdep/Makefile
+++ b/osdep/Makefile
@@ -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