Trying to fix Windows builds

Author: kocsismate

ext/dom/config.w32

@@ -5,7 +5,6 @@ ARG_WITH("dom", "DOM support", "yes");
 if (PHP_DOM == "yes") {
 	if (PHP_LIBXML == "yes" &&
 		ADD_EXTENSION_DEP('dom', 'libxml') &&
-		ADD_EXTENSION_DEP('dom', 'lexbor') &&
 		CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS_DOM", PHP_PHP_BUILD + "\\include\\libxml2")
 	) {
 		EXTENSION("dom", "php_dom.c attr.c document.c infra.c \
@@ -17,7 +16,9 @@ if (PHP_DOM == "yes") {
 			entityreference.c \
 			token_list.c \
 			notation.c xpath.c dom_iterators.c \
-			namednodemap.c xpath_callbacks.c", null, "");
+			namednodemap.c xpath_callbacks.c", null, "/I ext/lexbor");
+
+		ADD_EXTENSION_DEP('dom', 'lexbor');
 
 		ADD_SOURCES("ext/dom/parentnode", "tree.c css_selectors.c", "dom");
 		ADD_SOURCES("ext/dom/lexbor/selectors-adapted", "selectors.c", "dom");
@@ -35,7 +36,8 @@ if (PHP_DOM == "yes") {
 			"dom_ce.h " +
 			"namespace_compat.h " +
 			"xml_common.h " +
-			"xpath_callbacks.h "
+			"xpath_callbacks.h " +
+			"lexbor/selectors-adapted/selectors.h "
 		);
 	} else {
 		WARNING("dom support can't be enabled, libxml is not enabled")

ext/dom/lexbor/selectors-adapted/selectors.c

@@ -13,7 +13,7 @@
 #include <Zend/zend_API.h>
 #include <php.h>
 
-#include "lexbor/selectors-adapted/selectors.h"
+#include "ext/dom/lexbor/selectors-adapted/selectors.h"
 #include "../../namespace_compat.h"
 #include "../../domexception.h"
 #include "../../php_dom.h"

ext/dom/parentnode/css_selectors.c

@@ -22,8 +22,8 @@
 #if defined(HAVE_LIBXML) && defined(HAVE_DOM)
 #include "../php_dom.h"
 
-#include "lexbor/css/parser.h"
-#include "lexbor/selectors-adapted/selectors.h"
+#include "ext/lexbor/lexbor/css/parser.h"
+#include "../lexbor/selectors-adapted/selectors.h"
 
 // TODO: optimization idea: cache the parsed selectors in an LRU fashion?
 

ext/lexbor/config.w32

@@ -3,7 +3,7 @@
 ARG_ENABLE("lexbor", "Lexbor support", "yes");
 
 if (PHP_LEXBOR == "yes") {
-    EXTENSION("lexbor", "php_lexbor.c", null, "-Iext/lexbor /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
+    EXTENSION("lexbor", "php_lexbor.c", null, "/I " + configure_module_dirname + " /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
 
     ADD_SOURCES("ext/lexbor", "php_lexbor.c", "lexbor");
     ADD_SOURCES("ext/lexbor/lexbor/ports/windows_nt/lexbor/core", "memory.c", "lexbor");
@@ -22,9 +22,9 @@ if (PHP_LEXBOR == "yes") {
     ADD_SOURCES("ext/lexbor/lexbor/css/syntax/tokenizer", "error.c","lexbor");
     ADD_SOURCES("ext/lexbor/lexbor/ns", "ns.c","lexbor");
     ADD_SOURCES("ext/lexbor/lexbor/tag", "tag.c","lexbor");
-    ADD_FLAG("CFLAGS_LEXBOR", "/D LEXBOR_STATIC");
+    ADD_FLAG("CFLAGS_LEXBOR", "/D LEXBOR_STATIC /utf-8");
 
     AC_DEFINE("HAVE_LEXBOR", 1, "Define to 1 if the PHP extension 'lexbor' is available.");
 
-    PHP_INSTALL_HEADERS("ext/lexbor", "php_lexbor.h");
+    PHP_INSTALL_HEADERS("ext/lexbor", "php_lexbor.h lexbor/");
 }