I forgot to commit the .dsp update...

4 files changed, 598 insertions, 256 deletions

diff --git a/win32/libbcmath.dsp b/win32/libbcmath.dsp
deleted file mode 100644
index 53075484e4..0000000000
--- a/win32/libbcmath.dsp
+++ /dev/null
@@ -1,203 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libbcmath" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

-

-CFG=libbcmath - Win32 Release_TS_Inline

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "libbcmath.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "libbcmath.mak" CFG="libbcmath - Win32 Release_TS_Inline"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "libbcmath - Win32 Release_TS" (based on "Win32 (x86) Static Library")

-!MESSAGE "libbcmath - Win32 Debug_TS" (based on "Win32 (x86) Static Library")

-!MESSAGE "libbcmath - Win32 Release_TS_Inline" (based on "Win32 (x86) Static Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "libbcmath - Win32 Release_TS"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Output_Dir "libbcmath_Release_TS"

-# PROP BASE Intermediate_Dir "libbcmath_Release_TS"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Output_Dir "Release_TS"

-# PROP Intermediate_Dir "Release_TS"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDebug_TS" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../ext/bcmath/libbcmath/src" /I "../Zend" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDebug_TS"

-# ADD RSC /l 0x409 /d "NDebug_TS"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

-!ELSEIF  "$(CFG)" == "libbcmath - Win32 Debug_TS"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Output_Dir "libbcmath_Debug_TS"

-# PROP BASE Intermediate_Dir "libbcmath_Debug_TS"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Output_Dir "libbcmath_Debug_TS"

-# PROP Intermediate_Dir "libbcmath_Debug_TS"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_Debug_TS" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_Debug_TS" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

-# ADD BASE RSC /l 0x409 /d "_Debug_TS"

-# ADD RSC /l 0x409 /d "_Debug_TS"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"Debug_TS\libbcmath.lib"

-

-!ELSEIF  "$(CFG)" == "libbcmath - Win32 Release_TS_Inline"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Output_Dir "libbcmath___Win32_Release_TS_Inline"

-# PROP BASE Intermediate_Dir "libbcmath___Win32_Release_TS_Inline"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Output_Dir "Release_TS_Inline"

-# PROP Intermediate_Dir "Release_TS_Inline"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../ext/bcmath/libbcmath/src" /I "../Zend" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../ext/bcmath/libbcmath/src" /I "../Zend" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDebug_TS"

-# ADD RSC /l 0x409 /d "NDebug_TS"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"Release_TS\libbcmath.lib"

-# ADD LIB32 /nologo

-

-!ENDIF 

-

-# Begin Target

-

-# Name "libbcmath - Win32 Release_TS"

-# Name "libbcmath - Win32 Debug_TS"

-# Name "libbcmath - Win32 Release_TS_Inline"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\add.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\compare.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\debug.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\div.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\divmod.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\doaddsub.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\init.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\int2num.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\nearzero.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\neg.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\num2long.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\num2str.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\outofmem.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\output.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\raise.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\raisemod.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\recmul.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\rmzero.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\rt.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\sqrt.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\str2num.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\sub.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\bcmath\libbcmath\src\zero.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# End Target

-# End Project

diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index 0ccc5831a9..fca2f31d06 100644
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib libbcmath.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"..\ext\mysql\libmysql\Debug_TS" /libpath:"Debug_TS"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"..\ext\mysql\libmysql\Debug_TS" /libpath:"Debug_TS"

 

 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

 

@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib libcrypt.lib libbcmath.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS" /libpath:"Release_TS"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib libcrypt.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS" /libpath:"Release_TS"

 

 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

 

@@ -107,7 +107,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"..\bindlib_w32\Release"

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib libbcmath.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS_inline\php4ts.dll" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\Zend\Release_TS_inline" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS_inline" /libpath:"Release_TS_Inline"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS_inline\php4ts.dll" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\Zend\Release_TS_inline" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS_inline" /libpath:"Release_TS_Inline"

 

 !ENDIF 

 

@@ -1002,6 +1002,581 @@ SOURCE=..\ext\calendar\sdncal.h
 # End Source File

 # End Group

 # End Group

+# Begin Group "bcmath"

+

+# PROP Default_Filter ""

+# Begin Group "Source Files No. 8"

+

+# PROP Default_Filter ".c"

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\add.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\compare.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\debug.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\div.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\divmod.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\doaddsub.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\init.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\int2num.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\nearzero.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\neg.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\num2long.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\num2str.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\outofmem.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\output.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\raise.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\raisemod.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\recmul.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\rmzero.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\rt.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\sqrt.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\str2num.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\sub.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\zero.c

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+# ADD CPP /I "..\ext\bcmath\libbcmath\src"

+

+!ENDIF 

+

+# End Source File

+# End Group

+# Begin Group "Header Files No. 8"

+

+# PROP Default_Filter ".h"

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\bcmath.h

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\config.h

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\bcmath\libbcmath\src\private.h

+

+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

+

+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"

+

+# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

+

+!ENDIF 

+

+# End Source File

+# End Group

+# End Group

 # End Group

 # Begin Group "Win32"

 

diff --git a/win32/php4ts.dsw b/win32/php4ts.dsw
index c811143a33..b9e0c776a8 100644
--- a/win32/php4ts.dsw
+++ b/win32/php4ts.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "TSRM"="..\TSRM\TSRM.dsp" - Package Owner=<4>

+Project: "TSRM"=..\TSRM\TSRM.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -15,7 +15,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "ZendTS"="..\Zend\ZendTS.dsp" - Package Owner=<4>

+Project: "ZendTS"=..\Zend\ZendTS.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -30,7 +30,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "libbcmath"=".\libbcmath.dsp" - Package Owner=<4>

+Project: "libmysql"=..\ext\mysql\libmysql\libmysql.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -42,19 +42,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "libmysql"="..\ext\mysql\libmysql\libmysql.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "php4aolserver"="..\sapi\aolserver\php4aolserver.dsp" - Package Owner=<4>

+Project: "php4aolserver"=..\sapi\aolserver\php4aolserver.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -69,7 +57,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "php4apache"="..\sapi\apache\php4apache.dsp" - Package Owner=<4>

+Project: "php4apache"=..\sapi\apache\php4apache.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -84,7 +72,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "php4dllts"=".\php4dllts.dsp" - Package Owner=<4>

+Project: "php4dllts"=.\php4dllts.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -104,14 +92,11 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name bindlib

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libbcmath

-    End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "php4isapi"="..\sapi\isapi\php4isapi.dsp" - Package Owner=<4>

+Project: "php4isapi"=..\sapi\isapi\php4isapi.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -126,7 +111,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "php4nsapi"="..\sapi\nsapi\php4nsapi.dsp" - Package Owner=<4>

+Project: "php4nsapi"=..\sapi\nsapi\php4nsapi.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -141,7 +126,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "php4ts"=".\php4ts.dsp" - Package Owner=<4>

+Project: "php4ts"=.\php4ts.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -159,7 +144,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "servlet"="..\sapi\servlet\servlet.dsp" - Package Owner=<4>

+Project: "servlet"=..\sapi\servlet\servlet.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/win32/php5ts.dsw b/win32/php5ts.dsw
index c811143a33..b9e0c776a8 100644
--- a/win32/php5ts.dsw
+++ b/win32/php5ts.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "TSRM"="..\TSRM\TSRM.dsp" - Package Owner=<4>

+Project: "TSRM"=..\TSRM\TSRM.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -15,7 +15,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "ZendTS"="..\Zend\ZendTS.dsp" - Package Owner=<4>

+Project: "ZendTS"=..\Zend\ZendTS.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -30,7 +30,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "libbcmath"=".\libbcmath.dsp" - Package Owner=<4>

+Project: "libmysql"=..\ext\mysql\libmysql\libmysql.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -42,19 +42,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "libmysql"="..\ext\mysql\libmysql\libmysql.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "php4aolserver"="..\sapi\aolserver\php4aolserver.dsp" - Package Owner=<4>

+Project: "php4aolserver"=..\sapi\aolserver\php4aolserver.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -69,7 +57,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "php4apache"="..\sapi\apache\php4apache.dsp" - Package Owner=<4>

+Project: "php4apache"=..\sapi\apache\php4apache.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -84,7 +72,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "php4dllts"=".\php4dllts.dsp" - Package Owner=<4>

+Project: "php4dllts"=.\php4dllts.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -104,14 +92,11 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name bindlib

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libbcmath

-    End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "php4isapi"="..\sapi\isapi\php4isapi.dsp" - Package Owner=<4>

+Project: "php4isapi"=..\sapi\isapi\php4isapi.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -126,7 +111,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "php4nsapi"="..\sapi\nsapi\php4nsapi.dsp" - Package Owner=<4>

+Project: "php4nsapi"=..\sapi\nsapi\php4nsapi.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -141,7 +126,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "php4ts"=".\php4ts.dsp" - Package Owner=<4>

+Project: "php4ts"=.\php4ts.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -159,7 +144,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "servlet"="..\sapi\servlet\servlet.dsp" - Package Owner=<4>

+Project: "servlet"=..\sapi\servlet\servlet.dsp - Package Owner=<4>

 

 Package=<5>

 {{{