From: Jan-E <github@ehrhardt.nl>
Date: Fri, 22 Jan 2016 12:27:41 +0000 (+0100)
Subject: Fix PHP7 config.w32
X-Git-Tag: release-2.0.1~2^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=refs%2Fpull%2F1%2Fhead;p=m6w6%2Fext-propro

Fix PHP7 config.w32
---

diff --git a/config.w32 b/config.w32
index ed086e8..90ef462 100644
--- a/config.w32
+++ b/config.w32
@@ -2,15 +2,24 @@
 ARG_ENABLE("propro", "for propro support", "no");
 
 if (PHP_PROPRO == "yes") {
-	var PHP_PROPRO_HEADERS=glob("src/*.h"), PHP_PROPRO_SOURCES=glob("src/*.c");
+	var PHP_PROPRO_HEADERS=glob(configure_module_dirname + "/src/*.h");
+	var PHP_PROPRO_SRC_ARRAY=glob(configure_module_dirname + "/src/*.c");
+	var PHP_PROPRO_SOURCES="";
+	for (var i=0; i<PHP_PROPRO_SRC_ARRAY.length; ++i) {
+		var basename = FSO.GetFileName(PHP_PROPRO_SRC_ARRAY[i]);
+		PHP_PROPRO_SOURCES = PHP_PROPRO_SOURCES + " " + basename;
+	}
 
-	EXTENSION("propro", PHP_PROPRO_SOURCES);
+	//EXTENSION("propro");
+	ADD_SOURCES(configure_module_dirname + "/src", PHP_PROPRO_SOURCES, "propro");
+	EXTENSION("propro", "src/php_propro_api.c");
 	PHP_INSTALL_HEADERS("ext/propro", "php_propro.h");
 	for (var i=0; i<PHP_PROPRO_HEADERS.length; ++i) {
 		var basename = FSO.GetFileName(PHP_PROPRO_HEADERS[i]);
-		copy_and_subst(PHP_PROPRO_HEADERS[i], basename, []);
-		PHP_INSTALL_HEADERS("ext/propro", basename);
+		copy_and_subst("src/" + basename, basename, []);
+		PHP_INSTALL_HEADERS(configure_module_dirname, basename);
 	}
+	ADD_FLAG("CFLAGS_PROPRO", "/I" + configure_module_dirname + " ");
 
 	AC_DEFINE("HAVE_PROPRO", 1);
 }