makefiles now use exetype.pl to make wperl.exe

p4raw-id: //depot/perl@5017

diff --git a/sv.c b/sv.c
index 29bf2fb..350373b 100644 (file)
--- a/sv.c
+++ b/sv.c
@@ -5908,7 +5908,7 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
                        STRLEN off = vptr - (U8*)SvPVX(vsv);
                        vlen *= 2;
                        SvGROW(vsv, vlen);
-                       vptr = SvPVX(vsv) + off;
+                       vptr = (U8*)SvPVX(vsv) + off;
                    }
                    do {
                        *--eptr = '0' + uv % 10;

diff --git a/win32/Makefile b/win32/Makefile
index e4f3d86..9fe26a8 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -854,7 +854,7 @@ $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_RES)
        $(LINK32) -subsystem:console -out:$@ $(LINK_FLAGS) $(LIBFILES) \
            $(PERLEXE_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) $(PERLEXE_RES)
        copy $(PERLEXE) $(WPERLEXE)
-       editbin /subsystem:windows $(WPERLEXE)
+       $(MINIPERL) -I..\lib bin\exetype.pl $(WPERLEXE) WINDOWS
        copy splittree.pl .. 
        $(MINIPERL) -I..\lib ..\splittree.pl "../LIB" $(AUTODIR)
 

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 6d13e10..261feb6 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1094,9 +1094,9 @@ $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_RES)
 .ELSE
        $(LINK32) -subsystem:console -out:$@ $(BLINK_FLAGS) $(LIBFILES) \
            $(PERLEXE_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) $(PERLEXE_RES)
-       copy $(PERLEXE) $(WPERLEXE)
-       editbin /subsystem:windows $(WPERLEXE)
 .ENDIF
+       copy $(PERLEXE) $(WPERLEXE)
+       $(MINIPERL) -I..\lib bin\exetype.pl $(WPERLEXE) WINDOWS
        copy splittree.pl .. 
        $(MINIPERL) -I..\lib ..\splittree.pl "../LIB" $(AUTODIR)