improve .dsp build

diff --git a/main/config.w32.h b/main/config.w32.h
index 724a8a1569ae256ecf973c4adee5653444638dd1..50f783940a739098de417c7ae95bae39fbe52878 100644 (file)
--- a/main/config.w32.h
+++ b/main/config.w32.h
@@ -72,9 +72,13 @@
 #define HAVE_DOM 1
 #define HAVE_SIMPLEXML 1
 #define HAVE_XML 1
+#define HAVE_XMLREADER 1
+#define HAVE_XMLWRITER 1
+#define HAVE_LIBXML_PARSER_H 1
 
 /* Enable / Disable ZLIB extension (default: enabled) */
 #define HAVE_ZLIB 1
+#define HAVE_ZLIB_H 1
 
 /* Enable / Disable SQLite extension (default: enabled) */
 #define HAVE_SQLITE 1
@@ -190,7 +194,6 @@
 #define HAVE_SQLDATASOURCES
 #define POSIX_MALLOC_THRESHOLD 10
 
-
 /*
  * defining HAVE_SOCKLEN_T prevents PHP from building with the latest platform SDK...
  * #define HAVE_SOCKLEN_T
@@ -203,3 +206,44 @@
 #define PHP_CAN_SUPPORT_PROC_OPEN 1
 
 #define HAVE_MBLEN
+
+#undef HAVE_ATOF_ACCEPTS_NAN
+#undef HAVE_ATOF_ACCEPTS_INF
+#define HAVE_HUGE_VAL_NAN 1
+
+/* vs.net 2005 has a 64-bit time_t.  This will likely break
+ * 3rdParty libs that were built with older compilers; switch
+ * back to 32-bit */
+#define _USE_32BIT_TIME_T 1
+#define HAVE_STDLIB_H 1
+/* have the arpa\nameser.h header file */
+#define HAVE_ARPA_NAMESER_H 1
+
+/* undefined */
+#define PHP_FASTCGI 1
+
+/* Have COM_DOTNET support */
+#define HAVE_COM_DOTNET 1
+
+/* Have date/time support */
+#define HAVE_DATE 1
+
+/* GD support */
+#define HAVE_LIBGD 1
+/* undefined */
+#define HAVE_HASH_EXT 1
+
+/* Define if iconv extension is enabled */
+#define HAVE_ICONV 1
+
+/* Define if libiconv is available */
+#define HAVE_LIBICONV 1
+
+/* Which iconv implementation to use */
+#define PHP_ICONV_IMPL "\"libiconv\""
+
+/* Whether iconv supports errno or not */
+#define ICONV_SUPPORTS_ERRNO 1
+
+/* SPL support */
+#define HAVE_SPL 1

diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index 6edde1ea4db488eb16aa8526335ed0a857d0c06d..a2d7cf0e29c0f95e7df0da8092078c33ea1407f8 100644 (file)
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -48,6 +48,7 @@
 #include "ext/standard/php_lcg.h"
 #include "ext/standard/php_array.h"
 #include "ext/standard/php_assert.h"
+#include "ext/reflection/php_reflection.h"
 #if HAVE_BCMATH
 #include "ext/bcmath/php_bcmath.h"
 #endif
@@ -57,9 +58,15 @@
 #if HAVE_CTYPE
 #include "ext/ctype/php_ctype.h"
 #endif
+#if HAVE_DATE
+#include "ext/date/php_date.h"
+#endif
 #if HAVE_FTP
 #include "ext/ftp/php_ftp.h"
 #endif
+#if HAVE_ICONV
+#include "ext/iconv/php_iconv.h"
+#endif
 #include "ext/standard/reg.h"
 #if HAVE_PCRE || HAVE_BUNDLED_PCRE
 #include "ext/pcre/php_pcre.h"
@@ -98,6 +105,15 @@
 #include "ext/sqlite/php_sqlite.h"
 #endif
 #include "ext/com_dotnet/php_com_dotnet.h"
+#ifdef HAVE_SPL
+#include "ext/spl/php_spl.h"
+#endif
+#if HAVE_XML && HAVE_XMLREADER
+#include "ext/xmlreader/php_xmlreader.h"
+#endif
+#if HAVE_XML && HAVE_XMLWRITER
+#include "ext/xmlwriter/php_xmlwriter.h"
+#endif
 /* }}} */
 
 /* {{{ php_builtin_extensions[]
@@ -114,9 +130,18 @@ zend_module_entry *php_builtin_extensions[] = {
 #if HAVE_CTYPE
        ,phpext_ctype_ptr
 #endif
+#if HAVE_DATE
+       ,phpext_date_ptr
+#endif
 #if HAVE_FTP
        ,phpext_ftp_ptr
 #endif
+#if HAVE_HASH
+       ,phpext_hash_ptr
+#endif
+#if HAVE_ICONV
+       ,phpext_iconv_ptr
+#endif
 #if HAVE_MBSTRING
        ,phpext_mbstring_ptr
 #endif
@@ -126,6 +151,7 @@ zend_module_entry *php_builtin_extensions[] = {
 #if HAVE_PCRE || HAVE_BUNDLED_PCRE
        ,phpext_pcre_ptr
 #endif
+       ,phpext_reflection_ptr
 #if HAVE_PHP_SESSION
        ,phpext_session_ptr
 #endif
@@ -153,6 +179,15 @@ zend_module_entry *php_builtin_extensions[] = {
 #if HAVE_SQLITE
        ,phpext_sqlite_ptr
 #endif
+#if HAVE_SPL
+       ,phpext_spl_ptr
+#endif
+#if HAVE_XML && HAVE_XMLREADER
+       ,phpext_xmlreader_ptr
+#endif
+#if HAVE_XML && HAVE_XMLWRITER
+       ,phpext_xmlwriter_ptr
+#endif
 };
 /* }}} */
 

diff --git a/win32/php5dllts.dsp b/win32/php5dllts.dsp
index 745d800f4fc613d1630b4897727c8623541971bc..ac5fc3407a972d29a9d4b798097e4c0e920abdc4 100644 (file)
--- a/win32/php5dllts.dsp
+++ b/win32/php5dllts.dsp
@@ -213,6 +213,10 @@ SOURCE=..\main\php_scandir.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\main\php_sprintf.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\main\php_ticks.c\r
 # End Source File\r
 # Begin Source File\r
@@ -388,28 +392,83 @@ SOURCE=..\main\win95nt.h
 # PROP Default_Filter ".c"\r
 # Begin Source File\r
 \r
-SOURCE=..\ext\pcre\pcrelib\chartables.c\r
-# ADD CPP /D "STATIC" /D "SUPPORT_UTF8"\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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\ext\pcre\pcrelib\get.c\r
-# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D LINK_SIZE=2\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
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\ext\pcre\pcrelib\maketables.c\r
-# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D LINK_SIZE=2\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
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\ext\pcre\pcrelib\pcre.c\r
-# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D LINK_SIZE=2\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
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\ext\pcre\pcrelib\study.c\r
-# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D LINK_SIZE=2\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
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files No. 3"\r
@@ -714,34 +773,42 @@ SOURCE=..\ext\ftp\php_ftp.h
 # Begin Source File\r
 \r
 SOURCE=..\ext\calendar\cal_unix.c\r
+# PROP Intermediate_Dir "calendar"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\calendar\calendar.c\r
+# PROP Intermediate_Dir "calendar"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\calendar\dow.c\r
+# PROP Intermediate_Dir "calendar"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\calendar\easter.c\r
+# PROP Intermediate_Dir "calendar"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\calendar\french.c\r
+# PROP Intermediate_Dir "calendar"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\calendar\gregor.c\r
+# PROP Intermediate_Dir "calendar"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\calendar\jewish.c\r
+# PROP Intermediate_Dir "calendar"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\calendar\julian.c\r
+# PROP Intermediate_Dir "calendar"\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files No. 7"\r
@@ -757,6 +824,171 @@ SOURCE=..\ext\calendar\sdncal.h
 # End Source File\r
 # End Group\r
 # End Group\r
+# Begin Group "SPL"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Group "Source Files No. 11"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\spl\php_spl.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\spl\spl_array.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\spl\spl_directory.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\spl\spl_engine.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\spl\spl_exceptions.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\spl\spl_functions.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\spl\spl_iterators.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\spl\spl_observer.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\spl\spl_sxe.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files No. 12"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\spl\php_spl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\spl\spl_array.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\spl\spl_directory.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\spl\spl_engine.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\spl\spl_exceptions.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\spl\spl_functions.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\spl\spl_iterators.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\spl\spl_observer.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\spl\spl_sxe.h\r
+# End Source File\r
+# End Group\r
+# End Group\r
+# Begin Group "Reflection"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Group "Source Files No. 12"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\reflection\php_reflection.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files No. 13"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\reflection\php_reflection.h\r
+# End Source File\r
+# End Group\r
+# End Group\r
+# Begin Group "XMLReader"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Group "Source Files No. 13"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\xmlreader\php_xmlreader.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files No. 14"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\xmlreader\php_xmlreader.h\r
+# End Source File\r
+# End Group\r
+# End Group\r
+# Begin Group "XMLwriter"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Group "Source Files No. 14"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\xmlwriter\php_xmlwriter.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files No. 15"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\xmlwriter\php_xmlwriter.h\r
+# End Source File\r
+# End Group\r
+# End Group\r
+# Begin Group "IConv"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Group "Source Files No. 15"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\iconv\iconv.c\r
+# ADD CPP /D "PHP_ICONV_EXPORTS"\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files No. 16"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\iconv\php_iconv.h\r
+# End Source File\r
+# End Group\r
+# End Group\r
 # Begin Group "bcmath"\r
 \r
 # PROP Default_Filter ""\r
@@ -1753,10 +1985,6 @@ SOURCE=..\ext\standard\strnatcmp.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\ext\standard\sunfuncs.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\ext\standard\syslog.c\r
 # End Source File\r
 # Begin Source File\r
@@ -2023,6 +2251,74 @@ SOURCE=..\ext\libxml\libxml.c
 # End Source File\r
 # End Group\r
 # End Group\r
+# Begin Group "Date"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Group "Source Files No. 10"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\date\lib\astro.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\date\lib\dow.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\date\lib\parse_date.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\date\lib\parse_tz.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\date\php_date.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\date\lib\timelib.c\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
+\r
+SOURCE=..\ext\date\lib\unixtime2tm.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files No. 11"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\date\lib\astro.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\date\lib\fallbackmap.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\date\php_date.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\date\lib\timelib.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\date\lib\timezonedb.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\date\lib\timezonemap.h\r
+# End Source File\r
+# End Group\r
+# End Group\r
 # End Group\r
 # Begin Group "Win32"\r
 \r
@@ -2081,6 +2377,21 @@ SOURCE=..\win32\winutil.c
 # Begin Source File\r
 \r
 SOURCE=..\win32\wsyslog.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\build\wsyslog.mc\r
+\r
+# Begin Custom Build\r
+InputDir=.\build\r
+IntDir=.\Release_TSDbg\r
+InputPath=.\build\wsyslog.mc\r
+\r
+"wsyslog.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       mc -h $(InputDir)/.. -r $(InputDir) -x $(IntDir) $(InputPath)\r
+\r
+# End Custom Build\r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files No. 2"\r