Mercurial > vim

comparison src/Make_cyg.mak @ 6324:0079791cbbea v7.4.495

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.495 Problem: XPM isn't used correctly in the Cygwin Makefile. Solution: Include the rules like in Make_ming.mak. (Ken Takata)
author Bram Moolenaar <bram@vim.org>
date Wed, 05 Nov 2014 13:43:21 +0100
parents 4c29b75cae19
children 112c80234ce3
comparison
equal deleted inserted replaced
6323:e44cc6d0ab4f 6324:0079791cbbea
483 EXTRA_LIBS += -ld2d1 -ldwrite 483 EXTRA_LIBS += -ld2d1 -ldwrite
484 USE_STDCPLUS = yes 484 USE_STDCPLUS = yes
485 endif 485 endif
486 486
487 ############################## 487 ##############################
488 ifndef XPM
489 ifeq ($(ARCH),i386)
490 XPM = xpm/x86
491 endif
492 ifeq ($(ARCH),i486)
493 XPM = xpm/x86
494 endif
495 ifeq ($(ARCH),i586)
496 XPM = xpm/x86
497 endif
498 ifeq ($(ARCH),i686)
499 XPM = xpm/x86
500 endif
501 ifeq ($(ARCH),x86-64)
502 XPM = xpm/x64
503 endif
504 endif
505 ifdef XPM
488 ifneq ($(XPM),no) 506 ifneq ($(XPM),no)
489 # Only allow XPM for a GUI build. 507 # Only allow XPM for a GUI build.
490 DEFINES += -DFEAT_XPM_W32 508 DEFINES += -DFEAT_XPM_W32
491 INCLUDES += -I$(XPM)/include 509 INCLUDES += -I$(XPM)/include -I$(XPM)/../include
492 EXTRA_OBJS += $(OUTDIR)/xpm_w32.o 510 EXTRA_OBJS += $(OUTDIR)/xpm_w32.o
493 EXTRA_LIBS += -L$(XPM)/lib -lXpm 511 EXTRA_LIBS += -L$(XPM)/lib -lXpm
512 endif
494 endif 513 endif
495 514
496 ############################## 515 ##############################
497 EXE = gvim$(DEBUG_SUFFIX).exe 516 EXE = gvim$(DEBUG_SUFFIX).exe
498 OUTDIR = gobj$(DEBUG_SUFFIX) 517 OUTDIR = gobj$(DEBUG_SUFFIX)