diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 18 | ||||
| -rw-r--r-- | win32/makefile.mk | 18 |
2 files changed, 32 insertions, 4 deletions
diff --git a/win32/Makefile b/win32/Makefile index 6eaa3ee392..c6ce6b6aa6 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -56,6 +56,15 @@ INST_VER = \5.00471 #USE_PERLCRT = define # +# uncomment to enable linking with setargv.obj under the Visual C +# compiler. Setting this options enables perl to expand wildcards in +# arguments, but it may be harder to use alternate methods like +# File::DosGlob that are more powerful. This option is supported only with +# Visual C. +# +#USE_SETARGV = define + +# # if you have the source for des_fcrypt(), uncomment this and make sure the # file exists (see README.win32). File should be located at the perl # top level directory. @@ -448,6 +457,10 @@ PERLEXE_OBJ = $(PERLEXE_OBJ) $(WIN32_OBJ) $(DLL_OBJ) PERL95_OBJ = $(PERL95_OBJ) DynaLoadmt$(o) !ENDIF +!IF "$(USE_SETARGV)" != "" +SETARGV_OBJ = setargv$(o) +!ENDIF + DYNAMIC_EXT = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \ Data/Dumper STATIC_EXT = DynaLoader @@ -664,7 +677,7 @@ perlmain$(o) : perlmain.c $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(LINK32) -subsystem:console -out:$@ $(LINK_FLAGS) $(LIBFILES) \ - $(PERLEXE_OBJ) $(PERLIMPLIB) + $(PERLEXE_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) copy splittree.pl .. $(MINIPERL) -I..\lib ..\splittree.pl "../LIB" $(AUTODIR) @@ -690,7 +703,8 @@ DynaLoadmt$(o) : $(DYNALOADER).c $(PERL95EXE): $(PERLDLL) $(CONFIGPM) $(PERL95_OBJ) $(LINK32) -subsystem:console -nodefaultlib -out:$@ $(LINK_FLAGS) \ - $(LIBBASEFILES) $(PERL95_OBJ) $(PERLIMPLIB) libcmt.lib + $(LIBBASEFILES) $(PERL95_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) \ + libcmt.lib !ENDIF diff --git a/win32/makefile.mk b/win32/makefile.mk index 46ebccd629..dd03ae281d 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -63,6 +63,15 @@ CCTYPE *= BORLAND #USE_PERLCRT *= define # +# uncomment to enable linking with setargv.obj under the Visual C +# compiler. Setting this options enables perl to expand wildcards in +# arguments, but it may be harder to use alternate methods like +# File::DosGlob that are more powerful. This option is supported only with +# Visual C. +# +#USE_SETARGV *= define + +# # if you have the source for des_fcrypt(), uncomment this and make sure the # file exists (see README.win32). File should be located at the perl # top level directory. @@ -560,6 +569,10 @@ PERLEXE_OBJ += $(WIN32_OBJ) $(DLL_OBJ) PERL95_OBJ += DynaLoadmt$(o) .ENDIF +.IF "$(USE_SETARGV)" != "" +SETARGV_OBJ = setargv$(o) +.ENDIF + DYNAMIC_EXT = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \ Data/Dumper STATIC_EXT = DynaLoader @@ -826,7 +839,7 @@ $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_OBJ) $(PERLIMPLIB) $(LIBFILES) .ELSE $(LINK32) -subsystem:console -out:$@ $(LINK_FLAGS) $(LIBFILES) \ - $(PERLEXE_OBJ) $(PERLIMPLIB) + $(PERLEXE_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) .ENDIF copy splittree.pl .. $(MINIPERL) -I..\lib ..\splittree.pl "../LIB" $(AUTODIR) @@ -855,7 +868,8 @@ DynaLoadmt$(o) : $(DYNALOADER).c $(PERL95EXE): $(PERLDLL) $(CONFIGPM) $(PERL95_OBJ) $(LINK32) -subsystem:console -nodefaultlib -out:$@ $(LINK_FLAGS) \ - $(LIBBASEFILES) $(PERL95_OBJ) $(PERLIMPLIB) libcmt.lib + $(LIBBASEFILES) $(PERL95_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) \ + libcmt.lib .ENDIF .ENDIF |