[MPlayer-cvslog] r21306 - in trunk: help/help_mp-en.h loader/Makefile loader/ldt_keeper.c loader/module.c loader/stubs.S loader/stubs.s loader/wine/poppack.h mp_msg.h

[Reimar Döffinger]

Hello,
On Mon, Nov 27, 2006 at 03:44:07AM +0100, nplourde wrote:
> Modified: trunk/loader/Makefile
> ==============================================================================
> --- trunk/loader/Makefile	(original)
> +++ trunk/loader/Makefile	Mon Nov 27 03:44:06 2006
> @@ -8,7 +8,12 @@
>  SRCS= driver.c afl.c vfl.c
>  ifneq ($(TARGET_WIN32),yes)
>  SRCS+= ldt_keeper.c pe_image.c module.c ext.c win32.c \
> -       pe_resource.c resource.c registry.c elfdll.c wrapper.S stubs.s
> +       pe_resource.c resource.c registry.c elfdll.c stubs.S
> +endif
> +
> +# QTX emulation is not supported in Darwin
> +ifneq ($(TARGET_OS),Darwin)
> +SRCS+= wrapper.S
>  endif

This breaks compilation on windows, wrapper.S just like the other loader
stuff is not supposed to be compiled there.

Greetings,
Reimar Döffinger