fix VC build:

- update PCRE defines
- create timelib_config.h
- update .def dependencies

diff --git a/win32/php5dllts.dsp b/win32/php5dllts.dsp
index ac5fc3407a972d29a9d4b798097e4c0e920abdc4..3a2c194c6f3bb7fbb47d81a5719c69636f8e71fe 100644 (file)
--- a/win32/php5dllts.dsp
+++ b/win32/php5dllts.dsp
@@ -393,82 +393,82 @@ SOURCE=..\main\win95nt.h
 # Begin Source File\r
 \r
 SOURCE=..\ext\pcre\pcrelib\pcre_chartables.c\r
-# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"\r
+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP" /D MAX_NAME_SIZE=32 /D MAX_NAME_COUNT=10000 /D MAX_DUPLENGTH=30000 /D "NO_RECURSE"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\pcre\pcrelib\pcre_compile.c\r
-# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"\r
+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP" /D MAX_NAME_SIZE=32 /D MAX_NAME_COUNT=10000 /D MAX_DUPLENGTH=30000 /D "NO_RECURSE"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\pcre\pcrelib\pcre_exec.c\r
-# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"\r
+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP" /D MAX_NAME_SIZE=32 /D MAX_NAME_COUNT=10000 /D MAX_DUPLENGTH=30000 /D "NO_RECURSE"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\pcre\pcrelib\pcre_fullinfo.c\r
-# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"\r
+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP" /D MAX_NAME_SIZE=32 /D MAX_NAME_COUNT=10000 /D MAX_DUPLENGTH=30000 /D "NO_RECURSE"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\pcre\pcrelib\pcre_get.c\r
-# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"\r
+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP" /D MAX_NAME_SIZE=32 /D MAX_NAME_COUNT=10000 /D MAX_DUPLENGTH=30000 /D "NO_RECURSE"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\pcre\pcrelib\pcre_globals.c\r
-# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"\r
+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP" /D MAX_NAME_SIZE=32 /D MAX_NAME_COUNT=10000 /D MAX_DUPLENGTH=30000 /D "NO_RECURSE"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\pcre\pcrelib\pcre_info.c\r
-# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"\r
+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP" /D MAX_NAME_SIZE=32 /D MAX_NAME_COUNT=10000 /D MAX_DUPLENGTH=30000 /D "NO_RECURSE"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\pcre\pcrelib\pcre_maketables.c\r
-# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"\r
+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP" /D MAX_NAME_SIZE=32 /D MAX_NAME_COUNT=10000 /D MAX_DUPLENGTH=30000 /D "NO_RECURSE"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\pcre\pcrelib\pcre_ord2utf8.c\r
-# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"\r
+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP" /D MAX_NAME_SIZE=32 /D MAX_NAME_COUNT=10000 /D MAX_DUPLENGTH=30000 /D "NO_RECURSE"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\pcre\pcrelib\pcre_study.c\r
-# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"\r
+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP" /D MAX_NAME_SIZE=32 /D MAX_NAME_COUNT=10000 /D MAX_DUPLENGTH=30000 /D "NO_RECURSE"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\pcre\pcrelib\pcre_tables.c\r
-# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"\r
+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP" /D MAX_NAME_SIZE=32 /D MAX_NAME_COUNT=10000 /D MAX_DUPLENGTH=30000 /D "NO_RECURSE"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\pcre\pcrelib\pcre_try_flipped.c\r
-# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"\r
+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP" /D MAX_NAME_SIZE=32 /D MAX_NAME_COUNT=10000 /D MAX_DUPLENGTH=30000 /D "NO_RECURSE"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\pcre\pcrelib\pcre_ucp_searchfuncs.c\r
-# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"\r
+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP" /D MAX_NAME_SIZE=32 /D MAX_NAME_COUNT=10000 /D MAX_DUPLENGTH=30000 /D "NO_RECURSE"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\pcre\pcrelib\pcre_valid_utf8.c\r
-# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"\r
+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP" /D MAX_NAME_SIZE=32 /D MAX_NAME_COUNT=10000 /D MAX_DUPLENGTH=30000 /D "NO_RECURSE"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\pcre\pcrelib\pcre_version.c\r
-# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"\r
+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP" /D MAX_NAME_SIZE=32 /D MAX_NAME_COUNT=10000 /D MAX_DUPLENGTH=30000 /D "NO_RECURSE"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\pcre\pcrelib\pcre_xclass.c\r
-# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"\r
+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP" /D MAX_NAME_SIZE=32 /D MAX_NAME_COUNT=10000 /D MAX_DUPLENGTH=30000 /D "NO_RECURSE"\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files No. 3"\r
@@ -2283,6 +2283,57 @@ SOURCE=..\ext\date\lib\timelib.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\ext\date\lib\timelib_config.h.win32\r
+\r
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"\r
+\r
+# Begin Custom Build\r
+InputDir=\Projects\php-5.2\ext\date\lib\r
+InputPath=..\ext\date\lib\timelib_config.h.win32\r
+\r
+"..\ext\date\lib\timelib_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy $(InputPath) $(InputDir)\timelib_config.h\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"\r
+\r
+# Begin Custom Build\r
+InputDir=\Projects\php-5.2\ext\date\lib\r
+InputPath=..\ext\date\lib\timelib_config.h.win32\r
+\r
+"..\ext\date\lib\timelib_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy $(InputPath) $(InputDir)\timelib_config.h\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"\r
+\r
+# Begin Custom Build\r
+InputDir=\Projects\php-5.2\ext\date\lib\r
+InputPath=..\ext\date\lib\timelib_config.h.win32\r
+\r
+"..\ext\date\lib\timelib_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy $(InputPath) $(InputDir)\timelib_config.h\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"\r
+\r
+# Begin Custom Build\r
+InputDir=\Projects\php-5.2\ext\date\lib\r
+InputPath=..\ext\date\lib\timelib_config.h.win32\r
+\r
+"..\ext\date\lib\timelib_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy $(InputPath) $(InputDir)\timelib_config.h\r
+\r
+# End Custom Build\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\ext\date\lib\tm2unixtime.c\r
 # End Source File\r
 # Begin Source File\r
@@ -2382,6 +2433,14 @@ SOURCE=..\win32\wsyslog.c
 \r
 SOURCE=.\build\wsyslog.mc\r
 \r
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"\r
+\r
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"\r
+\r
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"\r
+\r
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"\r
+\r
 # Begin Custom Build\r
 InputDir=.\build\r
 IntDir=.\Release_TSDbg\r
@@ -2392,6 +2451,8 @@ InputPath=.\build\wsyslog.mc
 \r
 # End Custom Build\r
 \r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files No. 2"\r
@@ -2645,7 +2706,7 @@ SOURCE=.\phpts.def
 \r
 !IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"\r
 \r
-USERDEP__PHPTS="..\ext\sqlite\php_sqlite.def"  \r
+USERDEP__PHPTS="..\ext\sqlite\php_sqlite.def"  "..\ext\libxml\php_libxml2.def" \r
 # Begin Custom Build - Generating $(InputPath)\r
 InputPath=.\phpts.def\r
 \r
@@ -2656,7 +2717,7 @@ InputPath=.\phpts.def
 \r
 !ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"\r
 \r
-USERDEP__PHPTS="..\ext\sqlite\php_sqlite.def"  \r
+USERDEP__PHPTS="..\ext\sqlite\php_sqlite.def"  "..\ext\libxml\php_libxml2.def" \r
 # Begin Custom Build - Generating $(InputPath)\r
 InputPath=.\phpts.def\r
 \r
@@ -2667,7 +2728,7 @@ InputPath=.\phpts.def
 \r
 !ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"\r
 \r
-USERDEP__PHPTS="..\ext\sqlite\php_sqlite.def"  \r
+USERDEP__PHPTS="..\ext\sqlite\php_sqlite.def"  "..\ext\libxml\php_libxml2.def" \r
 # Begin Custom Build - Generating $(InputPath)\r
 InputPath=.\phpts.def\r
 \r
@@ -2678,7 +2739,7 @@ InputPath=.\phpts.def
 \r
 !ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"\r
 \r
-USERDEP__PHPTS="..\ext\sqlite\php_sqlite.def"  \r
+USERDEP__PHPTS="..\ext\sqlite\php_sqlite.def"  "..\ext\libxml\php_libxml2.def" \r
 # Begin Custom Build - Generating $(InputPath)\r
 InputPath=.\phpts.def\r
 \r