Hello all.

A while back, the mingw Makefile was split into two: Make_ming.mak and Make_cyg_ming.mak. The first of the two files has definitions for CFLAGS and WINRES_FLAGS; Make_cyg_ming.mak is then included and those two make variables are reinitialized (just below "end of choices"). In effect. their values are lost and consequently not used.

Since Make_cyg_ming.mak is sourced by Make_cyg.mak as well, you don't want to put Windows specific values in the common file. I suggest the following changes.

In Make_ming.mak, replace the following lines:

       ifeq ($(ARCH),x86-64)
        CFLAGS += -m64
        WINDRES_FLAGS += --target=pe-x86-64
    else
        CFLAGS += -m32
       WINDRES_FLAGS += --target=pe-i386
    endif

with these lines:

    ifeq ($(ARCH),x86-64)
        CFLAGS_EXTRA += -m64
        WINDRES_FLAGS_EXTRA += --target=pe-x86-64
    else
        CFLAGS_EXTRA += -m32
        WINDRES_FLAGS_EXTRA += --target=pe-i386
    endif

In Make_cyg_ming.mak, insert the following lines just before the "all" target:

    # Apply any modifications/additions supplied by the caller.
    #
    CFLAGS += $(CFLAGS_EXTRA)
    WINDRES_FLAGS += $(WINDRES_FLAGS_EXTRA)

This allows the calling Makefile, in this case Make_ming.mak, to pass whatever it likes to Make_cyg_ming.mak without ever having to change the shared file. It also provides a nice way of overriding settings specified in the shared Makefile.

Mike

--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- You received this message because you are subscribed to the Google Groups "vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Raspunde prin e-mail lui