comparison src/Make_ming.mak @ 5537:805ad8488dc8 v7.4.117

updated for version 7.4.117 Problem: Can't build with Cygwin/MingW and Perl 5.18. Solution: Add a linker argument for the Perl library. (Cesar Romani) Adjust CFLAGS and LIB. (Cesar Romani) Move including inline.h further down. (Ken Takata)
author Bram Moolenaar <bram@vim.org>
date Wed, 11 Dec 2013 15:06:40 +0100
parents afbc9dd67cea
children 0defb460a0eb
comparison
equal deleted inserted replaced
5536:307513f44afe 5537:805ad8488dc8
357 #>>>>> end of choices 357 #>>>>> end of choices
358 ########################################################################### 358 ###########################################################################
359 359
360 CFLAGS = -Iproto $(DEFINES) -pipe -w -march=$(ARCH) -Wall 360 CFLAGS = -Iproto $(DEFINES) -pipe -w -march=$(ARCH) -Wall
361 WINDRES_FLAGS = --preprocessor="$(WINDRES_CC) -E -xc" -DRC_INVOKED 361 WINDRES_FLAGS = --preprocessor="$(WINDRES_CC) -E -xc" -DRC_INVOKED
362 EXTRA_LIBS =
362 363
363 ifdef GETTEXT 364 ifdef GETTEXT
364 DEFINES += -DHAVE_GETTEXT -DHAVE_LOCALE_H 365 DEFINES += -DHAVE_GETTEXT -DHAVE_LOCALE_H
365 GETTEXTINCLUDE = $(GETTEXT)/include 366 GETTEXTINCLUDE = $(GETTEXT)/include
366 GETTEXTLIB = $(INTLPATH) 367 GETTEXTLIB = $(INTLPATH)
375 endif 376 endif
376 endif 377 endif
377 endif 378 endif
378 379
379 ifdef PERL 380 ifdef PERL
380 CFLAGS += -I$(PERLLIBS) -DFEAT_PERL -L$(PERLLIBS) 381 CFLAGS += -I$(PERLLIBS) -DFEAT_PERL
381 ifeq (yes, $(DYNAMIC_PERL)) 382 ifeq (yes, $(DYNAMIC_PERL))
382 CFLAGS += -DDYNAMIC_PERL -DDYNAMIC_PERL_DLL=\"perl$(PERL_VER).dll\" 383 CFLAGS += -DDYNAMIC_PERL -DDYNAMIC_PERL_DLL=\"perl$(PERL_VER).dll\"
384 EXTRA_LIBS += -L$(PERLLIBS) -lperl$(PERL_VER)
383 endif 385 endif
384 endif 386 endif
385 387
386 ifdef LUA 388 ifdef LUA
387 CFLAGS += -I$(LUA)/include -DFEAT_LUA 389 CFLAGS += -I$(LUA)/include -DFEAT_LUA
630 endif 632 endif
631 endif 633 endif
632 634
633 ifdef PERL 635 ifdef PERL
634 ifeq (no, $(DYNAMIC_PERL)) 636 ifeq (no, $(DYNAMIC_PERL))
635 LIB += -lperl$(PERL_VER) 637 LIB += -L$(PERLLIBS) -lperl$(PERL_VER)
636 endif 638 endif
637 endif 639 endif
638 640
639 ifdef TCL 641 ifdef TCL
640 LIB += -L$(TCL)/lib 642 LIB += -L$(TCL)/lib