From: Moriyoshi Koizumi Date: Tue, 2 Mar 2004 15:59:30 +0000 (+0000) Subject: - Really fix the build. X-Git-Tag: RELEASE_0_2_0~81 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1dfd0bd901ccef66d3eaec81744813f803a71b27;p=php - Really fix the build. # Should be fixed now :| --- diff --git a/ext/mbstring/config.w32 b/ext/mbstring/config.w32 index 5736a66107..f4370ad946 100644 --- a/ext/mbstring/config.w32 +++ b/ext/mbstring/config.w32 @@ -8,10 +8,8 @@ if (PHP_MBSTRING == "yes") { FSO.CopyFile("ext\\mbstring\\libmbfl\\config.h.vc6", "ext\\mbstring\\libmbfl\\config.h", true); -/* XXX this file does not exist! FSO.CopyFile("ext\\mbstring\\oniguruma\\win32\\config.h", "ext\\mbstring\\oniguruma\\config.h", true); -*/ EXTENSION("mbstring", "mbstring.c php_unicode.c mb_gpc.c", null, "-Iext/mbstring/libmbfl -Iext/mbstring/libmbfl/mbfl \ @@ -51,12 +49,13 @@ if (PHP_MBSTRING == "yes") { if (PHP_MBREGEX == "yes") { ADD_SOURCES("ext/mbstring/oniguruma", "regcomp.c regerror.c \ - regenc.c regexec.c reggnu.c regparse.c regposerr.c \ - ascii.c big5.c euc_jp.c euc_kr.c euc_tw.c iso8859_1 \ - iso8859_2.c iso8859_3.c iso8859_4.c iso8859_5.c \ - iso8859_6.c iso8859_7.c iso8859_8.c iso8859_9.c \ - iso8859_10.c iso8859_11.c iso8859_13.c iso8859_15.c \ - iso8859_16.c koi8.c koi8_r.c sjis.c utf8.c", "mbstring"); + regenc.c regexec.c reggnu.c regparse.c regposerr.c", "mbstring"); + ADD_SOURCES("ext/mbstring/oniguruma/enc", "ascii.c big5.c \ + euc_jp.c euc_kr.c euc_tw.c iso8859_1 iso8859_2.c \ + iso8859_3.c iso8859_4.c iso8859_5.c iso8859_6.c \ + iso8859_7.c iso8859_8.c iso8859_9.c iso8859_10.c \ + iso8859_11.c iso8859_13.c iso8859_15.c iso8859_16.c \ + koi8.c koi8_r.c sjis.c utf8.c", "mbstring"); ADD_SOURCES("ext/mbstring", "php_mbregex.c", "mbstring"); } }