cvs: php4 /main config.w32.h /win32 php4dll.dsp php4dllts.dsp
| From: | Sebastian Bergmann | Date: | Mon, 19 May 2003 16:28:09 +0000 |
| Subject: | cvs: php4 /main config.w32.h /win32 php4dll.dsp php4dllts.dsp | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-21082@lists.php.net to get a copy of this message | ||
sebastian Mon May 19 12:28:09 2003 EDT
Modified files:
/php4/main config.w32.h
/php4/win32 php4dll.dsp php4dllts.dsp
Log:
First try at getting the Windows build working again after libxml2 got unbundled.
Index: php4/main/config.w32.h diff -u php4/main/config.w32.h:1.66 php4/main/config.w32.h:1.67 --- php4/main/config.w32.h:1.66 Sat May 17 18:15:39 2003 +++ php4/main/config.w32.h Mon May 19 12:28:08 2003 @@ -2,7 +2,7 @@ Build Configuration for Win32. This has only been tested with MS VisualC++ 6 (and later). - $Id: config.w32.h,v 1.66 2003/05/17 22:15:39 fmk Exp $ + $Id: config.w32.h,v 1.67 2003/05/19 16:28:08 sebastian Exp $ */ /* Default PHP / PEAR directories */ @@ -74,7 +74,6 @@ /* Enable / Disable XML extension (default: enabled) */ #define HAVE_LIBEXPAT 1 -#define HAVE_XML 1 /* Enable / Disable ZLIB extension (default: enabled) */ #define HAVE_ZLIB 1 Index: php4/win32/php4dll.dsp diff -u php4/win32/php4dll.dsp:1.42 php4/win32/php4dll.dsp:1.43 --- php4/win32/php4dll.dsp:1.42 Sat May 3 04:44:52 2003 +++ php4/win32/php4dll.dsp Mon May 19 12:28:08 2003 @@ -141,7 +141,7 @@ # Begin Source File SOURCE=..\main\internal_functions_win32.c -# ADD CPP /I "..\bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" +# ADD CPP /I "..\ext\xml\expat\xmlparse" /I "..\ext\xml\expat\xmltok" # End Source File # Begin Source File @@ -897,12 +897,12 @@ # Begin Source File SOURCE=..\ext\wddx\wddx.c -# ADD CPP /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" +# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" # End Source File # Begin Source File SOURCE=..\ext\xml\xml.c -# ADD CPP /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" +# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" # End Source File # End Group # Begin Group "Header Files No. 4" @@ -1746,17 +1746,17 @@ # PROP Default_Filter ".c" # Begin Source File -SOURCE=..\bundle\expat\xmlparse.c +SOURCE=..\ext\xml\expat\xmlparse.c # ADD CPP /D "COMPILED_FROM_DSP" # End Source File # Begin Source File -SOURCE=..\bundle\expat\xmlrole.c +SOURCE=..\ext\xml\expat\xmlrole.c # ADD CPP /D "COMPILED_FROM_DSP" # End Source File # Begin Source File -SOURCE=..\bundle\expat\xmltok.c +SOURCE=..\ext\xml\expat\xmltok.c # ADD CPP /D "COMPILED_FROM_DSP" # End Source File # End Group @@ -1765,47 +1765,47 @@ # PROP Default_Filter ".h" # Begin Source File -SOURCE=..\bundle\expat\ascii.h +SOURCE=..\ext\xml\expat\ascii.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\asciitab.h +SOURCE=..\ext\xml\expat\asciitab.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\expat.h +SOURCE=..\ext\xml\expat\expat.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\iasciitab.h +SOURCE=..\ext\xml\expat\iasciitab.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\latin1tab.h +SOURCE=..\ext\xml\expat\latin1tab.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\nametab.h +SOURCE=..\ext\xml\expat\nametab.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\utf8tab.h +SOURCE=..\ext\xml\expat\utf8tab.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\winconfig.h +SOURCE=..\ext\xml\expat\winconfig.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\xmlrole.h +SOURCE=..\ext\xml\expat\xmlrole.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\xmltok.h +SOURCE=..\ext\xml\expat\xmltok.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\xmltok_impl.h +SOURCE=..\ext\xml\expat\xmltok_impl.h # End Source File # End Group # End Group Index: php4/win32/php4dllts.dsp diff -u php4/win32/php4dllts.dsp:1.109 php4/win32/php4dllts.dsp:1.110 --- php4/win32/php4dllts.dsp:1.109 Sat May 3 04:44:52 2003 +++ php4/win32/php4dllts.dsp Mon May 19 12:28:08 2003 @@ -174,7 +174,7 @@ # Begin Source File SOURCE=..\main\internal_functions_win32.c -# ADD CPP /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" +# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" # End Source File # Begin Source File @@ -474,20 +474,20 @@ !IF "$(CFG)" == "php4dllts - Win32 Debug_TS" -# ADD CPP /I "..\bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" +# ADD CPP /I "..\ext\xml\expat\xmlparse" /I "..\ext\xml\expat\xmltok" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" -# ADD CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" +# ADD CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" -# ADD CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" +# ADD CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg" -# ADD BASE CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" -# ADD CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" +# ADD BASE CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" +# ADD CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" !ENDIF @@ -498,20 +498,20 @@ !IF "$(CFG)" == "php4dllts - Win32 Debug_TS" -# ADD CPP /I "..\bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" +# ADD CPP /I "..\ext\xml\expat\xmlparse" /I "..\ext\xml\expat\xmltok" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" -# ADD CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" +# ADD CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" -# ADD CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" +# ADD CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg" -# ADD BASE CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" -# ADD CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" +# ADD BASE CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" +# ADD CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" !ENDIF @@ -2147,17 +2147,17 @@ # PROP Default_Filter ".c" # Begin Source File -SOURCE=..\bundle\expat\xmlparse.c +SOURCE=..\ext\xml\expat\xmlparse.c # ADD CPP /D "COMPILED_FROM_DSP" # End Source File # Begin Source File -SOURCE=..\bundle\expat\xmlrole.c +SOURCE=..\ext\xml\expat\xmlrole.c # ADD CPP /D "COMPILED_FROM_DSP" # End Source File # Begin Source File -SOURCE=..\bundle\expat\xmltok.c +SOURCE=..\ext\xml\expat\xmltok.c # ADD CPP /D "COMPILED_FROM_DSP" # End Source File # End Group @@ -2166,47 +2166,47 @@ # PROP Default_Filter ".h" # Begin Source File -SOURCE=..\bundle\expat\ascii.h +SOURCE=..\ext\xml\expat\ascii.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\asciitab.h +SOURCE=..\ext\xml\expat\asciitab.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\expat.h +SOURCE=..\ext\xml\expat\expat.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\iasciitab.h +SOURCE=..\ext\xml\expat\iasciitab.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\latin1tab.h +SOURCE=..\ext\xml\expat\latin1tab.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\nametab.h +SOURCE=..\ext\xml\expat\nametab.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\utf8tab.h +SOURCE=..\ext\xml\expat\utf8tab.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\winconfig.h +SOURCE=..\ext\xml\expat\winconfig.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\xmlrole.h +SOURCE=..\ext\xml\expat\xmlrole.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\xmltok.h +SOURCE=..\ext\xml\expat\xmltok.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\xmltok_impl.h +SOURCE=..\ext\xml\expat\xmltok_impl.h # End Source File # End Group # End Group
Index: php4/main/config.w32.h diff -u php4/main/config.w32.h:1.66 php4/main/config.w32.h:1.67 --- php4/main/config.w32.h:1.66 Sat May 17 18:15:39 2003 +++ php4/main/config.w32.h Mon May 19 12:28:08 2003 @@ -2,7 +2,7 @@ Build Configuration for Win32. This has only been tested with MS VisualC++ 6 (and later). - $Id: config.w32.h,v 1.66 2003/05/17 22:15:39 fmk Exp $ + $Id: config.w32.h,v 1.67 2003/05/19 16:28:08 sebastian Exp $ */ /* Default PHP / PEAR directories */ @@ -74,7 +74,6 @@ /* Enable / Disable XML extension (default: enabled) */ #define HAVE_LIBEXPAT 1 -#define HAVE_XML 1 /* Enable / Disable ZLIB extension (default: enabled) */ #define HAVE_ZLIB 1 Index: php4/win32/php4dll.dsp diff -u php4/win32/php4dll.dsp:1.42 php4/win32/php4dll.dsp:1.43 --- php4/win32/php4dll.dsp:1.42 Sat May 3 04:44:52 2003 +++ php4/win32/php4dll.dsp Mon May 19 12:28:08 2003 @@ -141,7 +141,7 @@ # Begin Source File SOURCE=..\main\internal_functions_win32.c -# ADD CPP /I "..\bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" +# ADD CPP /I "..\ext\xml\expat\xmlparse" /I "..\ext\xml\expat\xmltok" # End Source File # Begin Source File @@ -897,12 +897,12 @@ # Begin Source File SOURCE=..\ext\wddx\wddx.c -# ADD CPP /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" +# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" # End Source File # Begin Source File SOURCE=..\ext\xml\xml.c -# ADD CPP /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" +# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" # End Source File # End Group # Begin Group "Header Files No. 4" @@ -1746,17 +1746,17 @@ # PROP Default_Filter ".c" # Begin Source File -SOURCE=..\bundle\expat\xmlparse.c +SOURCE=..\ext\xml\expat\xmlparse.c # ADD CPP /D "COMPILED_FROM_DSP" # End Source File # Begin Source File -SOURCE=..\bundle\expat\xmlrole.c +SOURCE=..\ext\xml\expat\xmlrole.c # ADD CPP /D "COMPILED_FROM_DSP" # End Source File # Begin Source File -SOURCE=..\bundle\expat\xmltok.c +SOURCE=..\ext\xml\expat\xmltok.c # ADD CPP /D "COMPILED_FROM_DSP" # End Source File # End Group @@ -1765,47 +1765,47 @@ # PROP Default_Filter ".h" # Begin Source File -SOURCE=..\bundle\expat\ascii.h +SOURCE=..\ext\xml\expat\ascii.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\asciitab.h +SOURCE=..\ext\xml\expat\asciitab.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\expat.h +SOURCE=..\ext\xml\expat\expat.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\iasciitab.h +SOURCE=..\ext\xml\expat\iasciitab.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\latin1tab.h +SOURCE=..\ext\xml\expat\latin1tab.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\nametab.h +SOURCE=..\ext\xml\expat\nametab.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\utf8tab.h +SOURCE=..\ext\xml\expat\utf8tab.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\winconfig.h +SOURCE=..\ext\xml\expat\winconfig.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\xmlrole.h +SOURCE=..\ext\xml\expat\xmlrole.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\xmltok.h +SOURCE=..\ext\xml\expat\xmltok.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\xmltok_impl.h +SOURCE=..\ext\xml\expat\xmltok_impl.h # End Source File # End Group # End Group Index: php4/win32/php4dllts.dsp diff -u php4/win32/php4dllts.dsp:1.109 php4/win32/php4dllts.dsp:1.110 --- php4/win32/php4dllts.dsp:1.109 Sat May 3 04:44:52 2003 +++ php4/win32/php4dllts.dsp Mon May 19 12:28:08 2003 @@ -174,7 +174,7 @@ # Begin Source File SOURCE=..\main\internal_functions_win32.c -# ADD CPP /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" +# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" # End Source File # Begin Source File @@ -474,20 +474,20 @@ !IF "$(CFG)" == "php4dllts - Win32 Debug_TS" -# ADD CPP /I "..\bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" +# ADD CPP /I "..\ext\xml\expat\xmlparse" /I "..\ext\xml\expat\xmltok" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" -# ADD CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" +# ADD CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" -# ADD CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" +# ADD CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg" -# ADD BASE CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" -# ADD CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" +# ADD BASE CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" +# ADD CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" !ENDIF @@ -498,20 +498,20 @@ !IF "$(CFG)" == "php4dllts - Win32 Debug_TS" -# ADD CPP /I "..\bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" +# ADD CPP /I "..\ext\xml\expat\xmlparse" /I "..\ext\xml\expat\xmltok" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" -# ADD CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" +# ADD CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" -# ADD CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" +# ADD CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg" -# ADD BASE CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" -# ADD CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse" +# ADD BASE CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" +# ADD CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse" !ENDIF @@ -2147,17 +2147,17 @@ # PROP Default_Filter ".c" # Begin Source File -SOURCE=..\bundle\expat\xmlparse.c +SOURCE=..\ext\xml\expat\xmlparse.c # ADD CPP /D "COMPILED_FROM_DSP" # End Source File # Begin Source File -SOURCE=..\bundle\expat\xmlrole.c +SOURCE=..\ext\xml\expat\xmlrole.c # ADD CPP /D "COMPILED_FROM_DSP" # End Source File # Begin Source File -SOURCE=..\bundle\expat\xmltok.c +SOURCE=..\ext\xml\expat\xmltok.c # ADD CPP /D "COMPILED_FROM_DSP" # End Source File # End Group @@ -2166,47 +2166,47 @@ # PROP Default_Filter ".h" # Begin Source File -SOURCE=..\bundle\expat\ascii.h +SOURCE=..\ext\xml\expat\ascii.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\asciitab.h +SOURCE=..\ext\xml\expat\asciitab.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\expat.h +SOURCE=..\ext\xml\expat\expat.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\iasciitab.h +SOURCE=..\ext\xml\expat\iasciitab.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\latin1tab.h +SOURCE=..\ext\xml\expat\latin1tab.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\nametab.h +SOURCE=..\ext\xml\expat\nametab.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\utf8tab.h +SOURCE=..\ext\xml\expat\utf8tab.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\winconfig.h +SOURCE=..\ext\xml\expat\winconfig.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\xmlrole.h +SOURCE=..\ext\xml\expat\xmlrole.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\xmltok.h +SOURCE=..\ext\xml\expat\xmltok.h # End Source File # Begin Source File -SOURCE=..\bundle\expat\xmltok_impl.h +SOURCE=..\ext\xml\expat\xmltok_impl.h # End Source File # End Group # End Group