summaryrefslogtreecommitdiff
path: root/win32/makefile.mk
diff options
context:
space:
mode:
authorGurusamy Sarathy <gsar@cpan.org>2000-02-29 18:11:34 +0000
committerGurusamy Sarathy <gsar@cpan.org>2000-02-29 18:11:34 +0000
commit729a02f2394e6a50fe8352c9471391b53e54ac40 (patch)
tree2a6312b320ed2281bb204f6b7de63b23d0b66ca7 /win32/makefile.mk
parent4d6cd4d833a6068f248475b5c22081cd80bd7a5e (diff)
downloadperl-729a02f2394e6a50fe8352c9471391b53e54ac40.tar.gz
utf8-ize @ARGV when -C switch is used on Windows
p4raw-id: //depot/perl@5364
Diffstat (limited to 'win32/makefile.mk')
-rw-r--r--win32/makefile.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 44b5b3a2d7..724fb6304f 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -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.
@@ -1042,7 +1042,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)