fixed windows build.

diff --git a/ext/mbstring/mbstring.dsp b/ext/mbstring/mbstring.dsp
index 5f9808249619b4b529c1c691781eb27febc7357c..03dadfc1799ef4b848a40f223f146190ede87f33 100644 (file)
--- a/ext/mbstring/mbstring.dsp
+++ b/ext/mbstring/mbstring.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MBSTRING_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /I "libmbfl" /I "libmbfl\mbfl" /D ZEND_DEBUG=0 /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_MBSTRING" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D MBSTRING_EXPORTS=1 /D HAVE_MBSTRING=1 /D HAVE_MBREGEX=1 /D HAVE_MBSTR_CN=1 /D HAVE_MBSTR_JA=1 /D HAVE_MBSTR_KR=1 /D HAVE_MBSTR_RU=1 /D HAVE_MBSTR_TW=1 /D MBFL_DLL_EXPORT=1 /D "LIBMBFL_EXPORTS" /D "HAVE_STRICMP" /D "HAVE_CONFIG_H" /D "HAVE_STDLIB_H"  /FR /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /I "libmbfl" /I "libmbfl\mbfl" /I "mbregex" /D ZEND_DEBUG=0 /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_MBSTRING" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D MBSTRING_EXPORTS=1 /D HAVE_MBSTRING=1 /D HAVE_MBREGEX=1 /D HAVE_MBSTR_CN=1 /D HAVE_MBSTR_JA=1 /D HAVE_MBSTR_KR=1 /D HAVE_MBSTR_RU=1 /D HAVE_MBSTR_TW=1 /FR /YX /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x407 /d "NDEBUG"\r
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MBSTRING_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM"  /I "libmbfl" /I "libmbfl\mbfl" /D ZEND_DEBUG=1 /D "MBSTRING_EXPORTS" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_MBSTRING" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D MBSTRING_EXPORTS=1 /D HAVE_MBSTRING=1 /D HAVE_MBREGEX=1 /D HAVE_MBSTR_CN=1 /D HAVE_MBSTR_JA=1 /D HAVE_MBSTR_KR=1 /D HAVE_MBSTR_RU=1 /D HAVE_MBSTR_TW=1 /D MBFL_DLL_EXPORT=1 /D "LIBMBFL_EXPORTS" /D "HAVE_STRICMP" /D "HAVE_CONFIG_H" /D "HAVE_STDLIB_H"  /YX /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /I "libmbfl" /I "libmbfl\mbfl" /I "mbregex" /D ZEND_DEBUG=1 /D "MBSTRING_EXPORTS" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_MBSTRING" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D MBSTRING_EXPORTS=1 /D HAVE_MBSTRING=1 /D HAVE_MBREGEX=1 /D HAVE_MBSTR_CN=1 /D HAVE_MBSTR_JA=1 /D HAVE_MBSTR_KR=1 /D HAVE_MBSTR_RU=1 /D HAVE_MBSTR_TW=1 /YX /FD /GZ /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x407 /d "_DEBUG"\r
@@ -92,6 +92,48 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 # Begin Source File\r
 \r
+SOURCE=.\mbregex\mbregex.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\mbstring.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\php_mbregex.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\php_unicode.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files"\r
+\r
+# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
+# Begin Source File\r
+\r
+SOURCE=.\mbregex\mbregex.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\mbstring.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\php_unicode.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\unicode_data.h\r
+# End Source File\r
+# End Group\r
+# Begin Group "libmbfl"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Group "Source Files No. 1"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
 \r
 SOURCE=.\libmbfl\filters\html_entities.c\r
 # End Source File\r
@@ -356,30 +398,14 @@ SOURCE=.\libmbfl\nls\nls_uni.c
 SOURCE=.\libmbfl\nls\nls_zh.c\r
 # End Source File\r
 # End Group\r
-\r
-SOURCE=.\mbregx\mbregex.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\mbstring.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\php_mbregex.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\php_unicode.c\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
+# Begin Group "Header Files No. 1"\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
 SOURCE=.\libmbfl\config.h.vc6\r
 \r
-!IF  "$(CFG)" == "mbstring - Win32 Release_TS MBSTRING"\r
+!IF  "$(CFG)" == "mbstring - Win32 Release_TS"\r
 \r
 # Begin Custom Build\r
 InputDir=.\libmbfl\r
@@ -390,7 +416,7 @@ InputPath=.\libmbfl\config.h.vc6
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "mbstring - Win32 Debug_TS MBSTRING"\r
+!ELSEIF  "$(CFG)" == "mbstring - Win32 Debug_TS"\r
 \r
 # Begin Custom Build\r
 InputDir=.\libmbfl\r
@@ -770,20 +796,9 @@ SOURCE=.\libmbfl\filters\unicode_table_koi8r.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\mbregex.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\mbstring.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\php_unicode.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\unicode_data.h\r
+SOURCE=.\libmbfl\filters\unicode_table_uhc.h\r
 # End Source File\r
 # End Group\r
+# End Group\r
 # End Target\r
 # End Project\r