edink Fri Aug 12 07:37:45 2005 EDT
Modified files:
/php-src/win32/build config.w32
Log:
Added --enable-static-icu / --disable-static-icu windows configure
options that allow you to pick weather you want to link against static
or DLL version of the ICU library.
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.44&r2=1.45&ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.44 php-src/win32/build/config.w32:1.45
--- php-src/win32/build/config.w32:1.44 Thu Aug 11 20:08:28 2005
+++ php-src/win32/build/config.w32 Fri Aug 12 07:37:44 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.44 2005/08/12 00:08:28 sniper Exp $
+// $Id: config.w32,v 1.45 2005/08/12 11:37:44 edink Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -76,8 +76,17 @@
// General libs
// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib
comdlg32.lib
-DEFINE("LIBS", "kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib
ws2_32.lib icuuc.lib icuin.lib icuio.lib icule.lib iculx.lib");
+DEFINE("LIBS", "kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib
ws2_32.lib");
+// Do we want static ICU lib
+ARG_ENABLE('static-icu', 'Link against the static version of the ICU library',
'no');
+if (PHP_STATIC_ICU == "yes") {
+ ADD_FLAG("LIBS", "sicuuc.lib sicuin.lib sicuio.lib sicule.lib
siculx.lib sicudt.lib");
+ ADD_FLAG("CFLAGS", "/D U_STATIC_IMPLEMENTATION=1")
+} else {
+ ADD_FLAG("LIBS", "icuuc.lib icuin.lib icuio.lib icule.lib iculx.lib");
+}
+
// Set some debug/release specific options
if (PHP_DEBUG == "yes") {
ADD_FLAG("CFLAGS", "/LDd /MDd /Gm /ZI /Od /GZ /D _DEBUG /D
ZEND_DEBUG=1");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
