# HG changeset patch # User diego # Date 1164448158 0 # Node ID 40bb3d20a10b986db03ebcabc4d6cce9144b35f8 # Parent 4906844e35c8f0d1ed2824c050264b8481d2e57a Move osdep/mplayer.rc handling to the osdep Makefile. diff -r 4906844e35c8 -r 40bb3d20a10b Makefile --- 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 $@ diff -r 4906844e35c8 -r 40bb3d20a10b osdep/Makefile --- 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)