Changeset 1006 for trunk/config.w32

Timestamp:

2012-07-19T17:11:16+02:00 (11 months ago)

Author:

moo

Message:

fix win32 build

File:

• trunk/config.w32 (modified) (5 diffs)

trunk/config.w32

@@ -5 +5 @@
 
 if (PHP_XCACHE != "no") {
+    EXTENSION("xcache", "xcache.c", null, "/I " + configure_module_dirname);
     // {{{ check for xcache-constant 
     ARG_ENABLE("xcache-constant", "XCache: Handle new constants made by php compiler (e.g.: for __halt_compiler)", "yes");
@@ -12 +13 @@
     // }}}
 
-    var xcache_sources = " \
-util/xc_stack.c \
-util/xc_trace.c \
-xcache.c \
-xcache/xc_const_string.c \
-xcache/xc_compatibility.c \
-xcache/xc_lock.c \
-xcache/xc_mem.c \
-xcache/xc_opcode_spec.c \
-xcache/xc_processor.c \
-xcache/xc_sandbox.c \
-xcache/xc_shm.c \
-xcache/xc_shm_mmap.c \
-xcache/xc_utils.c \
-";
+    ADD_SOURCES(configure_module_dirname + "/util", " \
+xc_stack.c \
+xc_trace.c \
+", "xcache");
+
+    ADD_SOURCES(configure_module_dirname + "/xcache", " \
+xc_const_string.c \
+xc_compatibility.c \
+xc_lock.c \
+xc_mem.c \
+xc_opcode_spec.c \
+xc_processor.c \
+xc_sandbox.c \
+xc_shm.c \
+xc_shm_mmap.c \
+xc_utils.c \
+", "xcache");
+
     // {{{ add sources on enabled
     ARG_ENABLE("xcache-optimizer",    "(N/A)", "no");
@@ -45 +49 @@
         var withval = eval("PHP_XCACHE_" + uname);
         if (withval != "no") {
-            xcache_sources += " mod_" + name + "/xc_" + name + ".c";
+            ADD_SOURCES(configure_module_dirname + "/mod_" + name, "xc_" + name + ".c", "xcache");
             XCACHE_MODULES += " " + name;
             STDOUT.WriteLine("Enabling XCache Module: " + name);
@@ -80 +84 @@
     if (PHP_XCACHE_TEST != "no") {
         ADD_FLAG("XCACHE_ENABLE_TEST", "-DXCACHE_ENABLE_TEST");
-        xcache_sources += " xcache/xc_malloc.c";
+        ADD_SOURCES(configure_module_dirname + "/xcache", "xc_malloc.c", "xcache");
         AC_DEFINE("HAVE_XCACHE_TEST", 1, "Define to enable XCache self test");
     }
@@ -93 +97 @@
     }
     // }}}
-    // {{{ create extension
-    EXTENSION("xcache", xcache_sources);
+    // {{{ get ccrule
     var srcdir = configure_module_dirname;
     // it's a bit harder to get builddir