X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fmakefile.mk;h=d01284e781f6ab0c5fd51b8ea3efefe02cb5573f;hb=7d7eba7b517875a603d605a8f99cc3b41fd6b969;hp=59d20072b843d70cf0c1f34bb7674e53240c4fd2;hpb=3db8f154c4c6e098a5a0bdf7932e8f86fbd2c451;p=p5sagit%2Fp5-mst-13.2.git diff --git a/win32/makefile.mk b/win32/makefile.mk index 59d2007..d01284e 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -34,7 +34,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.8.0 +INST_VER *= \5.9.0 # # Comment this out if you DON'T want your perl installation to have @@ -73,7 +73,13 @@ USE_IMP_SYS *= define # then get a number of fails from make test i.e. bugs - complain to them not us ;-). # You will also be unable to take full advantage of perl5.8's support for multiple # encodings and may see lower IO performance. You have been warned. -USE_PERLIO = define +USE_PERLIO *= define + +# +# Comment this out if you don't want to enable large file support for +# some reason. Should normally only be changed to maintain compatibility +# with an older release of perl. +USE_LARGE_FILES *= define # # uncomment exactly one of the following @@ -88,6 +94,9 @@ CCTYPE *= MSVC60 #CCTYPE *= BORLAND # mingw32+gcc-2.95.2 or better #CCTYPE *= GCC +# Uncomment this if you are using the latest MinGW release (2.0.0) +# with gcc3.2 +#USE_GCC_V3_2 *= define # # uncomment this if your Borland compiler is older than v5.4. @@ -230,6 +239,7 @@ USE_MULTI *= undef USE_ITHREADS *= undef USE_IMP_SYS *= undef USE_PERLIO *= undef +USE_LARGE_FILES *= undef USE_PERLCRT *= undef .IF "$(USE_IMP_SYS)$(USE_MULTI)" == "defineundef" @@ -369,6 +379,9 @@ LINK_FLAGS += -L"$(CCLIBDIR)\Release" CC = gcc LINK32 = gcc +.IF "$(USE_GCC_V3_2)" == "define" +LINK32 = g++ +.END LIB32 = ar rc IMPLIB = dlltool RSC = rc @@ -578,6 +591,7 @@ UTILS = \ ..\utils\libnetcfg \ ..\utils\enc2xs \ ..\utils\piconv \ + ..\utils\cpan \ ..\pod\checkpods \ ..\pod\pod2html \ ..\pod\pod2latex \ @@ -804,10 +818,12 @@ CFG_VARS = \ _a=$(a) ~ \ lib_ext=$(a) ~ \ static_ext=$(STATIC_EXT) ~ \ + usethreads=$(USE_ITHREADS) ~ \ useithreads=$(USE_ITHREADS) ~ \ usemultiplicity=$(USE_MULTI) ~ \ useperlio=$(USE_PERLIO) ~ \ - LINK_FLAGS=$(LINK_FLAGS:s/\/\\/) ~ \ + uselargefiles=$(USE_LARGE_FILES) ~ \ + LINK_FLAGS=$(LINK_FLAGS:s/\/\\/) ~ \ optimize=$(OPTIMIZE) # @@ -1146,15 +1162,24 @@ distclean: clean -del /f $(LIBDIR)\List\Util.pm -del /f $(LIBDIR)\Scalar\Util.pm -del /f $(LIBDIR)\Unicode\Normalize.pm - -if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO || rmdir /s $(LIBDIR)\IO - -if exist $(LIBDIR)\B rmdir /s /q $(LIBDIR)\B || rmdir /s $(LIBDIR)\B - -if exist $(LIBDIR)\Data rmdir /s /q $(LIBDIR)\Data || rmdir /s $(LIBDIR)\Data - -if exist $(LIBDIR)\Filter\Util\Call rmdir /s /q $(LIBDIR)\Filter\Util\Call || rmdir /s $(LIBDIR)\Filter - -if exist $(LIBDIR)\Filter\Util rmdir /s /q $(LIBDIR)\Filter\Util || rmdir /s $(LIBDIR)\Filter - -if exist $(LIBDIR)\Digest rmdir /s /q $(LIBDIR)\Digest || rmdir /s $(LIBDIR)\Digest - -if exist $(LIBDIR)\MIME rmdir /s /q $(LIBDIR)\MIME || rmdir /s $(LIBDIR)\MIME - -if exist $(LIBDIR)\List rmdir /s /q $(LIBDIR)\List || rmdir /s $(LIBDIR)\List - -if exist $(LIBDIR)\Scalar rmdir /s /q $(LIBDIR)\Scalar || rmdir /s $(LIBDIR)\Scalar + -if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO + -if exist $(LIBDIR)\IO rmdir /s $(LIBDIR)\IO + -if exist $(LIBDIR)\B rmdir /s /q $(LIBDIR)\B + -if exist $(LIBDIR)\B rmdir /s $(LIBDIR)\B + -if exist $(LIBDIR)\Data rmdir /s /q $(LIBDIR)\Data + -if exist $(LIBDIR)\Data rmdir /s $(LIBDIR)\Data + -if exist $(LIBDIR)\Filter\Util rmdir /s /q $(LIBDIR)\Filter\Util + -if exist $(LIBDIR)\Filter\Util rmdir /s $(LIBDIR)\Filter\Util + -if exist $(LIBDIR)\Digest rmdir /s /q $(LIBDIR)\Digest + -if exist $(LIBDIR)\Digest rmdir /s $(LIBDIR)\Digest + -if exist $(LIBDIR)\MIME rmdir /s /q $(LIBDIR)\MIME + -if exist $(LIBDIR)\MIME rmdir /s $(LIBDIR)\MIME + -if exist $(LIBDIR)\List rmdir /s /q $(LIBDIR)\List + -if exist $(LIBDIR)\List rmdir /s $(LIBDIR)\List + -if exist $(LIBDIR)\Scalar rmdir /s /q $(LIBDIR)\Scalar + -if exist $(LIBDIR)\Scalar rmdir /s $(LIBDIR)\Scalar + -if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS + -if exist $(LIBDIR)\XS rmdir /s $(LIBDIR)\XS -cd $(PODDIR) && del /f *.html *.bat checkpods \ perlaix.pod perlamiga.pod perlapollo.pod \ perlbeos.pod perlbs2000.pod perlce.pod perlcygwin.pod perldgux.pod \ @@ -1168,15 +1193,17 @@ distclean: clean perlwin32.pod pod2html pod2latex pod2man pod2text pod2usage \ podchecker podselect -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \ - perldoc perlivp dprofpp perlcc libnetcfg enc2xs piconv *.bat + perldoc perlivp dprofpp perlcc libnetcfg enc2xs piconv cpan *.bat -cd ..\x2p && del /f find2perl s2p psed *.bat -del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new -del /f $(CONFIGPM) -del /f bin\*.bat -cd .. && del /s *$(a) *.map *.pdb *.ilk *.bs *$(o) .exists pm_to_blib -cd $(EXTDIR) && del /s *.def Makefile Makefile.old - -if exist $(AUTODIR) rmdir /s /q $(AUTODIR) || rmdir /s $(AUTODIR) - -if exist $(COREDIR) rmdir /s /q $(COREDIR) || rmdir /s $(COREDIR) + -if exist $(AUTODIR) rmdir /s /q $(AUTODIR) + -if exist $(AUTODIR) rmdir /s $(AUTODIR) + -if exist $(COREDIR) rmdir /s /q $(COREDIR) + -if exist $(COREDIR) rmdir /s $(COREDIR) install : all installbare installhtml @@ -1253,7 +1280,8 @@ clean : Extensions_clean -@erase $(WPERLEXE) -@erase $(PERLDLL) -@erase $(CORE_OBJ) - -if exist $(MINIDIR) rmdir /s /q $(MINIDIR) || rmdir /s $(MINIDIR) + -if exist $(MINIDIR) rmdir /s /q $(MINIDIR) + -if exist $(MINIDIR) rmdir /s $(MINIDIR) -@erase $(WIN32_OBJ) -@erase $(DLL_OBJ) -@erase $(X2P_OBJ)