X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2FMakefile;h=88e270d63ab36dfbc27eea0806a77c66cfbe3b02;hb=c0932edc6a72828d2f603e19fe4af61704b40486;hp=321d341ab7301f204a7cecec084387e665f24774;hpb=93342173b757d10fa4133d719efc52a68025860f;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/Makefile b/win32/Makefile
index 321d341..88e270d 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -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)
@@ -821,7 +818,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)