@@ -37,9 +37,9 @@ class Generator_Safe
37
37
/**
38
38
* Generator for config.m4 or config.w32
39
39
*
40
- * @var Generator_File_ConfigM4|Generator_File_ConfigW32
40
+ * @var array
41
41
*/
42
- protected $ config ;
42
+ protected $ configs = array () ;
43
43
44
44
/**
45
45
* Generator for Makefile.frag
@@ -62,10 +62,10 @@ public function __construct($rootDir, $outputDir)
62
62
$ this ->phalconH = new Generator_File_PhalconH ($ this ->sourceDir , $ outputDir );
63
63
$ this ->phalconC = new Generator_File_PhalconC ($ rootDir , $ this ->sourceDir , $ configDir , $ outputDir );
64
64
65
+ $ this ->configs [] = new Generator_File_ConfigM4 ($ this ->sourceDir , $ outputDir );
66
+
65
67
if (preg_match ('/^WIN/ ' , PHP_OS )) {
66
- $ this ->config = new Generator_File_ConfigW32 ($ this ->sourceDir , $ outputDir );
67
- } else {
68
- $ this ->config = new Generator_File_ConfigM4 ($ this ->sourceDir , $ outputDir );
68
+ $ this ->configs [] = new Generator_File_ConfigW32 ($ this ->sourceDir , $ outputDir );
69
69
}
70
70
}
71
71
@@ -89,8 +89,10 @@ protected function generateFiles()
89
89
{
90
90
$ includedHeaderFiles = $ this ->phalconH ->generate ();
91
91
$ this ->phalconC ->generate ($ includedHeaderFiles );
92
-
93
- $ this ->config ->generate ();
92
+
93
+ foreach ($ this ->configs as $ config ) {
94
+ $ config ->generate ();
95
+ }
94
96
95
97
copy ($ this ->sourceDir . '/php_phalcon.h ' , $ this ->outputDir . '/php_phalcon.h ' );
96
98
$ this ->processKernelGlobals ();
0 commit comments