diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-25 09:49:18 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-25 09:49:18 +0000 |
| commit | bfce0b673dcae28884ede5f948741748ec2359d2 (patch) | |
| tree | 37b7b089f4c80f956778b9d41e1b752944592f34 | |
| parent | 983f114b7f263eafd0ad6e7e36c24cc223402bce (diff) | |
| download | mpv-bfce0b673dcae28884ede5f948741748ec2359d2.tar.bz2 mpv-bfce0b673dcae28884ede5f948741748ec2359d2.tar.xz | |
Move osdep/mplayer.rc handling to the osdep Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21205 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | osdep/Makefile | 6 |
2 files changed, 6 insertions, 6 deletions
@@ -153,9 +153,6 @@ ifeq ($(LIBMENU),yes) 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 @@ mplayer$(EXESUF): $(MPLAYER_DEPS) 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 --git a/osdep/Makefile b/osdep/Makefile index abd38716b1..20264df958 100644 --- a/osdep/Makefile +++ b/osdep/Makefile @@ -20,6 +20,9 @@ timer = timer-lx.c 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 @@ CFLAGS = -I. -I.. $(OPTFLAGS) .c.o: $(CC) -c $(CFLAGS) -o $@ $< +mplayer-rc.o: mplayer.rc + windres -o $@ $< + $(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) $(RANLIB) $(LIBNAME) |