diff options
| author | Tomofumi Yagi <yagit@mknada.sakura.ne.jp> | 2013-09-07 10:04:30 +0900 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2013-09-14 16:37:42 +0000 |
| commit | fff70bf98c7a5a63aa0db11e93a3512c6a9a9359 (patch) | |
| tree | e6087342c932fba75f92ebfba6944e435afe73b0 /solenv | |
| parent | Print debug strings by SAL_WARN (diff) | |
| download | core-fff70bf98c7a5a63aa0db11e93a3512c6a9a9359.tar.gz core-fff70bf98c7a5a63aa0db11e93a3512c6a9a9359.zip | |
fdo#68790: fix build error on Win when system locale=="Japanese(Japan)"
This patch modifies transex3.
Modified transex3 outputs a file with BOM(if MergeMode is true).
*.[hs]rc files with BOM avoid this problem.
This problem is that MSVC interprets UTF-8 source code without BOM as
local codepage when system locale is "Japanese(Japan)".
Change-Id: I3e12499a91a954236f48e6d7e360d26c93d19ed6
Reviewed-on: https://gerrit.libreoffice.org/5851
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 6721a98b64c7..ac7a9afdbdeb 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -50,7 +50,8 @@ $(call gb_Helper_abbreviate_dirs,\ -i $(3) \ -o $(1) \ -m $${MERGEINPUT} \ - -l all) && \ + -l all \ + $(if $(filter MSC,$(COM)),$(if $(strip $(gb_WITH_LANG)),-b))) && \ rm -rf $${MERGEINPUT} endef |