mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
updated for version 7.3.304
Problem: Strawberry Perl doesn't work on MS-Windows. Solution: Use xsubpp if needed. (Yasuhiro Matsumoto)
This commit is contained in:
@@ -108,6 +108,13 @@ endif
|
|||||||
# on NT, it's here:
|
# on NT, it's here:
|
||||||
PERLLIB=$(PERL)/lib
|
PERLLIB=$(PERL)/lib
|
||||||
PERLLIBS=$(PERLLIB)/Core
|
PERLLIBS=$(PERLLIB)/Core
|
||||||
|
XSUBPP=$(PERLLIB)/ExtUtils/xsubpp
|
||||||
|
XSUBPP_EXISTS=$(shell perl -e "print 1 unless -e '$(XSUBPP)'")
|
||||||
|
ifeq "$(XSUBPP_EXISTS)" ""
|
||||||
|
XSUBPP=perl $(XSUBPP)
|
||||||
|
else
|
||||||
|
XSUBPP=xsubpp
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# uncomment 'LUA' if you want a Lua-enabled version
|
# uncomment 'LUA' if you want a Lua-enabled version
|
||||||
@@ -696,7 +703,7 @@ ifeq (16, $(RUBY))
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
if_perl.c: if_perl.xs typemap
|
if_perl.c: if_perl.xs typemap
|
||||||
perl $(PERLLIB)/ExtUtils/xsubpp -prototypes -typemap \
|
$(XSUBPP) -prototypes -typemap \
|
||||||
$(PERLLIB)/ExtUtils/typemap if_perl.xs > $@
|
$(PERLLIB)/ExtUtils/typemap if_perl.xs > $@
|
||||||
|
|
||||||
$(OUTDIR)/netbeans.o: netbeans.c $(INCL) $(NBDEBUG_INCL) $(NBDEBUG_SRC)
|
$(OUTDIR)/netbeans.o: netbeans.c $(INCL) $(NBDEBUG_INCL) $(NBDEBUG_SRC)
|
||||||
|
@@ -785,6 +785,11 @@ PERL_EXE = $(PERL)\Bin$(PERL_ARCH)\perl
|
|||||||
PERL_INC = /I $(PERL_INCDIR)
|
PERL_INC = /I $(PERL_INCDIR)
|
||||||
PERL_OBJ = $(OUTDIR)\if_perl.obj $(OUTDIR)\if_perlsfio.obj
|
PERL_OBJ = $(OUTDIR)\if_perl.obj $(OUTDIR)\if_perlsfio.obj
|
||||||
XSUBPP = $(PERL)\lib\ExtUtils\xsubpp
|
XSUBPP = $(PERL)\lib\ExtUtils\xsubpp
|
||||||
|
!if exist($(XSUBPP)
|
||||||
|
XSUBPP = $(PERL_EXE) $(XSUBPP)
|
||||||
|
!else
|
||||||
|
XSUBPP = xsubpp
|
||||||
|
!endif
|
||||||
XSUBPP_TYPEMAP = $(PERL)\lib\ExtUtils\typemap
|
XSUBPP_TYPEMAP = $(PERL)\lib\ExtUtils\typemap
|
||||||
|
|
||||||
!endif
|
!endif
|
||||||
@@ -1041,7 +1046,7 @@ $(OUTDIR)/if_lua.obj: $(OUTDIR) if_lua.c $(INCL)
|
|||||||
$(CC) $(CFLAGS) $(LUA_INC) if_lua.c
|
$(CC) $(CFLAGS) $(LUA_INC) if_lua.c
|
||||||
|
|
||||||
if_perl.c : if_perl.xs typemap
|
if_perl.c : if_perl.xs typemap
|
||||||
$(PERL_EXE) $(XSUBPP) -prototypes -typemap $(XSUBPP_TYPEMAP) \
|
$(XSUBPP) -prototypes -typemap $(XSUBPP_TYPEMAP) \
|
||||||
-typemap typemap if_perl.xs > if_perl.c
|
-typemap typemap if_perl.xs > if_perl.c
|
||||||
|
|
||||||
$(OUTDIR)/if_perl.obj: $(OUTDIR) if_perl.c $(INCL)
|
$(OUTDIR)/if_perl.obj: $(OUTDIR) if_perl.c $(INCL)
|
||||||
|
@@ -709,6 +709,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
304,
|
||||||
/**/
|
/**/
|
||||||
303,
|
303,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user