#USE_5005THREADS *= define
#
-# WARNING! This option is deprecated and will eventually go away (enable
-# USE_MULTI instead).
-#
-# uncomment next line if you want to use the PERL_OBJECT build option.
-# DO NOT ENABLE unless you have legacy code that relies on the C++
-# CPerlObj class that was available in 5.005. This cannot be enabled
-# if you ask for USE_5005THREADS above.
-#
-#USE_OBJECT *= define
-
-#
# uncomment exactly one of the following
#
# Visual C++ 2.x
# uncomment to enable use of PerlCRT.DLL when using the Visual C compiler.
# It has patches that fix known bugs in older versions of MSVCRT.DLL.
# This currently requires VC 5.0 with Service Pack 3 or later.
-# Get it from CPAN at http://www.perl.com/CPAN/authors/id/D/DO/DOUGL/
+# Get it from CPAN at http://www.cpan.org/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.
CRYPT_FLAG = -DHAVE_DES_FCRYPT
.ENDIF
-.IF "$(USE_OBJECT)" == "define"
-PERL_MALLOC != undef
-USE_5005THREADS != undef
-USE_MULTI != undef
-USE_IMP_SYS != define
-.ENDIF
-
PERL_MALLOC *= undef
USE_5005THREADS *= undef
.ENDIF
USE_MULTI *= undef
-USE_OBJECT *= undef
USE_ITHREADS *= undef
USE_IMP_SYS *= undef
USE_PERLIO *= undef
USE_PERLCRT *= undef
-.IF "$(USE_IMP_SYS)$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" == "defineundefundefundef"
+.IF "$(USE_IMP_SYS)$(USE_MULTI)$(USE_5005THREADS)" == "defineundefundef"
USE_MULTI != define
.ENDIF
-.IF "$(USE_ITHREADS)$(USE_MULTI)$(USE_OBJECT)" == "defineundefundef"
+.IF "$(USE_ITHREADS)$(USE_MULTI)" == "defineundef"
USE_MULTI != define
USE_5005THREADS != undef
.ENDIF
-.IF "$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" != "undefundefundef"
+.IF "$(USE_MULTI)$(USE_5005THREADS)" != "undefundef"
BUILDOPT += -DPERL_IMPLICIT_CONTEXT
.ENDIF
PROCESSOR_ARCHITECTURE *= x86
-.IF "$(USE_OBJECT)" == "define"
-ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-object
-.ELIF "$(USE_5005THREADS)" == "define"
+.IF "$(USE_5005THREADS)" == "define"
ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-thread
.ELIF "$(USE_MULTI)" == "define"
ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-multi
.ENDIF
-.IF "$(USE_OBJECT)" == "define"
-OPTIMIZE += $(CXX_FLAG)
-BUILDOPT += -DPERL_OBJECT
-.ENDIF
-
CFLAGS_O = $(CFLAGS) $(BUILDOPT)
# used to allow local linking flags that are not propogated into Config.pm,
..\pp_ctl.c \
..\pp_hot.c \
..\pp_pack.c \
+ ..\pp_sort.c \
..\pp_sys.c \
..\regcomp.c \
..\regexec.c \
..\run.c \
..\scope.c \
..\sv.c \
+ ..\sharedsv.c \
..\taint.c \
..\toke.c \
..\universal.c \
EXTRACORE_SRC += ..\malloc.c
.ENDIF
-.IF "$(USE_OBJECT)" != "define"
EXTRACORE_SRC += ..\perlio.c
-.ENDIF
WIN32_SRC = \
.\win32.c \
- .\win32io.c \
.\win32sck.c \
.\win32thread.c
+.IF "$(USE_PERLIO)" == "define"
+WIN32_SRC += .\win32io.c
+.ENDIF
+
.IF "$(CRYPT_SRC)" != ""
WIN32_SRC += .\$(CRYPT_SRC)
.ENDIF
..\proto.h \
..\regexp.h \
..\scope.h \
+ ..\sharedsv.h \
..\sv.h \
..\thread.h \
..\unixish.h \
CORE_OBJ = $(MICROCORE_OBJ) $(EXTRACORE_SRC:db:+$(o))
WIN32_OBJ = $(WIN32_SRC:db:+$(o))
MINICORE_OBJ = $(MINIDIR)\{$(MICROCORE_OBJ:f) miniperlmain$(o) perlio$(o)}
-MINIWIN32_OBJ = $(MINIDIR)\{$(WIN32_OBJ:f)}
+MINIWIN32_OBJ = $(MINIDIR)\{$(WIN32_OBJ:f)}
MINI_OBJ = $(MINICORE_OBJ) $(MINIWIN32_OBJ)
DLL_OBJ = $(DLL_SRC:db:+$(o))
X2P_OBJ = $(X2P_SRC:db:+$(o))
DYNAMIC_EXT = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \
Data/Dumper Devel/Peek ByteLoader Devel/DProf File/Glob \
Sys/Hostname Storable Filter/Util/Call Encode \
- Digest/MD5 PerlIO/Scalar MIME/Base64 Time/HiRes Time/Piece
+ Digest/MD5 PerlIO/Scalar MIME/Base64 Time/HiRes \
+ Unicode/Normalize
STATIC_EXT = DynaLoader
NONXS_EXT = Errno
perl config_sh.PL --cfgsh-option-file $(mktmp $(CFG_VARS)) \
$(CFGSH_TMPL) > ..\config.sh
-cd .. && del /f perl.exe
+ -cd .. && del /f perl*.dll
cd .. && perl configpm
-del /f $(CFGH_TMPL)
-mkdir $(COREDIR)
- -perl -I..\lib config_h.PL "INST_VER=$(INST_VER)"
+ -perl config_h.PL "INST_VER=$(INST_VER)"
rename config.h $(CFGH_TMPL)
$(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl
# This is the only file that depends on perlhost.h, vmem.h, and vdir.h
perllib$(o) : perllib.c .\perlhost.h .\vdir.h .\vmem.h
-.IF "$(USE_IMP_SYS)$(USE_OBJECT)" == "defineundef"
+.IF "$(USE_IMP_SYS)" == "define"
$(CC) -c -I. $(CFLAGS_O) $(CXX_FLAG) $(OBJOUT_FLAG)$@ perllib.c
.ELSE
$(CC) -c -I. $(CFLAGS_O) $(OBJOUT_FLAG)$@ perllib.c
-del /f $(LIBDIR)\.exists $(LIBDIR)\attrs.pm $(LIBDIR)\DynaLoader.pm
-del /f $(LIBDIR)\XSLoader.pm
-del /f $(LIBDIR)\Fcntl.pm $(LIBDIR)\IO.pm $(LIBDIR)\Opcode.pm
- -del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm $(LIBDIR)\Thread.pm
+ -del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm
-del /f $(LIBDIR)\SDBM_File.pm $(LIBDIR)\Socket.pm $(LIBDIR)\POSIX.pm
-del /f $(LIBDIR)\B.pm $(LIBDIR)\O.pm $(LIBDIR)\re.pm
-del /f $(LIBDIR)\Data\Dumper.pm $(LIBDIR)\ByteLoader.pm
-del /f $(LIBDIR)\Time\HiRes.pm
-del /f $(LIBDIR)\List\Util.pm
-del /f $(LIBDIR)\Scalar\Util.pm
- -del /f $(LIBDIR)\Time\Piece.pm
+ -del /f $(LIBDIR)\Unicode\Normalize.pm
-if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO || rmdir /s $(LIBDIR)\IO
-if exist $(LIBDIR)\Thread rmdir /s /q $(LIBDIR)\Thread || rmdir /s $(LIBDIR)\Thread
-if exist $(LIBDIR)\B rmdir /s /q $(LIBDIR)\B || rmdir /s $(LIBDIR)\B