new perldelta for 5.29.0

[perl5.git] / win32 / makefile.mk

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 6206a3a..f72d64d 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -2,7 +2,8 @@
 # Makefile to build perl on Windows using DMAKE.
 # Supported compilers:
 #      Microsoft Visual C++ 6.0 or later
-#      MinGW with gcc-3.4.5 or later
+#      MinGW with gcc-3.4.5 or later with runtime < 3.21
+#      MinGW64 with gcc-4.4.3 or later
 #      Windows SDK 64-bit compiler and tools
 #
 # This is set up to build a perl.exe that runs off a shared library
@@ -1287,6 +1288,11 @@ $(MINIDIR)\.exists : $(CFGH_TMPL)
        echo #define Off_t_size ^4)>> config.h
 .ENDIF
 .IF "$(WIN64)"=="define"
+.IF "$(CCTYPE)" == "GCC"
+       @(echo #define LONG_DOUBLESIZE ^16)>> config.h
+.ELSE
+       @(echo #define LONG_DOUBLESIZE ^8)>> config.h
+.ENDIF
        @(echo #define PTRSIZE ^8&& \
        echo #define SSize_t $(INT64)&& \
        echo #define HAS_ATOLL&& \
@@ -1294,6 +1300,11 @@ $(MINIDIR)\.exists : $(CFGH_TMPL)
        echo #define HAS_STRTOULL&& \
        echo #define Size_t_size ^8)>> config.h
 .ELSE
+.IF "$(CCTYPE)" == "GCC"
+       @(echo #define LONG_DOUBLESIZE ^12)>> config.h
+.ELSE
+       @(echo #define LONG_DOUBLESIZE ^8)>> config.h
+.ENDIF
        @(echo #define PTRSIZE ^4&& \
        echo #define SSize_t int&& \
        echo #undef HAS_ATOLL&& \
@@ -1345,15 +1356,9 @@ $(MINIDIR)\.exists : $(CFGH_TMPL)
        echo #define PERL_PRIgldbl "Lg"&& \
        echo #define PERL_PRIeldbl "Le"&& \
        echo #define PERL_SCNfldbl "Lf"&& \
-       echo #define NVTYPE long double)>> config.h
-.IF "$(WIN64)"=="define"
-       @(echo #define NVSIZE ^16&& \
-       echo #define LONG_DOUBLESIZE ^16)>> config.h
-.ELSE
-       @(echo #define NVSIZE ^12&& \
-       echo #define LONG_DOUBLESIZE ^12)>> config.h
-.ENDIF
-       @(echo #define NV_OVERFLOWS_INTEGERS_AT 256.0*256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0*2.0*2.0*2.0&& \
+       echo #define NVTYPE long double&& \
+       echo #define NVSIZE LONG_DOUBLESIZE&& \
+       echo #define NV_OVERFLOWS_INTEGERS_AT 256.0*256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0*2.0*2.0*2.0&& \
        echo #define NVef "Le"&& \
        echo #define NVff "Lf"&& \
        echo #define NVgf "Lg"&& \
@@ -1372,7 +1377,6 @@ $(MINIDIR)\.exists : $(CFGH_TMPL)
        echo #undef PERL_SCNfldbl&& \
        echo #define NVTYPE double&& \
        echo #define NVSIZE ^8&& \
-       echo #define LONG_DOUBLESIZE ^8&& \
        echo #define NV_OVERFLOWS_INTEGERS_AT 256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0&& \
        echo #define NVef "e"&& \
        echo #define NVff "f"&& \
@@ -1618,7 +1622,7 @@ utils: $(HAVEMINIPERL) ..\utils\Makefile
        copy ..\README.tw       ..\pod\perltw.pod
        copy ..\README.vos      ..\pod\perlvos.pod
        copy ..\README.win32    ..\pod\perlwin32.pod
-       copy ..\pod\perldelta.pod ..\pod\perl52712delta.pod
+       copy ..\pod\perldelta.pod ..\pod\perl5290delta.pod
        $(MINIPERL) -I..\lib $(PL2BAT) $(UTILS)
        $(MINIPERL) -I..\lib ..\autodoc.pl ..
        $(MINIPERL) -I..\lib ..\pod\perlmodlib.PL -q ..
@@ -1716,7 +1720,7 @@ distclean: realclean
        -if exist $(LIBDIR)\Win32API rmdir /s /q $(LIBDIR)\Win32API
        -if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS
        -cd $(PODDIR) && del /f *.html *.bat roffitall \
-           perl52712delta.pod perlaix.pod perlamiga.pod perlandroid.pod \
+           perl5290delta.pod perlaix.pod perlamiga.pod perlandroid.pod \
            perlapi.pod perlbs2000.pod perlce.pod perlcn.pod perlcygwin.pod \
            perldos.pod perlfreebsd.pod perlhaiku.pod perlhpux.pod \
            perlhurd.pod perlintern.pod perlirix.pod perljp.pod perlko.pod \