edink Tue Jul 22 08:34:38 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/curl curl.dsp
Log:
New curl lib needs additional libs to link (#24725)
Index: php-src/ext/curl/curl.dsp
diff -u php-src/ext/curl/curl.dsp:1.4 php-src/ext/curl/curl.dsp:1.4.8.1
--- php-src/ext/curl/curl.dsp:1.4 Thu Oct 18 13:47:35 2001
+++ php-src/ext/curl/curl.dsp Tue Jul 22 08:34:38 2003
@@ -113,7 +113,7 @@
LINK32=link.exe
# ADD BASE LINK32 php4ts_debug.lib libcurl.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 /dll /incremental:yes /debug /machine:I386
/nodefaultlib:"msvcrtd.lib" /out:"..\..\Debug_TS/php_curl.dll"
/libpath:"..\..\Debug_TS"
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 php4ts_debug.lib libcurl.lib ssleay32.lib libeay32.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 wsock32.lib /nologo /dll
/incremental:yes /debug /machine:I386 /nodefaultlib:"MSVCRTD"
/out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS"
/libpath:"..\..\..\php_build\curl\lib"
+# ADD LINK32 php4ts_debug.lib libcurl.lib ssleay32.lib libeay32.lib msvcrt.lib
ws2_32.lib winmm.lib zlib.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 wsock32.lib /nologo /dll /incremental:yes /debug /machine:I386
/nodefaultlib:"MSVCRTD" /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS"
/libpath:"..\..\..\php_build\curl\lib"
# SUBTRACT LINK32 /pdb:none /nodefaultlib
!ELSEIF "$(CFG)" == "curl - Win32 Release_TS_SSL"
@@ -142,7 +142,7 @@
LINK32=link.exe
# ADD BASE LINK32 php4ts.lib libcurl.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 /dll /machine:I386 /nodefaultlib:"msvcrt.lib"
/out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS"
/libpath:"..\..\Release_TS_Inline"
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 php4ts.lib libcurl.lib ssleay32.lib libeay32.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 wsock32.lib /nologo /dll /machine:I386
/nodefaultlib:"MSVCRT" /out:"..\..\Release_TS/php_curl.dll"
/libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
/libpath:"..\..\..\php_build\curl\lib"
+# ADD LINK32 php4ts.lib libcurl.lib ssleay32.lib libeay32.lib msvcrt.lib ws2_32.lib
winmm.lib zlib.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
wsock32.lib /nologo /dll /machine:I386 /nodefaultlib:"MSVCRT"
/out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS"
/libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\curl\lib"
# SUBTRACT LINK32 /pdb:none
!ENDIF
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
