add workaround for textmode read() bug in MSVCRT; make chdir() do

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

diff --git a/win32/Makefile b/win32/Makefile
index 4d7f333..c100d45 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -99,6 +99,8 @@ INST_ARCH     = \$(ARCHNAME)
 # Get it from CPAN at http://www.perl.com/CPAN/authors/id/D/DO/DOUGL/
 # and follow the directions in the package to install.
 #
+# Not recommended if you have VC 6.x and you're not running Windows 9x.
+#
 #USE_PERLCRT   = define
 #BUILD_FOR_WIN95    = define
 
@@ -236,6 +238,10 @@ USE_ITHREADS       = undef
 USE_IMP_SYS    = undef
 !ENDIF
 
+!IF "$(USE_PERLCRT)" == ""
+USE_PERLCRT    = undef
+!ENDIF
+
 !IF "$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" != "undefundefundef"
 BUILDOPT       = $(BUILDOPT) -DPERL_IMPLICIT_CONTEXT
 !ENDIF
@@ -318,7 +324,7 @@ LOCDEFS             = -DPERLDLL -DPERL_CORE
 SUBSYS         = console
 CXX_FLAG       = -TP -GX
 
-!IF "$(USE_PERLCRT)" == ""
+!IF "$(USE_PERLCRT)" != "define"
 !   IF  "$(CFG)" == "Debug"
 PERLCRTLIBC    = msvcrtd.lib
 !   ELSE
@@ -364,10 +370,14 @@ OPTIMIZE  = $(OPTIMIZE) $(CXX_FLAG)
 BUILDOPT       = $(BUILDOPT) -DPERL_OBJECT
 !ENDIF
 
+!IF "$(USE_PERLCRT)" != "define"
+BUILDOPT       = $(BUILDOPT) -DPERL_MSVCRT_READFIX
+!ENDIF
+
 LIBBASEFILES   = $(DELAYLOAD) $(CRYPT_LIB) \
-               oldnames.lib kernel32.lib user32.lib gdi32.lib \
-               winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib \
-               oleaut32.lib netapi32.lib uuid.lib wsock32.lib mpr.lib winmm.lib \
+               oldnames.lib kernel32.lib user32.lib gdi32.lib winspool.lib \
+               comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \
+               netapi32.lib uuid.lib wsock32.lib mpr.lib winmm.lib \
                version.lib odbc32.lib odbccp32.lib
 
 # we add LIBC here, since we may be using PerlCRT.dll