Having to pull in the whole Encode just to get SvUTF8()

[p5sagit/p5-mst-13.2.git] / win32 / Makefile

diff --git a/win32/Makefile b/win32/Makefile
index bba77a9..22ddba1 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -137,6 +137,14 @@ CCTYPE             = MSVC60
 #PERL_MALLOC   = define
 
 #
+# set this to enable debugging mstats
+# This must be enabled to use the Devel::Peek::mstat() function.  This cannot
+# be enabled without PERL_MALLOC as well.
+#
+#DEBUG_MSTATS  = define
+
+#
+#
 # set the install locations of the compiler include/libraries
 # Running VCVARS32.BAT is *required* when using Visual C.
 # Some versions of Visual C don't define MSVCDIR in the environment,
@@ -200,6 +208,15 @@ CRYPT_FLAG = -DHAVE_DES_FCRYPT
 
 !IF "$(PERL_MALLOC)" == ""
 PERL_MALLOC    = undef
+DEBUG_MSTATS   = undef
+!ENDIF
+
+!IF "$(DEBUG_MSTATS)" == ""
+DEBUG_MSTATS   = undef
+!ENDIF
+
+!IF "$(DEBUG_MSTATS)" == "define"
+BUILDOPT       = $(BUILDOPT) -DPERL_DEBUGGING_MSTATS
 !ENDIF
 
 !IF "$(USE_IMP_SYS)" == "define"
@@ -454,6 +471,7 @@ UTILS               =                       \
                ..\utils\libnetcfg      \
                ..\utils\enc2xs         \
                ..\utils\piconv         \
+               ..\utils\cpan           \
                ..\pod\checkpods        \
                ..\pod\pod2html         \
                ..\pod\pod2latex        \
@@ -774,6 +792,7 @@ CFG_VARS    =                                       \
                "libpth=$(CCLIBDIR:"=\");$(EXTRALIBDIRS:"=\")"  \
                "libc=$(LIBC)"                          \
                "make=$(MAKE_BARE)"                             \
+               "usethreads=$(USE_ITHREADS)"            \
                "useithreads=$(USE_ITHREADS)"           \
                "usemultiplicity=$(USE_MULTI)"          \
                "useperlio=$(USE_PERLIO)"               \
@@ -1049,7 +1068,7 @@ distclean: clean
            podchecker podselect
        cd ..\utils
        -del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs perldoc perlivp \
-           dprofpp perlcc libnetcfg enc2xs piconv
+           dprofpp perlcc libnetcfg enc2xs piconv cpan
        -del /f *.bat
        cd ..\win32
        cd ..\x2p