cvs: /php4 php4.dsp php4dll.dsp php4dllts.dsp php4ts.dsp /php4/sapi/isapi php4isapi.dsp

zeev Fri Dec 31 10:40:25 1999 EDT Modified files: /php4 php4.dsp php4dll.dsp php4dllts.dsp php4ts.dsp /php4/sapi/isapi php4isapi.dsp Log: Add new Release_inline builds to Win32. Standard release versions will not use inline under Win32. Index: php4/php4.dsp diff -u php4/php4.dsp:1.18 php4/php4.dsp:1.19 --- php4/php4.dsp:1.18 Sun Dec 19 16:02:39 1999 +++ php4/php4.dsp Fri Dec 31 10:39:54 1999 @@ -19,6 +19,7 @@ !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 @@ # 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" Index: php4/php4dll.dsp diff -u php4/php4dll.dsp:1.26 php4/php4dll.dsp:1.27 --- php4/php4dll.dsp:1.26 Fri Dec 24 15:47:35 1999 +++ php4/php4dll.dsp Fri Dec 31 10:39:54 1999 @@ -19,6 +19,7 @@ !MESSAGE !MESSAGE "php4dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "php4dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "php4dll - Win32 Release_inline" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -81,12 +82,40 @@ # 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 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" +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "php4dll___Win32_Release_inline" +# PROP BASE Intermediate_Dir "php4dll___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 "php4dll___Win32_Release_inline" +# PROP Intermediate_Dir "php4dll___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 "_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 +# 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 +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x40d /d "NDEBUG" +# ADD RSC /l 0x40d /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 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" +# 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" + !ENDIF # Begin Target # Name "php4dll - Win32 Debug" # Name "php4dll - Win32 Release" +# Name "php4dll - Win32 Release_inline" # Begin Group "Core" # PROP Default_Filter "" @@ -131,15 +160,15 @@ # End Source File # Begin Source File -SOURCE=.\php_realpath.c +SOURCE=.\php_content_types.c # End Source File # Begin Source File -SOURCE=.\php_content_types.c +SOURCE=.\php_ini.c # End Source File # Begin Source File -SOURCE=.\php_ini.c +SOURCE=.\php_realpath.c # End Source File # Begin Source File @@ -419,6 +448,8 @@ !ELSEIF "$(CFG)" == "php4dll - Win32 Release" +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + !ENDIF # End Source File @@ -643,6 +674,8 @@ !ELSEIF "$(CFG)" == "php4dll - Win32 Release" +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + !ENDIF # End Source File @@ -656,6 +689,8 @@ !ELSEIF "$(CFG)" == "php4dll - Win32 Release" +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + !ENDIF # End Source File @@ -669,6 +704,8 @@ !ELSEIF "$(CFG)" == "php4dll - Win32 Release" +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + !ENDIF # End Source File @@ -682,6 +719,8 @@ !ELSEIF "$(CFG)" == "php4dll - Win32 Release" +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + !ENDIF # End Source File @@ -695,6 +734,8 @@ !ELSEIF "$(CFG)" == "php4dll - Win32 Release" +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + !ENDIF # End Source File @@ -838,8 +879,25 @@ # Begin Custom Build InputPath=".\configuration-parser.y" +BuildCmds= \ + if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \ + if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \ + + +"configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) +# End Custom Build + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# Begin Custom Build +InputPath=".\configuration-parser.y" + BuildCmds= \ - if not"X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \ + if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \ if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \ @@ -871,6 +929,8 @@ !ELSEIF "$(CFG)" == "php4dll - Win32 Release" +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + !ENDIF # End Source File @@ -893,6 +953,16 @@ # End Custom Build !ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# Begin Custom Build +InputPath=".\configuration-scanner.l" + +"configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l + +# End Custom Build + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" # Begin Custom Build InputPath=".\configuration-scanner.l" Index: php4/php4dllts.dsp diff -u php4/php4dllts.dsp:1.42 php4/php4dllts.dsp:1.43 --- php4/php4dllts.dsp:1.42 Fri Dec 24 15:47:35 1999 +++ php4/php4dllts.dsp Fri Dec 31 10:39:54 1999 @@ -19,6 +19,7 @@ !MESSAGE !MESSAGE "php4dllts - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "php4dllts - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "php4dllts - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -81,12 +82,40 @@ # 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 /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" +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "php4dllts___Win32_Release_TS_inline" +# PROP BASE Intermediate_Dir "php4dllts___Win32_Release_TS_inline" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "php4dllts___Win32_Release_TS_inline" +# PROP Intermediate_Dir "php4dllts___Win32_Release_TS_inline" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# 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 +# 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 +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x40d /d "NDEBUG" +# ADD RSC /l 0x40d /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 /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" + !ENDIF # Begin Target # Name "php4dllts - Win32 Debug_TS" # Name "php4dllts - Win32 Release_TS" +# Name "php4dllts - Win32 Release_TS_inline" # Begin Group "Core" # PROP Default_Filter "" @@ -127,15 +156,15 @@ # End Source File # Begin Source File -SOURCE=.\php_realpath.c +SOURCE=.\php_content_types.c # End Source File # Begin Source File -SOURCE=.\php_content_types.c +SOURCE=.\php_ini.c # End Source File # Begin Source File -SOURCE=.\php_ini.c +SOURCE=.\php_realpath.c # End Source File # Begin Source File @@ -811,7 +840,7 @@ InputPath=".\configuration-parser.y" BuildCmds= \ - if not"X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \ + if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \ if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \ @@ -822,6 +851,23 @@ $(BuildCmds) # End Custom Build +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" + +# Begin Custom Build +InputPath=".\configuration-parser.y" + +BuildCmds= \ + if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \ + if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \ + + +"configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) +# End Custom Build + !ENDIF # End Source File @@ -843,6 +889,8 @@ !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" + !ENDIF # End Source File @@ -865,6 +913,16 @@ # End Custom Build !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" + +# Begin Custom Build +InputPath=".\configuration-scanner.l" + +"configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l + +# End Custom Build + +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" # Begin Custom Build InputPath=".\configuration-scanner.l" Index: php4/php4ts.dsp diff -u php4/php4ts.dsp:1.15 php4/php4ts.dsp:1.16 --- php4/php4ts.dsp:1.15 Sun Dec 19 16:02:39 1999 +++ php4/php4ts.dsp Fri Dec 31 10:39:54 1999 @@ -19,6 +19,7 @@ !MESSAGE !MESSAGE "php4ts - Win32 Release_TS" (based on "Win32 (x86) Console Application") !MESSAGE "php4ts - Win32 Debug_TS" (based on "Win32 (x86) Console Application") +!MESSAGE "php4ts - Win32 Release_TS_inline" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -79,12 +80,40 @@ # 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" # SUBTRACT LINK32 /pdb:none +!ELSEIF "$(CFG)" == "php4ts - Win32 Release_TS_inline" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "php4ts___Win32_Release_TS_inline" +# PROP BASE Intermediate_Dir "php4ts___Win32_Release_TS_inline" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "php4ts___Win32_Release_TS_inline" +# PROP Intermediate_Dir "php4ts___Win32_Release_TS_inline" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# 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 +# SUBTRACT BASE CPP /YX /Yc /Yu +# 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 +# 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 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" +# 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" + !ENDIF # Begin Target # Name "php4ts - Win32 Release_TS" # Name "php4ts - Win32 Debug_TS" +# Name "php4ts - Win32 Release_TS_inline" # Begin Group "Source Files" # PROP Default_Filter ".c" Index: php4/sapi/isapi/php4isapi.dsp diff -u php4/sapi/isapi/php4isapi.dsp:1.3 php4/sapi/isapi/php4isapi.dsp:1.4 --- php4/sapi/isapi/php4isapi.dsp:1.3 Sun Dec 19 16:02:53 1999 +++ php4/sapi/isapi/php4isapi.dsp Fri Dec 31 10:39:54 1999 @@ -19,6 +19,7 @@ !MESSAGE !MESSAGE "php4isapi - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "php4isapi - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "php4isapi - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -80,12 +81,40 @@ # 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 php4ts.lib /nologo /dll /machine:I386 /libpath:"..\..\Release_TS" +!ELSEIF "$(CFG)" == "php4isapi - Win32 Release_TS_inline" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "php4isapi___Win32_Release_TS_inline" +# PROP BASE Intermediate_Dir "php4isapi___Win32_Release_TS_inline" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "php4isapi___Win32_Release_TS_inline" +# PROP Intermediate_Dir "php4isapi___Win32_Release_TS_inline" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# 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 +# 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 +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x40d /d "NDEBUG" +# ADD RSC /l 0x40d /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 php4ts.lib /nologo /dll /machine:I386 /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 php4ts.lib /nologo /dll /machine:I386 /libpath:"..\..\Release_TS" + !ENDIF # Begin Target # Name "php4isapi - Win32 Debug_TS" # Name "php4isapi - Win32 Release_TS" +# Name "php4isapi - Win32 Release_TS_inline" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"