X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fmakefile.mk;h=d01284e781f6ab0c5fd51b8ea3efefe02cb5573f;hb=7d7eba7b517875a603d605a8f99cc3b41fd6b969;hp=80a041552fed6ebf8f3209a9b6a4b9f45a98fb6e;hpb=76e9d7369c5645d8d07a3068c4bea9dbced4c9cb;p=p5sagit%2Fp5-mst-13.2.git diff --git a/win32/makefile.mk b/win32/makefile.mk index 80a0415..d01284e 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -7,7 +7,7 @@ # MS Platform SDK 64-bit compiler and tools **experimental** # # This is set up to build a perl.exe that runs off a shared library -# (perl58.dll). Also makes individual DLLs for the XS extensions. +# (perl59.dll). Also makes individual DLLs for the XS extensions. # ## @@ -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,17 +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 # -# WARNING! This option is deprecated and will eventually go away (enable -# USE_ITHREADS instead). -# -# uncomment to enable threads-capabilities. This is incompatible with -# USE_ITHREADS, and is only here for people who may have come to rely -# on the experimental Thread support that was in 5.005. -# -#USE_5005THREADS *= 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 @@ -98,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. @@ -236,28 +235,22 @@ CRYPT_FLAG = -DHAVE_DES_FCRYPT PERL_MALLOC *= undef -USE_5005THREADS *= undef - -.IF "$(USE_5005THREADS)" == "define" -USE_ITHREADS != undef -.ENDIF - 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)$(USE_5005THREADS)" == "defineundefundef" +.IF "$(USE_IMP_SYS)$(USE_MULTI)" == "defineundef" USE_MULTI != define .ENDIF .IF "$(USE_ITHREADS)$(USE_MULTI)" == "defineundef" USE_MULTI != define -USE_5005THREADS != undef .ENDIF -.IF "$(USE_MULTI)$(USE_5005THREADS)" != "undefundef" +.IF "$(USE_MULTI)" != "undef" BUILDOPT += -DPERL_IMPLICIT_CONTEXT .ENDIF @@ -280,9 +273,7 @@ WIN64 = undef .ENDIF .ENDIF -.IF "$(USE_5005THREADS)" == "define" -ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-thread -.ELIF "$(USE_MULTI)" == "define" +.IF "$(USE_MULTI)" == "define" ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-multi .ELSE .IF "$(USE_PERLIO)" == "define" @@ -388,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 @@ -597,6 +591,7 @@ UTILS = \ ..\utils\libnetcfg \ ..\utils\enc2xs \ ..\utils\piconv \ + ..\utils\cpan \ ..\pod\checkpods \ ..\pod\pod2html \ ..\pod\pod2latex \ @@ -624,7 +619,7 @@ CFGH_TMPL = config_H.bc CFGSH_TMPL = config.gc CFGH_TMPL = config_H.gc -PERLIMPLIB = ..\libperl58$(a) +PERLIMPLIB = ..\libperl59$(a) .ELSE @@ -640,8 +635,8 @@ CFGH_TMPL = config_H.vc # makedef.pl must be updated if this changes, and this should normally # only change when there is an incompatible revision of the public API. -PERLIMPLIB *= ..\perl58$(a) -PERLDLL = ..\perl58.dll +PERLIMPLIB *= ..\perl59$(a) +PERLDLL = ..\perl59.dll XCOPY = xcopy /f /r /i /d RCOPY = xcopy /f /r /i /e /d @@ -666,6 +661,7 @@ MICROCORE_SRC = \ ..\mg.c \ ..\numeric.c \ ..\op.c \ + ..\pad.c \ ..\perl.c \ ..\perlapi.c \ ..\perly.c \ @@ -783,7 +779,7 @@ SETARGV_OBJ = setargv$(o) DYNAMIC_EXT = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \ Data/Dumper Devel/Peek ByteLoader Devel/DProf File/Glob \ Sys/Hostname Storable Filter/Util/Call Encode \ - Digest/MD5 PerlIO/Scalar MIME/Base64 Time/HiRes \ + Digest/MD5 PerlIO/scalar MIME/Base64 Time/HiRes \ Unicode/Normalize STATIC_EXT = DynaLoader NONXS_EXT = Errno @@ -822,12 +818,12 @@ CFG_VARS = \ _a=$(a) ~ \ lib_ext=$(a) ~ \ static_ext=$(STATIC_EXT) ~ \ - use5005threads=$(USE_5005THREADS) ~ \ + usethreads=$(USE_ITHREADS) ~ \ useithreads=$(USE_ITHREADS) ~ \ - usethreads=$(USE_5005THREADS) ~ \ usemultiplicity=$(USE_MULTI) ~ \ useperlio=$(USE_PERLIO) ~ \ - LINK_FLAGS=$(LINK_FLAGS:s/\/\\/) ~ \ + uselargefiles=$(USE_LARGE_FILES) ~ \ + LINK_FLAGS=$(LINK_FLAGS:s/\/\\/) ~ \ optimize=$(OPTIMIZE) # @@ -1128,6 +1124,7 @@ utils: $(PERLEXE) $(X2P) copy ..\README.netware ..\pod\perlnetware.pod copy ..\README.os2 ..\pod\perlos2.pod copy ..\README.os390 ..\pod\perlos390.pod + copy ..\README.os400 ..\pod\perlos400.pod copy ..\README.plan9 ..\pod\perlplan9.pod copy ..\README.qnx ..\pod\perlqnx.pod copy ..\README.solaris ..\pod\perlsolaris.pod @@ -1153,7 +1150,7 @@ distclean: clean -del /f $(LIBDIR)\SDBM_File.pm $(LIBDIR)\Socket.pm $(LIBDIR)\POSIX.pm -del /f $(LIBDIR)\B.pm $(LIBDIR)\O.pm $(LIBDIR)\re.pm -del /f $(LIBDIR)\Data\Dumper.pm $(LIBDIR)\ByteLoader.pm - -del /f $(LIBDIR)\PerlIO\Scalar.pm + -del /f $(LIBDIR)\PerlIO\scalar.pm -del /f $(LIBDIR)\Devel\Peek.pm $(LIBDIR)\Devel\DProf.pm -del /f $(LIBDIR)\File\Glob.pm -del /f $(LIBDIR)\Storable.pm @@ -1165,37 +1162,48 @@ 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 \ perldos.pod perlepoc.pod perlfreebsd.pod perlhpux.pod perlhurd.pod \ perlirix.pod perlmachten.pod perlmint.pod \ perlmacos.pod perlmpeix.pod perlnetware.pod \ - perlos2.pod perlos390.pod \ + perlos2.pod perlos390.pod perlos400.pod \ perlplan9.pod perlqnx.pod \ perlsolaris.pod perltru64.pod perluts.pod \ perlvmesa.pod perlvms.pod perlvos.pod \ 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 @@ -1272,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)