X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fmakefile.mk;h=21836b22ec5ce03dfdef04f3c4ca954303ce5cf0;hb=5b0d9cefa224486d66580e5164324f002f3989ab;hp=4737cdc8161145fabe2edf77caa9468843f291c0;hpb=9d2428989d95cd0d9d5fc1f1fcf60ab67cde0b7f;p=p5sagit%2Fp5-mst-13.2.git diff --git a/win32/makefile.mk b/win32/makefile.mk index 4737cdc..21836b2 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -6,7 +6,7 @@ # Mingw32 with gcc-2.95.2 or better **experimental** # # This is set up to build a perl.exe that runs off a shared library -# (perl.dll). Also makes individual DLLs for the XS extensions. +# (perl56.dll). Also makes individual DLLs for the XS extensions. # ## @@ -53,8 +53,6 @@ INST_ARCH *= \$(ARCHNAME) #USE_MULTI *= define # -# XXX WARNING! This option is still very experimental. May be broken. -# # Beginnings of interpreter cloning/threads; still very incomplete. # This should be enabled to get the fork() emulation. This needs # USE_MULTI as well. @@ -197,11 +195,6 @@ CCLIBDIR *= $(CCHOME)\lib #BUILDOPT += -DPERL_TEXTMODE_SCRIPTS # -# This should normally be disabled. Enabling it runs a cloned toplevel -# interpreter (*EXPERIMENTAL*, fails tests) -#BUILDOPT += -DTOP_CLONE - -# # specify semicolon-separated list of extra directories that modules will # look for libraries (spaces in path names need not be quoted) # @@ -429,9 +422,9 @@ SUBSYS = console CXX_FLAG = -TP -GX .IF "$(USE_PERLCRT)" != "define" -PERLCRTLIBC = msvcrt.lib +LIBC = msvcrt.lib .ELSE -PERLCRTLIBC = PerlCRT.lib +LIBC = PerlCRT.lib .ENDIF PERLEXE_RES = @@ -811,7 +804,7 @@ POD2TEXT = $(PODDIR)\pod2text # -- BKS 10-17-1999 CFG_VARS = \ INST_DRV=$(INST_DRV) ~ \ - INST_TOP=$(INST_TOP) ~ \ + INST_TOP=$(INST_TOP:s/\/\\/) ~ \ INST_VER=$(INST_VER:s/\/\\/) ~ \ INST_ARCH=$(INST_ARCH) ~ \ archname=$(ARCHNAME) ~ \ @@ -1077,7 +1070,7 @@ $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_RES) $(LINK32) -mconsole -o $@ $(BLINK_FLAGS) \ $(PERLEXE_OBJ) $(PERLIMPLIB) $(LIBFILES) .ELSE - $(LINK32) -subsystem:console -out:$@ -stack:0x8000000 $(BLINK_FLAGS) \ + $(LINK32) -subsystem:console -out:$@ -stack:0x1000000 $(BLINK_FLAGS) \ $(LIBFILES) $(PERLEXE_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) $(PERLEXE_RES) .ENDIF copy $(PERLEXE) $(WPERLEXE) @@ -1189,7 +1182,14 @@ doc: $(PERLEXE) utils: $(PERLEXE) $(X2P) cd ..\utils && $(MAKE) PERL=$(MINIPERL) - copy ..\README.win32 ..\pod\perlwin32.pod + copy ..\README.amiga ..\pod\perlamiga.pod + copy ..\README.cygwin ..\pod\perlcygwin.pod + copy ..\README.dos ..\pod\perldos.pod + copy ..\README.hpux ..\pod\perlhpux.pod + copy ..\README.machten ..\pod\perlmachten.pod + copy ..\README.os2 ..\pod\perlos2.pod + copy ..\README.os2 ..\pod\perlos2.pod + copy ..\vms\perlvms.pod ..\pod\perlvms.pod cd ..\pod && $(MAKE) -f ..\win32\pod.mak converters $(PERLEXE) $(PL2BAT) $(UTILS)