diff options
| -rw-r--r-- | win32/config.vc | 2 | ||||
| -rw-r--r-- | win32/config_H.bc | 30 | ||||
| -rw-r--r-- | win32/config_H.gc | 30 | ||||
| -rw-r--r-- | win32/config_H.vc | 32 | ||||
| -rw-r--r-- | win32/config_h.PL | 2 | ||||
| -rw-r--r-- | win32/makefile.mk | 7 |
6 files changed, 53 insertions, 50 deletions
diff --git a/win32/config.vc b/win32/config.vc index a320bf11b1..9346ae00aa 100644 --- a/win32/config.vc +++ b/win32/config.vc @@ -767,7 +767,7 @@ usemultiplicity='undef' usemymalloc='n' usenm='false' useopcode='true' -useperlio='undef' +useperlio='define' useposix='true' usesfio='false' useshrplib='yes' diff --git a/win32/config_H.bc b/win32/config_H.bc index 7a4c4d00d4..2af3c6f796 100644 --- a/win32/config_H.bc +++ b/win32/config_H.bc @@ -13,7 +13,7 @@ /* * Package name : perl5 * Source directory : - * Configuration time: Thu Nov 23 10:24:23 2000 + * Configuration time: Wed Dec 6 18:24:42 2000 * Configured by : nick * Target system : */ @@ -957,12 +957,6 @@ */ #define SH_PATH "cmd /x /c" /**/ -/* STDCHAR: - * This symbol is defined to be the type of char used in stdio.h. - * It has the values "unsigned char" or "char". - */ -#define STDCHAR unsigned char /**/ - /* CROSSCOMPILE: * This symbol, if defined, signifies that we our * build process is a cross-compilation. @@ -1065,7 +1059,7 @@ * This symbol contains the ~name expanded version of ARCHLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define ARCHLIB "c:\\perl\\5.7.0\\lib\\MSWin32-x86" /**/ +#define ARCHLIB "c:\\perl\\5.7.0\\lib\\MSWin32-x86-multi-thread" /**/ /*#define ARCHLIB_EXP "" /**/ /* ARCHNAME: @@ -1074,7 +1068,7 @@ * where library files may be held under a private library, for * instance. */ -#define ARCHNAME "MSWin32-x86" /**/ +#define ARCHNAME "MSWin32-x86-multi-thread" /**/ /* HAS_ATOLF: * This symbol, if defined, indicates that the atolf routine is @@ -1096,8 +1090,8 @@ * This symbol is the filename expanded version of the BIN symbol, for * programs that do not want to deal with that at run-time. */ -#define BIN "c:\\perl\\5.7.0\\bin\\MSWin32-x86" /**/ -#define BIN_EXP "c:\\perl\\5.7.0\\bin\\MSWin32-x86" /**/ +#define BIN "c:\\perl\\5.7.0\\bin\\MSWin32-x86-multi-thread" /**/ +#define BIN_EXP "c:\\perl\\5.7.0\\bin\\MSWin32-x86-multi-thread" /**/ /* PERL_BINCOMPAT_5005: * This symbol, if defined, indicates that this version of Perl should be @@ -2883,7 +2877,7 @@ * This symbol contains the ~name expanded version of SITEARCH, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITEARCH "c:\\perl\\site\\5.7.0\\lib\\MSWin32-x86" /**/ +#define SITEARCH "c:\\perl\\site\\5.7.0\\lib\\MSWin32-x86-multi-thread" /**/ /*#define SITEARCH_EXP "" /**/ /* SITELIB: @@ -3035,7 +3029,7 @@ * be built to use multiplicity. */ #ifndef MULTIPLICITY -/*#define MULTIPLICITY /**/ +#define MULTIPLICITY /**/ #endif /* USE_PERLIO: @@ -3068,7 +3062,7 @@ * be built to use the old draft POSIX threads API. */ /*#define USE_5005THREADS /**/ -/*#define USE_ITHREADS /**/ +#define USE_ITHREADS /**/ #if defined(USE_5005THREADS) && !defined(USE_ITHREADS) #define USE_THREADS /* until src is revised*/ #endif @@ -3132,7 +3126,7 @@ /* PERL_XS_APIVERSION: * This variable contains the version of the oldest perl binary * compatible with the present perl. perl.c:incpush() and - * lib/lib.pm will automatically search in c:\\perl\\site\\5.7.0\\lib\\MSWin32-x86 for older + * lib/lib.pm will automatically search in c:\\perl\\site\\5.7.0\\lib\\MSWin32-x86-multi-thread for older * directories across major versions back to xs_apiversion. * This is only useful if you have a perl library directory tree * structured like the default one. @@ -3187,6 +3181,12 @@ /*#define HAS_SETPGRP /**/ /*#define USE_BSD_SETPGRP /**/ +/* STDCHAR: + * This symbol is defined to be the type of char used in stdio.h. + * It has the values "unsigned char" or "char". + */ +#define STDCHAR unsigned char /**/ + /* HAS__FWALK: * This symbol, if defined, indicates that the _fwalk system call is * available to apply a function to all the file handles. diff --git a/win32/config_H.gc b/win32/config_H.gc index 6d90b9fcd3..d26492fca9 100644 --- a/win32/config_H.gc +++ b/win32/config_H.gc @@ -13,7 +13,7 @@ /* * Package name : perl5 * Source directory : - * Configuration time: Thu Nov 23 10:22:12 2000 + * Configuration time: Wed Dec 6 18:22:28 2000 * Configured by : nick * Target system : */ @@ -957,12 +957,6 @@ */ #define SH_PATH "cmd /x /c" /**/ -/* STDCHAR: - * This symbol is defined to be the type of char used in stdio.h. - * It has the values "unsigned char" or "char". - */ -#define STDCHAR char /**/ - /* CROSSCOMPILE: * This symbol, if defined, signifies that we our * build process is a cross-compilation. @@ -1065,7 +1059,7 @@ * This symbol contains the ~name expanded version of ARCHLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define ARCHLIB "c:\\perl\\5.7.0\\lib\\MSWin32-x86" /**/ +#define ARCHLIB "c:\\perl\\5.7.0\\lib\\MSWin32-x86-multi-thread" /**/ /*#define ARCHLIB_EXP "" /**/ /* ARCHNAME: @@ -1074,7 +1068,7 @@ * where library files may be held under a private library, for * instance. */ -#define ARCHNAME "MSWin32-x86" /**/ +#define ARCHNAME "MSWin32-x86-multi-thread" /**/ /* HAS_ATOLF: * This symbol, if defined, indicates that the atolf routine is @@ -1096,8 +1090,8 @@ * This symbol is the filename expanded version of the BIN symbol, for * programs that do not want to deal with that at run-time. */ -#define BIN "c:\\perl\\5.7.0\\bin\\MSWin32-x86" /**/ -#define BIN_EXP "c:\\perl\\5.7.0\\bin\\MSWin32-x86" /**/ +#define BIN "c:\\perl\\5.7.0\\bin\\MSWin32-x86-multi-thread" /**/ +#define BIN_EXP "c:\\perl\\5.7.0\\bin\\MSWin32-x86-multi-thread" /**/ /* PERL_BINCOMPAT_5005: * This symbol, if defined, indicates that this version of Perl should be @@ -2883,7 +2877,7 @@ * This symbol contains the ~name expanded version of SITEARCH, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITEARCH "c:\\perl\\site\\5.7.0\\lib\\MSWin32-x86" /**/ +#define SITEARCH "c:\\perl\\site\\5.7.0\\lib\\MSWin32-x86-multi-thread" /**/ /*#define SITEARCH_EXP "" /**/ /* SITELIB: @@ -3035,7 +3029,7 @@ * be built to use multiplicity. */ #ifndef MULTIPLICITY -/*#define MULTIPLICITY /**/ +#define MULTIPLICITY /**/ #endif /* USE_PERLIO: @@ -3068,7 +3062,7 @@ * be built to use the old draft POSIX threads API. */ /*#define USE_5005THREADS /**/ -/*#define USE_ITHREADS /**/ +#define USE_ITHREADS /**/ #if defined(USE_5005THREADS) && !defined(USE_ITHREADS) #define USE_THREADS /* until src is revised*/ #endif @@ -3132,7 +3126,7 @@ /* PERL_XS_APIVERSION: * This variable contains the version of the oldest perl binary * compatible with the present perl. perl.c:incpush() and - * lib/lib.pm will automatically search in c:\\perl\\site\\5.7.0\\lib\\MSWin32-x86 for older + * lib/lib.pm will automatically search in c:\\perl\\site\\5.7.0\\lib\\MSWin32-x86-multi-thread for older * directories across major versions back to xs_apiversion. * This is only useful if you have a perl library directory tree * structured like the default one. @@ -3187,6 +3181,12 @@ /*#define HAS_SETPGRP /**/ /*#define USE_BSD_SETPGRP /**/ +/* STDCHAR: + * This symbol is defined to be the type of char used in stdio.h. + * It has the values "unsigned char" or "char". + */ +#define STDCHAR char /**/ + /* HAS__FWALK: * This symbol, if defined, indicates that the _fwalk system call is * available to apply a function to all the file handles. diff --git a/win32/config_H.vc b/win32/config_H.vc index 43e4745d35..0aa5f385d6 100644 --- a/win32/config_H.vc +++ b/win32/config_H.vc @@ -13,7 +13,7 @@ /* * Package name : perl5 * Source directory : - * Configuration time: Thu Nov 23 10:24:50 2000 + * Configuration time: Wed Dec 6 14:45:43 2000 * Configured by : nick * Target system : */ @@ -957,12 +957,6 @@ */ #define SH_PATH "cmd /x /c" /**/ -/* STDCHAR: - * This symbol is defined to be the type of char used in stdio.h. - * It has the values "unsigned char" or "char". - */ -#define STDCHAR char /**/ - /* CROSSCOMPILE: * This symbol, if defined, signifies that we our * build process is a cross-compilation. @@ -1065,7 +1059,7 @@ * This symbol contains the ~name expanded version of ARCHLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define ARCHLIB "c:\\perl\\5.7.0\\lib\\MSWin32-x86" /**/ +#define ARCHLIB "c:\\perl\\5.7.0\\lib\\MSWin32-x86-multi-thread" /**/ /*#define ARCHLIB_EXP "" /**/ /* ARCHNAME: @@ -1074,7 +1068,7 @@ * where library files may be held under a private library, for * instance. */ -#define ARCHNAME "MSWin32-x86" /**/ +#define ARCHNAME "MSWin32-x86-multi-thread" /**/ /* HAS_ATOLF: * This symbol, if defined, indicates that the atolf routine is @@ -1096,8 +1090,8 @@ * This symbol is the filename expanded version of the BIN symbol, for * programs that do not want to deal with that at run-time. */ -#define BIN "c:\\perl\\5.7.0\\bin\\MSWin32-x86" /**/ -#define BIN_EXP "c:\\perl\\5.7.0\\bin\\MSWin32-x86" /**/ +#define BIN "c:\\perl\\5.7.0\\bin\\MSWin32-x86-multi-thread" /**/ +#define BIN_EXP "c:\\perl\\5.7.0\\bin\\MSWin32-x86-multi-thread" /**/ /* PERL_BINCOMPAT_5005: * This symbol, if defined, indicates that this version of Perl should be @@ -2883,7 +2877,7 @@ * This symbol contains the ~name expanded version of SITEARCH, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITEARCH "c:\\perl\\site\\5.7.0\\lib\\MSWin32-x86" /**/ +#define SITEARCH "c:\\perl\\site\\5.7.0\\lib\\MSWin32-x86-multi-thread" /**/ /*#define SITEARCH_EXP "" /**/ /* SITELIB: @@ -3035,7 +3029,7 @@ * be built to use multiplicity. */ #ifndef MULTIPLICITY -/*#define MULTIPLICITY /**/ +#define MULTIPLICITY /**/ #endif /* USE_PERLIO: @@ -3044,7 +3038,7 @@ * used in a fully backward compatible manner. */ #ifndef USE_PERLIO -/*#define USE_PERLIO /**/ +#define USE_PERLIO /**/ #endif /* USE_SOCKS: @@ -3068,7 +3062,7 @@ * be built to use the old draft POSIX threads API. */ /*#define USE_5005THREADS /**/ -/*#define USE_ITHREADS /**/ +#define USE_ITHREADS /**/ #if defined(USE_5005THREADS) && !defined(USE_ITHREADS) #define USE_THREADS /* until src is revised*/ #endif @@ -3132,7 +3126,7 @@ /* PERL_XS_APIVERSION: * This variable contains the version of the oldest perl binary * compatible with the present perl. perl.c:incpush() and - * lib/lib.pm will automatically search in c:\\perl\\site\\5.7.0\\lib\\MSWin32-x86 for older + * lib/lib.pm will automatically search in c:\\perl\\site\\5.7.0\\lib\\MSWin32-x86-multi-thread for older * directories across major versions back to xs_apiversion. * This is only useful if you have a perl library directory tree * structured like the default one. @@ -3187,6 +3181,12 @@ /*#define HAS_SETPGRP /**/ /*#define USE_BSD_SETPGRP /**/ +/* STDCHAR: + * This symbol is defined to be the type of char used in stdio.h. + * It has the values "unsigned char" or "char". + */ +#define STDCHAR char /**/ + /* HAS__FWALK: * This symbol, if defined, indicates that the _fwalk system call is * available to apply a function to all the file handles. diff --git a/win32/config_h.PL b/win32/config_h.PL index 91f35a4753..a0ee22d305 100644 --- a/win32/config_h.PL +++ b/win32/config_h.PL @@ -45,7 +45,7 @@ eval $str; die "$str:$@" if $@; open(H,">$file.new") || die "Cannot open $file.new:$!"; -binmode H; # no CRs (which cause a spurious rebuild) +#binmode H; # no CRs (which cause a spurious rebuild) while (<SH>) { last if /^$term$/o; diff --git a/win32/makefile.mk b/win32/makefile.mk index 97b580cb2b..c4a1398b1c 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -95,11 +95,11 @@ USE_IMP_SYS *= define # Visual C++ > 2.x and < 6.x #CCTYPE *= MSVC # Visual C++ >= 6.x -#CCTYPE *= MSVC60 +CCTYPE *= MSVC60 # Borland 5.02 or later #CCTYPE *= BORLAND # mingw32+gcc-2.95.2 or better -CCTYPE *= GCC +#CCTYPE *= GCC # # uncomment this if you are compiling under Windows 95/98 and command.com @@ -292,10 +292,13 @@ ARCHNAME !:= $(ARCHNAME)-thread # run in about 10% less time. DELAYLOAD *= -DELAYLOAD:wsock32.dll -DELAYLOAD:shell32.dll delayimp.lib +.IF "$(CFG)" == "Debug" +.ELSE # VC 6.0 seems capable of compiling perl correctly with optimizations # enabled. Anything earlier fails tests. CFG *= Optimize .ENDIF +.ENDIF ARCHDIR = ..\lib\$(ARCHNAME) COREDIR = ..\lib\CORE |