edink Sat Jun 12 21:02:32 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/gettext gettext.dsp
Log:
Part of fix for #28745: link agains extension against iconv
http://cvs.php.net/diff.php/php-src/ext/gettext/gettext.dsp?r1=1.1.16.2&r2=1.1.16.3&ty=u
Index: php-src/ext/gettext/gettext.dsp
diff -u php-src/ext/gettext/gettext.dsp:1.1.16.2
php-src/ext/gettext/gettext.dsp:1.1.16.3
--- php-src/ext/gettext/gettext.dsp:1.1.16.2 Mon Mar 24 16:46:58 2003
+++ php-src/ext/gettext/gettext.dsp Sat Jun 12 21:02:31 2004
@@ -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 /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gettext.dll"
/libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
-# ADD LINK32 php4ts.lib libintl.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 /out:"..\..\Release_TS/php_gettext.dll"
/libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php4ts.lib libintl.lib iconv.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
/out:"..\..\Release_TS/php_gettext.dll" /libpath:"..\..\Release_TS"
/libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "gettext - Win32 Debug_TS"
@@ -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 /nologo /dll /machine:I386 /out:"../../Debug_TS/php_gettext.dll"
/libpath:"..\..\Debug_TS"
-# ADD LINK32 php4ts_debug.lib libintl.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
/out:"../../Debug_TS/php_gettext.dll" /libpath:"..\..\Debug_TS"
+# ADD LINK32 php4ts_debug.lib libintl.lib iconv.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
/out:"../../Debug_TS/php_gettext.dll" /libpath:"..\..\Debug_TS"
!ENDIF
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
