regen win32/config*, up version numbers &c.

[p5sagit/p5-mst-13.2.git] / win32 / Makefile

diff --git a/win32/Makefile b/win32/Makefile
index 321d341..d96da84 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -29,7 +29,7 @@ INST_TOP      = $(INST_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-INST_VER       = \5.5.670
+INST_VER       = \5.6.0
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -294,7 +294,7 @@ ARCHNAME    = $(ARCHNAME)-thread
 
 # VC 6.0 can load the socket dll on demand.  Makes the test suite
 # run in about 10% less time.
-DELAYLOAD      = -DELAYLOAD:wsock32.dll delayimp.lib 
+DELAYLOAD      = -DELAYLOAD:wsock32.dll -DELAYLOAD:shell32.dll delayimp.lib 
 
 # VC 6.0 seems capable of compiling perl correctly with optimizations
 # enabled.  Anything earlier fails tests.
@@ -535,11 +535,8 @@ EXTRACORE_SRC      = $(EXTRACORE_SRC) ..\perlio.c
 
 WIN32_SRC      =               \
                .\win32.c       \
-               .\win32sck.c
-
-!IF "$(USE_5005THREADS)" == "define"
-WIN32_SRC      = $(WIN32_SRC) .\win32thread.c 
-!ENDIF
+               .\win32sck.c    \
+               .\win32thread.c 
 
 !IF "$(CRYPT_SRC)" != ""
 WIN32_SRC      = $(WIN32_SRC) .\$(CRYPT_SRC)
@@ -592,10 +589,7 @@ CORE_NOCFG_H       =               \
                .\include\dirent.h      \
                .\include\netdb.h       \
                .\include\sys\socket.h  \
-               .\win32.h       \
-               .\perlhost.h    \
-               .\vdir.h        \
-               .\vmem.h
+               .\win32.h
 
 CORE_H         = $(CORE_NOCFG_H) .\config.h
 
@@ -801,8 +795,9 @@ $(MINIWIN32_OBJ) : $(CORE_NOCFG_H)
        $(CC) -c $(CFLAGS) $(OBJOUT_FLAG)$@ $(*F).c
 
 # -DPERL_IMPLICIT_SYS needs C++ for perllib.c
+# This is the only file that depends on perlhost.h, vmem.h, and vdir.h
 !IF "$(USE_IMP_SYS)$(USE_OBJECT)" == "defineundef"
-perllib$(o)    : perllib.c
+perllib$(o)    : perllib.c .\perlhost.h .\vdir.h .\vmem.h
        $(CC) -c -I. $(CFLAGS_O) $(CXX_FLAG) $(OBJOUT_FLAG)$@ perllib.c
 !ENDIF
 
@@ -821,7 +816,7 @@ perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\pp.sym ..\makedef.pl
 
 $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES)
        $(LINK32) -dll -def:perldll.def -out:$@ @<<
-               $(LINK_FLAGS) $(LIBFILES) $(PERLDLL_OBJ) $(PERLDLL_RES)
+               $(LINK_FLAGS) /base:0x28000000 $(LIBFILES) $(PERLDLL_OBJ) $(PERLDLL_RES)
 <<
        $(XCOPY) $(PERLIMPLIB) $(COREDIR)
 
@@ -1075,6 +1070,19 @@ test-notty : test-prep
        $(PERLEXE) -I..\lib harness
        cd ..\win32
 
+test-wide : test-prep
+       set HARNESS_PERL_SWITCHES=-C
+       cd ..\t
+       $(PERLEXE) -I..\lib harness
+       cd ..\win32
+
+test-wide-notty : test-prep
+       set PERL_SKIP_TTY_TEST=1
+       set HARNESS_PERL_SWITCHES=-C
+       cd ..\t
+       $(PERLEXE) -I..\lib harness
+       cd ..\win32
+
 clean : 
        -@erase miniperlmain$(o)
        -@erase $(MINIPERL)