# HG changeset patch # User Daniel Atallah # Date 1268431200 0 # Node ID 1d6b962dea922fd68b16377efef2ae999052e514 # Parent 63ef8a27aee5626a7c136db1323bb4d50916e451 Use ExtUtils::ParseXS instead of the xsubpp script to generate C source for XS files on Windows (avoids us needing to know where Perl is installed) diff -r 63ef8a27aee5 -r 1d6b962dea92 libpurple/plugins/perl/common/Makefile.mingw --- a/libpurple/plugins/perl/common/Makefile.mingw Fri Mar 12 21:10:05 2010 +0000 +++ b/libpurple/plugins/perl/common/Makefile.mingw Fri Mar 12 22:00:00 2010 +0000 @@ -13,7 +13,6 @@ TARGET = Purple AUTOSPLIT = lib/auto/Purple/autosplit.ix -EXTUTILS ?= C:/perl/lib/ExtUtils PERL_PLUGIN_TOP := .. ## diff -r 63ef8a27aee5 -r 1d6b962dea92 libpurple/win32/rules.mak --- a/libpurple/win32/rules.mak Fri Mar 12 21:10:05 2010 +0000 +++ b/libpurple/win32/rules.mak Fri Mar 12 22:00:00 2010 +0000 @@ -4,7 +4,7 @@ $(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $< %.c: %.xs - $(PERL) $(EXTUTILS)/xsubpp -typemap $(EXTUTILS)/typemap -typemap $(PURPLE_PERL_TOP)/common/typemap $< > $@ + $(PERL) -MExtUtils::ParseXS -e 'ExtUtils::ParseXS::process_file(filename => "$<", output => "$@", typemap => "$(PURPLE_PERL_TOP)/common/typemap");' %.o: %.rc $(WINDRES) -I$(PURPLE_TOP) -i $< -o $@ diff -r 63ef8a27aee5 -r 1d6b962dea92 pidgin/plugins/perl/common/Makefile.mingw --- a/pidgin/plugins/perl/common/Makefile.mingw Fri Mar 12 21:10:05 2010 +0000 +++ b/pidgin/plugins/perl/common/Makefile.mingw Fri Mar 12 22:00:00 2010 +0000 @@ -12,7 +12,6 @@ DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES)) TARGET = Pidgin -EXTUTILS ?= C:/perl/lib/ExtUtils ## ## INCLUDE PATHS