diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 2000-01-09 18:51:50 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 2000-01-09 18:51:50 +0000 |
| commit | aaacdc8b9b7d69c04e33245ec8de73f4e74bbd69 (patch) | |
| tree | 6551b80b23a99bc898b8666bdfcb9897d248587f /win32/makefile.mk | |
| parent | 76384e4ae84ed55d949d353b24577f0a3f3a082a (diff) | |
| download | perl-aaacdc8b9b7d69c04e33245ec8de73f4e74bbd69.tar.gz | |
Configure changes for new-style version numbers (from Andy Dougherty,
slightly altered)
p4raw-id: //depot/perl@4771
Diffstat (limited to 'win32/makefile.mk')
| -rw-r--r-- | win32/makefile.mk | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/win32/makefile.mk b/win32/makefile.mk index 9bdcf3d796..b7bf93fcf2 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -33,7 +33,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.00563 +INST_VER *= \5.00564 # # Comment this out if you DON'T want your perl installation to have @@ -51,7 +51,7 @@ INST_ARCH *= \$(ARCHNAME) # # uncomment to enable threads-capabilities # -#USE_THREADS *= define +#USE_5005THREADS *= define # # XXX WARNING! This option currently undergoing changes. May be broken. @@ -228,16 +228,16 @@ CRYPT_FLAG = -DHAVE_DES_FCRYPT .IF "$(USE_OBJECT)" == "define" PERL_MALLOC != undef -USE_THREADS != undef +USE_5005THREADS != undef USE_MULTI != undef USE_IMP_SYS != define .ENDIF PERL_MALLOC *= undef -USE_THREADS *= undef +USE_5005THREADS *= undef -.IF "$(USE_THREADS)" == "define" +.IF "$(USE_5005THREADS)" == "define" USE_ITHREADS != undef .ENDIF @@ -246,7 +246,7 @@ USE_OBJECT *= undef USE_ITHREADS *= undef USE_IMP_SYS *= undef -.IF "$(USE_MULTI)$(USE_THREADS)$(USE_OBJECT)" != "undefundefundef" +.IF "$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" != "undefundefundef" BUILDOPT += -DPERL_IMPLICIT_CONTEXT .ENDIF @@ -264,7 +264,7 @@ PROCESSOR_ARCHITECTURE *= x86 .IF "$(USE_OBJECT)" == "define" ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-object -.ELIF "$(USE_THREADS)" == "define" +.ELIF "$(USE_5005THREADS)" == "define" ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-thread .ELIF "$(USE_MULTI)" == "define" ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-multi @@ -272,6 +272,10 @@ ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-multi ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE) .ENDIF +.IF "$(USE_OBJECT)" == "define" +ARCHNAME = $(ARCHNAME)-thread +.ENDIF + # Visual Studio 98 specific .IF "$(CCTYPE)" == "MSVC60" @@ -644,7 +648,7 @@ WIN32_SRC = \ .\win32.c \ .\win32sck.c -.IF "$(USE_THREADS)" == "define" +.IF "$(USE_5005THREADS)" == "define" WIN32_SRC += .\win32thread.c .ENDIF @@ -843,7 +847,9 @@ CFG_VARS = \ static_ext=$(STATIC_EXT) ~ \ dynamic_ext=$(DYNAMIC_EXT) ~ \ nonxs_ext=$(NONXS_EXT) ~ \ - usethreads=$(USE_THREADS) ~ \ + use5005threads=$(USE_5005THREADS) ~ \ + useithreads=$(USE_ITHREADS) ~ \ + usethreads=$(USE_5005THREADS) ~ \ usemultiplicity=$(USE_MULTI) ~ \ LINK_FLAGS=$(LINK_FLAGS:s/\/\\/) ~ \ optimize=$(OPTIMIZE) |