diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2000-11-24 03:07:01 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2000-11-24 03:07:01 +0000 |
| commit | d373e9d2eeca87d7e435472cf5e672954238d0dc (patch) | |
| tree | fd06b8949904ea665feb61004107ac2e2e9dc78a /win32 | |
| parent | c0c066b9017ac4575cee105cdaf5eddc8a7ec85c (diff) | |
| parent | de6cd452fde5aaf57e339f71b33b6a0852f0f96d (diff) | |
| download | perl-d373e9d2eeca87d7e435472cf5e672954238d0dc.tar.gz | |
Integrate perlio:
[ 7844]
Win32/perlio Now just fails one io/argv.t test - lack
of default :crlf on standard streams.
[ 7843]
Win32 passes all but t/lib/peek.t with perlio and home-grown crlf.
peek fail is showing a real problem (multiple crlf layers
are getting pushed.)
[ 7842]
Implement PerlIO_binmode()
Fix PerlIOCrlf_unread() (*--ptr rather than *ptr-- ...)
Test on UNIX with PERLIO="perlio crlf" to mimic Win32,
make binmode in t/lib/io_tell.t unconditional so that works.
Checkin just so Win32 machine can see these changes.
[ 7836]
Implement crlf layer - not ready for merge.
p4raw-link: @7844 on //depot/perlio: de6cd452fde5aaf57e339f71b33b6a0852f0f96d
p4raw-link: @7843 on //depot/perlio: 63dbdb066b93ac25a070d3a7942d248c23ec6088
p4raw-link: @7842 on //depot/perlio: 60382766f71ec2a2d8e34a951c5c77b494bd86bb
p4raw-link: @7836 on //depot/perlio: 99efab1281ccea6f7df2a4d0affc5479291e2350
p4raw-id: //depot/perl@7847
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win32/makefile.mk b/win32/makefile.mk index 4677c809ed..681e28f401 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -371,7 +371,7 @@ a = .a # Options # -INCLUDES = -I$(COREDIR) -I.\include -I. -I.. +INCLUDES = -I.\include -I. -I.. -I$(COREDIR) DEFINES = -DWIN32 $(CRYPT_FLAG) LOCDEFS = -DPERLDLL -DPERL_CORE SUBSYS = console @@ -387,11 +387,11 @@ LIBFILES = $(CRYPT_LIB) $(LIBC) \ -lwinmm -lversion -lodbc32 .IF "$(CFG)" == "Debug" -OPTIMIZE = -g -DDEBUGGING +OPTIMIZE = -g -O2 -DDEBUGGING LINK_DBG = -g .ELSE OPTIMIZE = -g -O2 -LINK_DBG = +LINK_DBG = -g .ENDIF CFLAGS = $(INCLUDES) $(DEFINES) $(LOCDEFS) $(OPTIMIZE) |