[MPlayer-cvslog] r26352 - in trunk: Makefile osdep osdep/Makefile

[Zuxy Meng]

Hi,

"diego" <subversion at mplayerhq.hu> 写入消息新闻:20080408182530.5AD2F3B3E2 at natsuki.mplayerhq.hu...
> Author: diego
> Date: Tue Apr  8 20:25:30 2008
> New Revision: 26352
>
> Log:
> Merge osdep/Makefile into the top-level Makefile, thus getting rid
> of recursive make in the osdep/ subdirectory.
>
>
> Removed:
>   trunk/osdep/Makefile
> Modified:
>   trunk/Makefile
>   trunk/osdep/   (props changed)
>
> Modified: trunk/Makefile
> ==============================================================================
> --- trunk/Makefile (original)
> +++ trunk/Makefile Tue Apr  8 20:25:30 2008
> @@ -33,7 +33,18 @@ SRCS_COMMON = asxparser.c \
>               subopt-helper.c \
>               subreader.c \
>               vobsub.c \
> +              osdep/$(GETCH) \
> +              osdep/$(TIMER) \
>
> +SRCS_COMMON-$(HAVE_SYS_MMAN_H)       += osdep/mmap_anon.c
> +SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += osdep/macosx_finder_args.c
> +SRCS_COMMON-$(NEED_GETTIMEOFDAY)     += osdep/gettimeofday.c
> +SRCS_COMMON-$(NEED_GLOB)             += osdep/glob-win.c
> +SRCS_COMMON-$(NEED_SETENV)           += osdep/setenv.c
> +SRCS_COMMON-$(NEED_SHMEM)            += osdep/shmem.c
> +SRCS_COMMON-$(NEED_STRSEP)           += osdep/strsep.c
> +SRCS_COMMON-$(NEED_SWAB)             += osdep/swab.c
> +SRCS_COMMON-$(NEED_VSSCANF)          += osdep/vsscanf.c
> SRCS_COMMON-$(UNRAR_EXEC) += unrar_exec.c
>
> SRCS_MPLAYER = mplayer.c \
> @@ -96,9 +107,6 @@ LIBS_MPLAYER-$(GUI)               += gui
> LIBS_MENCODER = libmpcodecs/libmpencoders.a \
>                 libmpdemux/libmpmux.a \
>
> -# Having this in libosdep.a is not enough.
> -OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o
> -

Why did u remove this line? The little logo is gone after this commit and 
r26388....

-- 
Zuxy