Mercurial > mplayer.hg

changeset 21189:40bb3d20a10b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move osdep/mplayer.rc handling to the osdep Makefile.
author diego
date Sat, 25 Nov 2006 09:49:18 +0000
parents 4906844e35c8
children 1feb8af493d6
files Makefile osdep/Makefile
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sat Nov 25 01:28:49 2006 +0000
+++ b/Makefile	Sat Nov 25 09:49:18 2006 +0000
@@ -153,9 +153,6 @@
 LIBS_MPLAYER += libmenu/libmenu.a
 PARTS += libmenu
 endif
-ifeq ($(TARGET_WIN32),yes)
-OBJS_MPLAYER += osdep/mplayer-rc.o
-endif
 
 COMMON_LIBS += osdep/libosdep.a
 
@@ -266,9 +263,6 @@
 mencoder$(EXESUF): $(MENCODER_DEPS)
 	$(CC) -o $@ $^ $(LDFLAGS_MENCODER)
 
-osdep/mplayer-rc.o: osdep/mplayer.rc
-	windres -o $@ osdep/mplayer.rc
-
 codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
 	$(HOST_CC) -I. -DCODECS2HTML codec-cfg.c -o $@
 
--- a/osdep/Makefile	Sat Nov 25 01:28:49 2006 +0000
+++ b/osdep/Makefile	Sat Nov 25 09:49:18 2006 +0000
@@ -20,6 +20,9 @@
 ifeq ($(MACOSX_FINDER_SUPPORT),yes)
 SRCS += macosx_finder_args.c
 endif
+ifeq ($(TARGET_WIN32),yes)
+SRCS += osdep/mplayer-rc.c
+endif
 ifeq ($(TARGET_OS),Darwin)
 timer = timer-darwin.c
 endif
@@ -46,6 +49,9 @@
 .c.o:
 	$(CC) -c $(CFLAGS) -o $@ $<
 
+mplayer-rc.o: mplayer.rc
+	windres -o $@ $<
+
 $(LIBNAME):     $(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
 	$(RANLIB) $(LIBNAME)