Author: diego Date: Sat Nov 25 10:49:18 2006 New Revision: 21205 Modified: trunk/Makefile trunk/osdep/Makefile Log: Move osdep/mplayer.rc handling to the osdep Makefile. Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Sat Nov 25 10:49:18 2006 @@ -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 $@ Modified: trunk/osdep/Makefile ============================================================================== --- trunk/osdep/Makefile (original) +++ trunk/osdep/Makefile Sat Nov 25 10:49:18 2006 @@ -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)