From a54c0dfb5aa01ce8e4161b5df321d1dadc8c38cf Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 25 Sep 2013 18:15:44 +0200 Subject: [PATCH 1/2] added config.w32 to package.xml --- package.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/package.xml b/package.xml index bd071ced..2442a78a 100644 --- a/package.xml +++ b/package.xml @@ -32,6 +32,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> + From e175362bb7fe3b153e3996d89b5153be46ba03ce Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 25 Sep 2013 18:18:16 +0200 Subject: [PATCH 2/2] some fixes to config.w32 --- config.w32 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config.w32 b/config.w32 index 83ed9659..82ecd900 100644 --- a/config.w32 +++ b/config.w32 @@ -8,7 +8,7 @@ if (PHP_XCOM != "no") { CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_XCOM") && CHECK_LIB("avro.lib", "xcom", PHP_XCOM) && CHECK_HEADER_ADD_INCLUDE("avro/value.h", "CFLAGS_XCOM") && - CHECK_LIB("libpthread.lib", "xcom", PHP_XCOM) && + CHECK_LIB("libpthread.lib;pthreadVC2.lib", "xcom", PHP_XCOM) && CHECK_HEADER_ADD_INCLUDE("pthread.h", "CFLAGS_XCOM") && CHECK_LIB("ssleay32.lib", "XCOM", PHP_XCOM) && CHECK_LIB("libeay32.lib", "xcom", PHP_XCOM) @@ -20,7 +20,10 @@ if (PHP_XCOM != "no") { EXTENSION("xcom", "xcom.c", true); ADD_FLAG("CFLAGS_XCOM", "/D CURL_STATICLIB"); ADD_FLAG("CFLAGS_XCOM", "/D XCOM_USE_CURL"); + ADD_FLAG("CFLAGS_XCOM", "/D _TIMESPEC_DEFINED"); ADD_FLAG("LDFLAGS_XCOM", "/D /FORCE:MULTIPLE "); + + ADD_EXTENSION_DEP("xcom", "json"); } else { WARNING("xcom not enabled; libraries and headers not found"); }