Add new Release_inline builds to Win32. Standard release versions will not use

inline under Win32.

diff --git a/php4.dsp b/php4.dsp
index 06113026bc6b52184b0850733f1c0773686bc738..d3ae790c017d6223823fbfc6eab60f3e09069a7c 100644 (file)
--- a/php4.dsp
+++ b/php4.dsp
@@ -19,6 +19,7 @@ CFG=php4 - Win32 Debug
 !MESSAGE 
 !MESSAGE "php4 - Win32 Release" (based on "Win32 (x86) Console Application")
 !MESSAGE "php4 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "php4 - Win32 Release_inline" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -79,12 +80,40 @@ LINK32=link.exe
 # ADD LINK32 winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4nts.lib /nologo /version:3.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"Debug\php.exe" /pdbtype:sept /libpath:"Debug"
 # SUBTRACT LINK32 /pdb:none
 
+!ELSEIF  "$(CFG)" == "php4 - Win32 Release_inline"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "php4___Win32_Release_inline"
+# PROP BASE Intermediate_Dir "php4___Win32_Release_inline"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "php4___Win32_Release_inline"
+# PROP Intermediate_Dir "php4___Win32_Release_inline"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex\\" /I "..\bindlib_w32" /D "NDEBUG" /D "MSVC5" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /Fr /FD /c
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex\\" /I "..\bindlib_w32" /D "NDEBUG" /D "MSVC5" /D "_CONSOLE" /D ZEND_DEBUG=0 /D "WIN32" /D "_MBCS" /D "ZEND_WIN32_FORCE_INLINE" /Fr /FD /c
+# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 php4nts.lib winmm.lib wsock32.lib netapi32.lib 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 /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"Release\php.exe" /libpath:"Release"
+# ADD LINK32 php4nts.lib winmm.lib wsock32.lib netapi32.lib 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 /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"Release\php.exe" /libpath:"Release"
+
 !ENDIF 
 
 # Begin Target
 
 # Name "php4 - Win32 Release"
 # Name "php4 - Win32 Debug"
+# Name "php4 - Win32 Release_inline"
 # Begin Group "Source Files"
 
 # PROP Default_Filter ".c"

diff --git a/php4dll.dsp b/php4dll.dsp
index d5ca6d636e8dd3b342cac18d2d0eb05ba515d54c..38f5c73d9977f856b4de03c6759986a3035f5fcc 100644 (file)
--- a/php4dll.dsp
+++ b/php4dll.dsp
@@ -19,6 +19,7 @@ CFG=php4dll - Win32 Debug
 !MESSAGE \r
 !MESSAGE "php4dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "php4dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "php4dll - Win32 Release_inline" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -81,12 +82,40 @@ 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\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 /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php4nts.dll" /libpath:"TSRM\Release" /libpath:"Zend\Release" /libpath:"..\bindlib_w32\Release"\r
 \r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Output_Dir "php4dll___Win32_Release_inline"\r
+# PROP BASE Intermediate_Dir "php4dll___Win32_Release_inline"\r
+# PROP BASE Ignore_Export_Lib 0\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 0\r
+# PROP Output_Dir "php4dll___Win32_Release_inline"\r
+# PROP Intermediate_Dir "php4dll___Win32_Release_inline"\r
+# 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" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=0 /D "WIN32" /D "_MBCS" /D "ZEND_WIN32_FORCE_INLINE" /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
+# ADD RSC /l 0x40d /d "NDEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# 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 /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php4nts.dll" /libpath:"TSRM\Release" /libpath:"Zend\Release" /libpath:"..\bindlib_w32\Release"\r
+\r
 !ENDIF \r
 \r
 # Begin Target\r
 \r
 # Name "php4dll - Win32 Debug"\r
 # Name "php4dll - Win32 Release"\r
+# Name "php4dll - Win32 Release_inline"\r
 # Begin Group "Core"\r
 \r
 # PROP Default_Filter ""\r
@@ -131,15 +160,15 @@ SOURCE=.\ext\standard\output.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_realpath.c\r
+SOURCE=.\php_content_types.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_content_types.c\r
+SOURCE=.\php_ini.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_ini.c\r
+SOURCE=.\php_realpath.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -419,6 +448,8 @@ SOURCE=.\ext\pcre\php_pcre.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release"\r
 \r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
+\r
 !ENDIF \r
 \r
 # End Source File\r
@@ -643,6 +674,8 @@ SOURCE=.\ext\pcre\pcrelib\chartables.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release"\r
 \r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
+\r
 !ENDIF \r
 \r
 # End Source File\r
@@ -656,6 +689,8 @@ SOURCE=.\ext\pcre\pcrelib\get.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release"\r
 \r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
+\r
 !ENDIF \r
 \r
 # End Source File\r
@@ -669,6 +704,8 @@ SOURCE=.\ext\pcre\pcrelib\maketables.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release"\r
 \r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
+\r
 !ENDIF \r
 \r
 # End Source File\r
@@ -682,6 +719,8 @@ SOURCE=.\ext\pcre\pcrelib\pcre.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release"\r
 \r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
+\r
 !ENDIF \r
 \r
 # End Source File\r
@@ -695,6 +734,8 @@ SOURCE=.\ext\pcre\pcrelib\study.c
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release"\r
 \r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
+\r
 !ENDIF \r
 \r
 # End Source File\r
@@ -839,7 +880,24 @@ BuildCmds= \
 InputPath=".\configuration-parser.y"\r
 \r
 BuildCmds= \\r
-       if not"X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \\r
+       if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \\r
+       if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \\r
+       \r
+\r
+"configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+\r
+"configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
+\r
+# Begin Custom Build\r
+InputPath=".\configuration-parser.y"\r
+\r
+BuildCmds= \\r
+       if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \\r
        if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \\r
        \r
 \r
@@ -871,6 +929,8 @@ InputPath=.\ext\standard\parsedate.y
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release"\r
 \r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
+\r
 !ENDIF \r
 \r
 # End Source File\r
@@ -902,6 +962,16 @@ InputPath=".\configuration-scanner.l"
 \r
 # End Custom Build\r
 \r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
+\r
+# Begin Custom Build\r
+InputPath=".\configuration-scanner.l"\r
+\r
+"configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l\r
+\r
+# End Custom Build\r
+\r
 !ENDIF \r
 \r
 # End Source File\r

diff --git a/php4dllts.dsp b/php4dllts.dsp
index ae48fe404d2855262045984e2d75852fa79353d0..47c529cb6036a06c6f8b65040b308f99131b3200 100644 (file)
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -19,6 +19,7 @@ CFG=php4dllts - Win32 Debug_TS
 !MESSAGE \r
 !MESSAGE "php4dllts - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "php4dllts - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "php4dllts - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -81,12 +82,40 @@ 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\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 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"\r
 \r
+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Output_Dir "php4dllts___Win32_Release_TS_inline"\r
+# PROP BASE Intermediate_Dir "php4dllts___Win32_Release_TS_inline"\r
+# PROP BASE Ignore_Export_Lib 0\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 0\r
+# PROP Output_Dir "php4dllts___Win32_Release_TS_inline"\r
+# PROP Intermediate_Dir "php4dllts___Win32_Release_TS_inline"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /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 0x40d /d "NDEBUG"\r
+# ADD RSC /l 0x40d /d "NDEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# 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 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"\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 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"\r
+\r
 !ENDIF \r
 \r
 # Begin Target\r
 \r
 # Name "php4dllts - Win32 Debug_TS"\r
 # Name "php4dllts - Win32 Release_TS"\r
+# Name "php4dllts - Win32 Release_TS_inline"\r
 # Begin Group "Core"\r
 \r
 # PROP Default_Filter ""\r
@@ -127,15 +156,15 @@ SOURCE=.\mergesort.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_realpath.c\r
+SOURCE=.\php_content_types.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_content_types.c\r
+SOURCE=.\php_ini.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php_ini.c\r
+SOURCE=.\php_realpath.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -811,7 +840,24 @@ BuildCmds= \
 InputPath=".\configuration-parser.y"\r
 \r
 BuildCmds= \\r
-       if not"X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \\r
+       if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \\r
+       if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \\r
+       \r
+\r
+"configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+\r
+"configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"\r
+\r
+# Begin Custom Build\r
+InputPath=".\configuration-parser.y"\r
+\r
+BuildCmds= \\r
+       if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \\r
        if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \\r
        \r
 \r
@@ -843,6 +889,8 @@ InputPath=.\ext\standard\parsedate.y
 \r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
 \r
+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"\r
+\r
 !ENDIF \r
 \r
 # End Source File\r
@@ -874,6 +922,16 @@ InputPath=".\configuration-scanner.l"
 \r
 # End Custom Build\r
 \r
+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"\r
+\r
+# Begin Custom Build\r
+InputPath=".\configuration-scanner.l"\r
+\r
+"configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l\r
+\r
+# End Custom Build\r
+\r
 !ENDIF \r
 \r
 # End Source File\r

diff --git a/php4ts.dsp b/php4ts.dsp
index ea1393497a60643fcdb3d4bdad5da54bfef00548..90df132822c301de55eeb6505dac54785f7f10b2 100644 (file)
--- a/php4ts.dsp
+++ b/php4ts.dsp
@@ -19,6 +19,7 @@ CFG=php4ts - Win32 Debug_TS
 !MESSAGE \r
 !MESSAGE "php4ts - Win32 Release_TS" (based on "Win32 (x86) Console Application")\r
 !MESSAGE "php4ts - Win32 Debug_TS" (based on "Win32 (x86) Console Application")\r
+!MESSAGE "php4ts - Win32 Release_TS_inline" (based on "Win32 (x86) Console Application")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -79,12 +80,40 @@ LINK32=link.exe
 # ADD LINK32 winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /version:3.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"Debug_TS\php.exe" /pdbtype:sept /libpath:"Debug_TS"\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
+!ELSEIF  "$(CFG)" == "php4ts - Win32 Release_TS_inline"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Output_Dir "php4ts___Win32_Release_TS_inline"\r
+# PROP BASE Intermediate_Dir "php4ts___Win32_Release_TS_inline"\r
+# PROP BASE Ignore_Export_Lib 0\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 0\r
+# PROP Output_Dir "php4ts___Win32_Release_TS_inline"\r
+# PROP Intermediate_Dir "php4ts___Win32_Release_TS_inline"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "NDEBUG" /D "MSVC5" /D "_CONSOLE" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /Fr /FD /c\r
+# SUBTRACT BASE CPP /YX /Yc /Yu\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "NDEBUG" /D "MSVC5" /D "_CONSOLE" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /Fr /FD /c\r
+# SUBTRACT CPP /YX /Yc /Yu\r
+# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
+# ADD RSC /l 0x409 /d "NDEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib 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 /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"Release_TS\php.exe" /libpath:"Release_TS"\r
+# ADD LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib 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 /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"Release_TS\php.exe" /libpath:"Release_TS"\r
+\r
 !ENDIF \r
 \r
 # Begin Target\r
 \r
 # Name "php4ts - Win32 Release_TS"\r
 # Name "php4ts - Win32 Debug_TS"\r
+# Name "php4ts - Win32 Release_TS_inline"\r
 # Begin Group "Source Files"\r
 \r
 # PROP Default_Filter ".c"\r

diff --git a/sapi/isapi/php4isapi.dsp b/sapi/isapi/php4isapi.dsp
index 0fe2d428be996e6303d51adc58580e2dbeb07de4..dc76483ab4a228a459e2520f25a0a4b2f1b84958 100644 (file)
--- a/sapi/isapi/php4isapi.dsp
+++ b/sapi/isapi/php4isapi.dsp
@@ -19,6 +19,7 @@ CFG=php4isapi - Win32 Debug_TS
 !MESSAGE \r
 !MESSAGE "php4isapi - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "php4isapi - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "php4isapi - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -80,12 +81,40 @@ 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\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 php4ts.lib /nologo /dll /machine:I386 /libpath:"..\..\Release_TS"\r
 \r
+!ELSEIF  "$(CFG)" == "php4isapi - Win32 Release_TS_inline"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Output_Dir "php4isapi___Win32_Release_TS_inline"\r
+# PROP BASE Intermediate_Dir "php4isapi___Win32_Release_TS_inline"\r
+# PROP BASE Ignore_Export_Lib 0\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 0\r
+# PROP Output_Dir "php4isapi___Win32_Release_TS_inline"\r
+# PROP Intermediate_Dir "php4isapi___Win32_Release_TS_inline"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /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 0x40d /d "NDEBUG"\r
+# ADD RSC /l 0x40d /d "NDEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# 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 php4ts.lib /nologo /dll /machine:I386 /libpath:"..\..\Release_TS"\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 php4ts.lib /nologo /dll /machine:I386 /libpath:"..\..\Release_TS"\r
+\r
 !ENDIF \r
 \r
 # Begin Target\r
 \r
 # Name "php4isapi - Win32 Debug_TS"\r
 # Name "php4isapi - Win32 Release_TS"\r
+# Name "php4isapi - Win32 Release_TS_inline"\r
 # Begin Group "Source Files"\r
 \r
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r