fix for non-TS compile

diff --git a/win32/php4dll.dsp b/win32/php4dll.dsp
index 3b902eca11a9120a19edad1f14af3341d77661a3..b48df54710f880ce21d6f02ec103a2859ae3b3a6 100644 (file)
--- a/win32/php4dll.dsp
+++ b/win32/php4dll.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /I "..\TSRM" /I "..\ext\xml\expat" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D "MSVC5" /D "PHP_WIN32" /D ZEND_DEBUG=1 /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\ext\mysql\libmysql" /I "..\ext\xml\expat" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D "MSVC5" /D "PHP_WIN32" /D ZEND_DEBUG=1 /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /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 0x40d /d "_DEBUG"\r
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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 Zend.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release\php4nts.dll" /libpath:"..\Zend\Release" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release"\r
+# 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 Zend.lib resolv.lib libmysql.lib tsrm.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release\php4nts.dll" /libpath:"..\Zend\Release" /libpath:"..\TSRM\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release"\r
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
@@ -97,7 +97,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex" /I "..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D ZEND_DEBUG=0 /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex" /I "..\bindlib_w32" /I "main" /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /I "..\TSRM" /I "..\ext\xml\expat" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\ext\mysql\libmysql" /I "..\ext\xml\expat" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /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 0x40d /d "NDEBUG"\r
@@ -107,7 +107,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 Zend.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php4nts.dll" /libpath:"TSRM\Release" /libpath:"Zend\Release" /libpath:"..\bindlib_w32\Release"\r
-# 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 Zend.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release\php4nts.dll" /libpath:"..\Zend\Release_inline" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release"\r
+# 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 Zend.lib tsrm.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release\php4nts.dll" /libpath:"..\Zend\Release_inline" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_inline"\r
 \r
 !ENDIF \r
 \r
@@ -939,6 +939,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\add.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -960,6 +961,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\compare.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -981,6 +983,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\debug.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1002,6 +1005,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\div.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1023,6 +1027,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\divmod.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1044,6 +1049,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\doaddsub.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1065,6 +1071,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\init.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1086,6 +1093,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\int2num.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1107,6 +1115,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\nearzero.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1128,6 +1137,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\neg.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1149,6 +1159,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\num2long.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1170,6 +1181,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\num2str.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1191,6 +1203,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\outofmem.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1212,6 +1225,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\output.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1233,6 +1247,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\raise.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1254,6 +1269,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\raisemod.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1275,6 +1291,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\recmul.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1296,6 +1313,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\rmzero.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1317,6 +1335,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\rt.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1338,6 +1357,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\sqrt.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1359,6 +1379,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\str2num.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1380,6 +1401,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\sub.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1401,6 +1423,7 @@ SOURCE=..\ext\bcmath\libbcmath\src\zero.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
 # ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src"\r
 \r
 !ENDIF \r
@@ -1413,14 +1436,47 @@ SOURCE=..\ext\bcmath\libbcmath\src\zero.c
 # Begin Source File\r
 \r
 SOURCE=..\ext\bcmath\libbcmath\src\bcmath.h\r
+\r
+!IF  "$(CFG)" == "php4dll - Win32 Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
+\r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\bcmath\libbcmath\src\config.h\r
+\r
+!IF  "$(CFG)" == "php4dll - Win32 Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
+\r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\bcmath\libbcmath\src\private.h\r
+\r
+!IF  "$(CFG)" == "php4dll - Win32 Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
+\r
+# PROP Intermediate_Dir "..\Release_inline_bcmath"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # End Group\r