integrate cfgperl changes into mainline, ignoring the

[perl5.git] / win32 / makefile.mk

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 44b5b3a..3d4f57e 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -33,7 +33,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
@@ -297,7 +297,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.
@@ -712,10 +712,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
 
@@ -1000,8 +997,10 @@ $(MINIWIN32_OBJ) : $(CORE_NOCFG_H)
 
 # -DPERL_IMPLICIT_SYS needs C++ for perllib.c
 # rules wrapped in .IFs break Win9X build (we end up with unbalanced []s unless
-#  unless the .IF is true), so instead we use a .ELSE with the default
-perllib$(o)    : perllib.c
+# unless the .IF is true), so instead we use a .ELSE with the default.
+# This is the only file that depends on perlhost.h, vmem.h, and vdir.h
+
+perllib$(o)    : perllib.c .\perlhost.h .\vdir.h .\vmem.h
 .IF "$(USE_IMP_SYS)$(USE_OBJECT)" == "defineundef"
        $(CC) -c -I. $(CFLAGS_O) $(CXX_FLAG) $(OBJOUT_FLAG)$@ perllib.c
 .ELSE
@@ -1042,7 +1041,7 @@ $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES)
                perl.exp $(LKPOST))
 .ELSE
        $(LINK32) -dll -def:perldll.def -out:$@ \
-           @$(mktmp $(BLINK_FLAGS) $(LIBFILES) $(PERLDLL_RES) $(PERLDLL_OBJ:s,\,\\))
+           @$(mktmp $(BLINK_FLAGS) $(LIBFILES) /base:0x28000000 $(PERLDLL_RES) $(PERLDLL_OBJ:s,\,\\))
 .ENDIF
        $(XCOPY) $(PERLIMPLIB) $(COREDIR)
 
@@ -1285,7 +1284,16 @@ test : $(RIGHTMAKE) test-prep
 
 test-notty : test-prep
        set PERL_SKIP_TTY_TEST=1 && \
-       cd ..\t && $(PERLEXE) -I.\lib harness
+           cd ..\t && $(PERLEXE) -I.\lib harness
+
+test-wide : test-prep
+       set HARNESS_PERL_SWITCHES=-C && \
+           cd ..\t && $(PERLEXE) -I..\lib harness
+
+test-wide-notty : test-prep
+       set PERL_SKIP_TTY_TEST=1 && \
+           set HARNESS_PERL_SWITCHES=-C && \
+           cd ..\t && $(PERLEXE) -I..\lib harness
 
 clean : 
        -@erase miniperlmain$(o)