summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-04-24 20:57:13 -0700
committerMinh Nguyễn <mxn@1ec5.org>2016-04-24 20:57:13 -0700
commit57f0a211251a9378fa004ee22b2c6f4d21e2bd59 (patch)
tree5b4f260e7493d2de0e9489c26e6d79b7abf2b61e /Makefile
parentc376380112fcdc1a6faa20f4b92f224b02adddc0 (diff)
downloadqtlocation-mapboxgl-57f0a211251a9378fa004ee22b2c6f4d21e2bd59.tar.gz
[ios] Only convert encoding of files generated by genstrings
Followup to #4783: fixed an issue causing make genstrings to reconvert a UTF-8-encoded file from UTF-16 to UTF-8, garbling it.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 2e09e99d9e..5decd2319e 100644
--- a/Makefile
+++ b/Makefile
@@ -64,9 +64,9 @@ genstrings:
genstrings -u -o platform/osx/sdk/Base.lproj platform/darwin/src/*.{m,mm}
genstrings -u -o platform/osx/sdk/Base.lproj platform/osx/src/*.{m,mm}
genstrings -u -o platform/ios/resources/Base.lproj platform/ios/src/*.{m,mm}
- mv platform/osx/sdk/Base.lproj/Foundation.strings platform/darwin/resources/Base.lproj/
- -find platform/{darwin,ios,osx}/ -path '*/Base.lproj/*.strings' -exec \
+ -find platform/ios/resources platform/osx/sdk -path '*/Base.lproj/*.strings' -exec \
textutil -convert txt -extension strings -inputencoding UTF-16 -encoding UTF-8 {} \;
+ mv platform/osx/sdk/Base.lproj/Foundation.strings platform/darwin/resources/Base.lproj/
#### iOS targets ##############################################################