[PHP-CVS] cvs: php4 /sapi/apache php4apache.dsp

2003-06-15 Thread Edin Kadribasic 
edink   Sun Jun 15 07:36:02 2003 EDT

  Modified files:  
/php4/sapi/apache   php4apache.dsp 
  Log:
  Fixed win32 build (mod_php4 - mod_php5)
  
  
Index: php4/sapi/apache/php4apache.dsp
diff -u php4/sapi/apache/php4apache.dsp:1.16 php4/sapi/apache/php4apache.dsp:1.17
--- php4/sapi/apache/php4apache.dsp:1.16Thu Feb 20 19:14:33 2003
+++ php4/sapi/apache/php4apache.dsp Sun Jun 15 07:36:02 2003
@@ -120,7 +120,7 @@
 # PROP Default_Filter cpp;c;cxx;rc;def;r;odl;idl;hpj;bat
 # Begin Source File
 
-SOURCE=.\mod_php4.c
+SOURCE=.\mod_php5.c
 # End Source File
 # Begin Source File
 
@@ -136,7 +136,7 @@
 # PROP Default_Filter h;hpp;hxx;hm;inl
 # Begin Source File
 
-SOURCE=.\mod_php4.h
+SOURCE=.\mod_php5.h
 # End Source File
 # Begin Source File
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /sapi/apache php4apache.dsp

2003-01-05 Thread Zeev Suraski 
zeevSun Jan  5 10:09:11 2003 EDT

  Modified files:  
/php4/sapi/apache   php4apache.dsp 
  Log:
  Make the .dsp use the php4build build directories
  
  
Index: php4/sapi/apache/php4apache.dsp
diff -u php4/sapi/apache/php4apache.dsp:1.14 php4/sapi/apache/php4apache.dsp:1.15
--- php4/sapi/apache/php4apache.dsp:1.14Thu Jan  2 09:19:29 2003
+++ php4/sapi/apache/php4apache.dsp Sun Jan  5 10:09:11 2003
@@ -44,7 +44,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 APACHEPHP4_EXPORTS /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ...\..\include /I ..\..\win32 /I 
..\..\Zend /I ..\.. /I ..\..\..\bindlib_w32 /I 
..\..\..\php_build\apache\src\include /I ..\..\main /I ..\..\TSRM /I 
..\..\regex /D ZEND_DEBUG=0 /D NDEBUG /D ZTS /D ZEND_WIN32 /D PHP_WIN32 /D 
_WINDOWS /D _USRDLL /D APACHEPHP4_EXPORTS /D WIN32 /D _MBCS /D 
APACHE_READDIR_H /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ...\..\include /I ..\..\win32 /I 
+..\..\Zend /I ..\.. /I ..\..\..\bindlib_w32 /I ..\..\..\php_build\includes /I 
+..\..\main /I ..\..\TSRM /I ..\..\regex /D ZEND_DEBUG=0 /D NDEBUG /D ZTS /D 
+ZEND_WIN32 /D PHP_WIN32 /D _WINDOWS /D _USRDLL /D APACHEPHP4_EXPORTS /D 
+WIN32 /D _MBCS /D APACHE_READDIR_H /YX /FD /c
 # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32
 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d NDEBUG
@@ -54,7 +54,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 php4ts.lib ApacheCore.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 /base:0x6000 /version:4.0 /dll /machine:I386 
/libpath:..\..\..\php_build\apache\src\corer /libpath:..\..\Release_TS 
/libpath:..\..\TSRM\Release_TS /libpath:..\..\Zend\Release_TS
+# ADD LINK32 php4ts.lib ApacheCore.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 /base:0x6000 /version:4.0 /dll /machine:I386 
+/libpath:..\..\..\php_build\release /libpath:..\..\Release_TS 
+/libpath:..\..\TSRM\Release_TS /libpath:..\..\Zend\Release_TS
 
 !ELSEIF  $(CFG) == php4apache - Win32 Debug_TS
 
@@ -70,7 +70,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 APACHEPHP4_EXPORTS /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ...\..\include /I ..\..\win32 /I 
..\..\Zend /I ..\.. /I ..\..\..\bindlib_w32 /I 
..\..\..\php_build\apache\src\include /I ..\..\main /I ..\..\TSRM /I 
..\..\regex /D _DEBUG /D ZEND_DEBUG=1 /D ZTS /D ZEND_WIN32 /D PHP_WIN32 /D 
_WINDOWS /D _USRDLL /D APACHEPHP4_EXPORTS /D WIN32 /D _MBCS /D 
APACHE_READDIR_H /FR /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ...\..\include /I ..\..\win32 /I 
+..\..\Zend /I ..\.. /I ..\..\..\bindlib_w32 /I ..\..\..\php_build\includes /I 
+..\..\main /I ..\..\TSRM /I ..\..\regex /D _DEBUG /D ZEND_DEBUG=1 /D ZTS /D 
+ZEND_WIN32 /D PHP_WIN32 /D _WINDOWS /D _USRDLL /D APACHEPHP4_EXPORTS /D 
+WIN32 /D _MBCS /D APACHE_READDIR_H /FR /YX /FD /c
 # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32
 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d NDEBUG
@@ -80,7 +80,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 php4ts_debug.lib ApacheCore.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 /base:0x6000 /version:4.0 /dll /incremental:yes 
/debug /machine:I386 /pdbtype:sept /libpath:..\..\..\php_build\apache\src\cored 
/libpath:..\..\Debug_TS /libpath:..\..\TSRM\Debug_TS /libpath:..\..\Zend\Debug_TS
+# ADD LINK32 php4ts_debug.lib ApacheCore.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 /base:0x6000 /version:4.0 /dll /incremental:yes 
+/debug /machine:I386 /pdbtype:sept /libpath:..\..\..\php_build\release 
+/libpath:..\..\Debug_TS /libpath:..\..\TSRM\Debug_TS 
+/libpath:..\..\Zend\Debug_TS
 
 !ELSEIF  $(CFG) == php4apache - Win32 Release_TS_inline
 
@@ -96,7 +96,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 APACHEPHP4_EXPORTS /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ...\..\include /I ..\..\win32 /I 
..\..\Zend /I ..\..