Re: [PHP4BETA] cvs: /php4/ext/zlib zlib.dsp

That shouldn't be necessary, exporting it from the main PHP DLL is the right way to do it... Zeev On Thu, 20 Apr 2000, Frank M. Kromann wrote: > fmk Thu Apr 20 10:41:48 2000 EDT > > Modified files: > /php4/ext/zlib zlib.dsp > Log: > Adding strlcpy to makefile > > Index: php4/ext/zlib/zlib.dsp > diff -u php4/ext/zlib/zlib.dsp:1.1 php4/ext/zlib/zlib.dsp:1.2 > --- php4/ext/zlib/zlib.dsp:1.1 Thu Apr 20 09:59:55 2000 > +++ php4/ext/zlib/zlib.dsp Thu Apr 20 10:41:18 2000 > @@ -8,12 +8,12 @@ > !MESSAGE This is not a valid makefile. To build this project using NMAKE, > !MESSAGE use the Export Makefile command and run > !MESSAGE > -!MESSAGE NMAKE /f "mssql.mak". > +!MESSAGE NMAKE /f "zlib.mak". > !MESSAGE > !MESSAGE You can specify a configuration when running NMAKE > !MESSAGE by defining the macro CFG on the command line. For example: > !MESSAGE > -!MESSAGE NMAKE /f "mssql.mak" CFG="mssql - Win32 MSSQL 70 Release_TS" > +!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 Release_TS" > !MESSAGE > !MESSAGE Possible choices for configuration are: > !MESSAGE > @@ -44,7 +44,7 @@ > # PROP Ignore_Export_Lib 0 > # PROP Target_Dir "" > # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I > "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D > "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D > "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /YX /FD /c > -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I > "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "mssql-70" /D > "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D > "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" > /D ZTS=1 /D MSSQL70=1 /D ZEND_WIN32=1 /D PHP_WIN32=1 /D ZEND_DEBUG=0 /YX /FD /c > +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I > "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "include" /D > "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D > "_USRDLL" /D "ZLIB_EXPORTS" /D "COMPILE_DL" /D ZTS=1 /D ZEND_WIN32=1 > /D PHP_WIN32=1 /D ZEND_DEBUG=0 /YX /FD /c > # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 > # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 > # ADD BASE RSC /l 0x406 /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 php4ts.lib ntwdblib.lib /nologo > /dll /machine:I386 /out:"MSSQL_65_Release/php_mssql.dll" > /libpath:"..\..\Release_TS" > -# ADD 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 php4ts.lib ntwdblib.lib /nologo > /dll /machine:I386 /out:"MSSQL_70_Release_TS/php_mssql.dll" > /libpath:"..\..\Release_TS" /libpath:"mssql-70" > +# ADD 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 php4ts.lib zlibstat.lib /nologo > /dll /machine:I386 /out:"Release_TS/php_zlib.dll" /libpath:"..\..\Release_TS" > /libpath:"lib" > > !ELSEIF "$(CFG)" == "zlib - Win32 Debug_TS" > > @@ -71,7 +71,7 @@ > # PROP Ignore_Export_Lib 0 > # PROP Target_Dir "" > # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I > "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "mssql-70" /D > "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D > "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" > /D ZTS=1 /D MSSQL70=1 /YX /FD /c > -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I > "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "mssql-70" /D > "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D > "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" > /D ZTS=1 /D MSSQL70=1 /D ZEND_WIN32=1 /D PHP_WIN32=1 /D ZEND_DEBUG=1 /YX /FD /c > +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I > "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "include" /D > "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D > "_USRDLL" /D "ZLIB_EXPORTS" /D "COMPILE_DL" /D ZTS=1 /D ZEND_WIN32=1 > /D PHP_WIN32=1 /D ZEND_DEBUG=1 /YX /FD /c > # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 > # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 > # ADD BASE RSC /l 0x406 /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 php4ts.lib ntwdblib.lib /nologo > /dll /machine:I386 /out:"MSSQL_65_Release/php_mssql.dll" > /libpath:"..\..\Release_TS" /libpath:"mssql-70" > -# ADD 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 php4ts.lib ntwdblib.lib /nologo > /dll /machine:I386 /out:"MSSQL_70_Debug_TS/php_mssql.dll" > /libpath:"..\..\Debug_TS" /libpath:"mssql-70" > +# ADD 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 php4ts.lib zlibstat.lib /nologo > /dll /machine:I386 /out:"Debug_TS/php_zlib.dll" /libpath:"..\..\Debug_TS" > /libpath:"mssql-70" > > !ENDIF > > @@ -94,15 +94,19 @@ > # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > # Begin Source File > > -SOURCE=.\php_mssql.c > +SOURCE=..\..\strlcpy.c > # End Source File > +# Begin Source File > + > +SOURCE=.\zlib.c > +# End Source File > # End Group > # Begin Group "Header Files" > > # PROP Default_Filter "h;hpp;hxx;hm;inl" > # Begin Source File > > -SOURCE=.\php_mssql.h > +SOURCE=.\php_zlib.h > # End Source File > # End Group > # Begin Group "Resource Files" > > > > -- Zeev Suraski <zeev@zend.com> http://www.zend.com/