Re: The Inaba patch for tr/// vs. use encoding

[p5sagit/p5-mst-13.2.git] / win32 / makefile.mk

diff --git a/win32/makefile.mk b/win32/makefile.mk
index b01923a..dcc6980 100644 (file)
--- 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
@@ -76,16 +76,6 @@ USE_IMP_SYS  *= 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
-
-#
 # uncomment exactly one of the following
 #
 # Visual C++ 2.x
@@ -98,6 +88,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 +229,21 @@ 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_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 +266,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 +372,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
@@ -823,9 +810,7 @@ CFG_VARS    =                                       \
                _a=$(a)                         ~       \
                lib_ext=$(a)                    ~       \
                static_ext=$(STATIC_EXT)        ~       \
-               use5005threads=$(USE_5005THREADS)       ~       \
                useithreads=$(USE_ITHREADS)     ~       \
-               usethreads=$(USE_5005THREADS)   ~       \
                usemultiplicity=$(USE_MULTI)    ~       \
                useperlio=$(USE_PERLIO)         ~       \
                LINK_FLAGS=$(LINK_FLAGS:s/\/\\/)                ~       \