diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-09-14 10:49:46 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-09-14 10:49:46 +0200 |
| commit | 612af43cb64d06a57211200296068f3f10126ce0 (patch) | |
| tree | aa798778418559cbb8a32dd34ec8694f32ec9caa | |
| parent | 9f1188152f06e925e1272a9588fb9b95d8344a75 (diff) | |
| download | vim-git-612af43cb64d06a57211200296068f3f10126ce0.tar.gz | |
updated for version 7.3.304v7.3.304
Problem: Strawberry Perl doesn't work on MS-Windows.
Solution: Use xsubpp if needed. (Yasuhiro Matsumoto)
| -rw-r--r-- | src/Make_ming.mak | 9 | ||||
| -rw-r--r-- | src/Make_mvc.mak | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 16 insertions, 2 deletions
diff --git a/src/Make_ming.mak b/src/Make_ming.mak index aa5cf0067..88f37f67e 100644 --- a/src/Make_ming.mak +++ b/src/Make_ming.mak @@ -108,6 +108,13 @@ endif # on NT, it's here: PERLLIB=$(PERL)/lib 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 # uncomment 'LUA' if you want a Lua-enabled version @@ -696,7 +703,7 @@ ifeq (16, $(RUBY)) endif if_perl.c: if_perl.xs typemap - perl $(PERLLIB)/ExtUtils/xsubpp -prototypes -typemap \ + $(XSUBPP) -prototypes -typemap \ $(PERLLIB)/ExtUtils/typemap if_perl.xs > $@ $(OUTDIR)/netbeans.o: netbeans.c $(INCL) $(NBDEBUG_INCL) $(NBDEBUG_SRC) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 88f092bfa..e3aba828c 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -785,6 +785,11 @@ PERL_EXE = $(PERL)\Bin$(PERL_ARCH)\perl PERL_INC = /I $(PERL_INCDIR) PERL_OBJ = $(OUTDIR)\if_perl.obj $(OUTDIR)\if_perlsfio.obj XSUBPP = $(PERL)\lib\ExtUtils\xsubpp +!if exist($(XSUBPP) +XSUBPP = $(PERL_EXE) $(XSUBPP) +!else +XSUBPP = xsubpp +!endif XSUBPP_TYPEMAP = $(PERL)\lib\ExtUtils\typemap !endif @@ -1041,7 +1046,7 @@ $(OUTDIR)/if_lua.obj: $(OUTDIR) if_lua.c $(INCL) $(CC) $(CFLAGS) $(LUA_INC) if_lua.c 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 $(OUTDIR)/if_perl.obj: $(OUTDIR) if_perl.c $(INCL) diff --git a/src/version.c b/src/version.c index a162e234f..77a1e2a36 100644 --- a/src/version.c +++ b/src/version.c @@ -710,6 +710,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 304, +/**/ 303, /**/ 302, |