diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-11-05 13:43:21 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-11-05 13:43:21 +0100 |
| commit | 666578b53964cc34f2e9fc65c89612f063a5f3c5 (patch) | |
| tree | 6199732a33b24ea7c7e5f8cf3b844556bb63dcd6 /src/Make_cyg.mak | |
| parent | eda73607a73fe5ff07eb52981df19c5bae129f70 (diff) | |
| download | vim-git-666578b53964cc34f2e9fc65c89612f063a5f3c5.tar.gz | |
updated for version 7.4.495v7.4.495
Problem: XPM isn't used correctly in the Cygwin Makefile.
Solution: Include the rules like in Make_ming.mak. (Ken Takata)
Diffstat (limited to 'src/Make_cyg.mak')
| -rw-r--r-- | src/Make_cyg.mak | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak index abd35a6a4..ff40548df 100644 --- a/src/Make_cyg.mak +++ b/src/Make_cyg.mak @@ -485,13 +485,32 @@ USE_STDCPLUS = yes endif ############################## +ifndef XPM +ifeq ($(ARCH),i386) +XPM = xpm/x86 +endif +ifeq ($(ARCH),i486) +XPM = xpm/x86 +endif +ifeq ($(ARCH),i586) +XPM = xpm/x86 +endif +ifeq ($(ARCH),i686) +XPM = xpm/x86 +endif +ifeq ($(ARCH),x86-64) +XPM = xpm/x64 +endif +endif +ifdef XPM ifneq ($(XPM),no) # Only allow XPM for a GUI build. DEFINES += -DFEAT_XPM_W32 -INCLUDES += -I$(XPM)/include +INCLUDES += -I$(XPM)/include -I$(XPM)/../include EXTRA_OBJS += $(OUTDIR)/xpm_w32.o EXTRA_LIBS += -L$(XPM)/lib -lXpm endif +endif ############################## EXE = gvim$(DEBUG_SUFFIX).exe |