zeev Thu Jun 26 10:19:42 2003 EDT
Modified files:
/php-src/win32 php4dllts.dsp
Log:
- Add libxml directory
- Add zlib to configurations where it was missing
- Remove libmysql linkage
Index: php-src/win32/php4dllts.dsp
diff -u php-src/win32/php4dllts.dsp:1.116 php-src/win32/php4dllts.dsp:1.117
--- php-src/win32/php4dllts.dsp:1.116 Wed Jun 25 17:37:50 2003
+++ php-src/win32/php4dllts.dsp Thu Jun 26 10:19:42 2003
@@ -45,7 +45,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# 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
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\zlib" /I ".." /I "..\main" /I
"..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /D "_DEBUG" /D
ZEND_DEBUG=1 /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" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\regex" /I
"..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I
"..\..\libxml\include" /D "_DEBUG" /D ZEND_DEBUG=1 /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" /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "_DEBUG"
@@ -55,7 +55,7 @@
# 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 ws2_32.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 zlib.lib libxml2.lib Urlmon.lib /nologo
/version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt"
/out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS"
/libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"Debug_TS"
/libpath:"..\..\zlib\Debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.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 zlib.lib libxml2.lib Urlmon.lib /nologo /version:4.0
/dll /debug /machine:I386 /nodefaultlib:"libcmt" /out:"..\Debug_TS\php4ts_debug.dll"
/pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS"
/libpath:"..\..\bindlib_w32\Debug" /libpath:"Debug_TS" /libpath:"..\..\zlib\Debug"
!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
@@ -71,7 +71,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I
"..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /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" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I
"..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I
"..\..\libxml\include" /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" /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"
@@ -81,7 +81,7 @@
# 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 ws2_32.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 zlib.lib libxml2.lib Urlmon.lib /nologo
/version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS\php4ts.dll"
/libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS"
/libpath:"..\..\bindlib_w32\Release" /libpath:"Release_TS"
/libpath:"..\..\zlib\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.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 zlib.lib libxml2.lib Urlmon.lib /nologo /version:4.0
/dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS\php4ts.dll"
/libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"Release_TS"
/libpath:"..\..\zlib\Release" /libpath:"..\..\bindlib_w32\Release"
!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
@@ -98,7 +98,7 @@
# 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 "..\main" /I "..\regex" /I
"..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /D "NDEBUG" /D
ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /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" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I
"..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I
"..\..\libxml\include" /D "NDEBUG" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /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" /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"
@@ -108,7 +108,7 @@
# 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 ws2_32.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 zlib.lib libxml2.lib Urlmon.lib /nologo
/version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt"
/out:"..\Release_TS_inline\php4ts.dll" /libpath:"..\TSRM\Release_TS_inline"
/libpath:"..\Zend\Release_TS_inline" /libpath:"..\..\bindlib_w32\Release"
/libpath:"Release_TS_Inline" /libpath:"..\..\zlib\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.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 zlib.lib libxml2.lib Urlmon.lib /nologo /version:4.0
/dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS_inline\php4ts.dll"
/libpath:"..\TSRM\Release_TS_inline" /libpath:"..\Zend\Release_TS_inline"
/libpath:"Release_TS_Inline" /libpath:"..\..\zlib\Release"
/libpath:"..\..\bindlib_w32\Release"
!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
@@ -125,7 +125,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I
"..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /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" /FR /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I ".." /I "..\main" /I "..\regex" /I
"..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /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" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I ".." /I "..\main" /I "..\regex" /I
"..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I
"..\..\libxml\include" /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" /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"
@@ -135,7 +135,7 @@
# 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 libmysql.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:"Release_TS"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.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 zlib.lib libxml2.lib Urlmon.lib /nologo
/version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt"
/out:"..\Release_TSDbg\php4ts.dll" /libpath:"..\TSRM\Release_TSDbg"
/libpath:"..\Zend\Release_TSDbg" /libpath:"..\..\bindlib_w32\Release"
/libpath:"Release_TSDbg"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.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 zlib.lib libxml2.lib Urlmon.lib /nologo /version:4.0
/dll /debug /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TSDbg\php4ts.dll"
/libpath:"..\TSRM\Release_TSDbg" /libpath:"..\Zend\Release_TSDbg"
/libpath:"Release_TSDbg" /libpath:"..\..\bindlib_w32\Release"
/libpath:"..\..\zlib\Release"
!ENDIF
@@ -433,8 +433,9 @@
# End Source File
# End Group
# End Group
-
# Begin Group "DOM"
+
+# PROP Default_Filter ""
# Begin Group "DOM Source Files"
# PROP Default_Filter ".c"
@@ -588,8 +589,9 @@
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Group
-
# Begin Group "SimpleXML"
+
+# PROP Default_Filter ""
# Begin Group "SimpleXML Source Files"
# PROP Default_Filter ".c"
@@ -606,12 +608,11 @@
SOURCE=..\ext\simplexml\php_simplexml.h
# End Source File
# End Group
-# Begin Group "Resource Files"
+# Begin Group "Resource Files No. 1"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Group
-
# Begin Group "Regular Expressions"
# PROP Default_Filter ""
@@ -640,26 +641,23 @@
# PROP Default_Filter ".c"
# Begin Source File
-SOURCE=..\ext\ctype\ctype.c
+SOURCE=..\ext\xml\compat.c
# End Source File
# Begin Source File
-SOURCE=..\ext\tokenizer\tokenizer.c
+SOURCE=..\ext\ctype\ctype.c
# End Source File
# Begin Source File
-SOURCE=..\ext\wddx\wddx.c
-
+SOURCE=..\ext\tokenizer\tokenizer.c
# End Source File
# Begin Source File
-SOURCE=..\ext\xml\compat.c
-
+SOURCE=..\ext\wddx\wddx.c
# End Source File
# Begin Source File
SOURCE=..\ext\xml\xml.c
-
# End Source File
# End Group
# Begin Group "Header Files No. 4"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
