diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-12-11 15:06:40 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-12-11 15:06:40 +0100 |
| commit | 6b10721fa2d883540c1c106ef26fff8abed0ac43 (patch) | |
| tree | 79352396c28845a119c083f6980e88f7c2cb0c51 /src/Make_ming.mak | |
| parent | 7ba0741451d8eea497fba07ca2bbf6fae107a6a6 (diff) | |
| download | vim-git-6b10721fa2d883540c1c106ef26fff8abed0ac43.tar.gz | |
updated for version 7.4.117v7.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)
Diffstat (limited to 'src/Make_ming.mak')
| -rw-r--r-- | src/Make_ming.mak | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Make_ming.mak b/src/Make_ming.mak index 7aa3994d4..0b1935fde 100644 --- a/src/Make_ming.mak +++ b/src/Make_ming.mak @@ -359,6 +359,7 @@ WINDRES_CC = $(CC) CFLAGS = -Iproto $(DEFINES) -pipe -w -march=$(ARCH) -Wall WINDRES_FLAGS = --preprocessor="$(WINDRES_CC) -E -xc" -DRC_INVOKED +EXTRA_LIBS = ifdef GETTEXT DEFINES += -DHAVE_GETTEXT -DHAVE_LOCALE_H @@ -377,9 +378,10 @@ endif endif ifdef PERL -CFLAGS += -I$(PERLLIBS) -DFEAT_PERL -L$(PERLLIBS) +CFLAGS += -I$(PERLLIBS) -DFEAT_PERL ifeq (yes, $(DYNAMIC_PERL)) CFLAGS += -DDYNAMIC_PERL -DDYNAMIC_PERL_DLL=\"perl$(PERL_VER).dll\" +EXTRA_LIBS += -L$(PERLLIBS) -lperl$(PERL_VER) endif endif @@ -632,7 +634,7 @@ endif ifdef PERL ifeq (no, $(DYNAMIC_PERL)) -LIB += -lperl$(PERL_VER) +LIB += -L$(PERLLIBS) -lperl$(PERL_VER) endif endif |