From c239baa0badfdc0170159d2bd45c05618f6ed8f9 Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Sat, 16 Nov 2013 22:13:51 +0100 Subject: OSX/scons: small reorder and spelling --- build_files/scons/tools/Blender.py | 4 ++-- intern/locale/SConscript | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 45b65b52587..77d20720713 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -643,6 +643,8 @@ def AppIt(target=None, source=None, env=None): commands.getoutput(cmd) cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/datafiles/locale'%(installdir, binary, VERSION) commands.getoutput(cmd) + cmd = 'cp -R %s/release/datafiles/fonts %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION) + commands.getoutput(cmd) mo_dir = os.path.join(builddir[:-4], "locale") for f in os.listdir(mo_dir): cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/datafiles/locale/%s'%(installdir, binary, VERSION, f[:-3]) @@ -653,8 +655,6 @@ def AppIt(target=None, source=None, env=None): commands.getoutput(cmd) cmd = 'cp -R %s/release/datafiles/locale/languages %s/%s.app/Contents/MacOS/%s/datafiles/locale/'%(bldroot, installdir, binary, VERSION) commands.getoutput(cmd) - cmd = 'cp -R %s/release/datafiles/fonts %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION) - commands.getoutput(cmd) if env['WITH_BF_OCIO']: cmd = 'cp -R %s/release/datafiles/colormanagement %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION) commands.getoutput(cmd) diff --git a/intern/locale/SConscript b/intern/locale/SConscript index 3fb3e1f8993..42941e2105f 100644 --- a/intern/locale/SConscript +++ b/intern/locale/SConscript @@ -60,7 +60,7 @@ if env['WITH_BF_INTERNATIONAL']: msgfmt_tool = env.Clone() targetpath = root_build_dir + '/msgfmt' if env['OURPLATFORM'] == 'darwin': - msgfmt_tool.Replace( LINKFLAGS = '/usr/lib/libgcc_s.1.dylib /usr/lib/libstdc++.6.dylib /usr/lib/libSystem.B.dylib') # only need this dependencies + msgfmt_tool.Replace( LINKFLAGS = '/usr/lib/libgcc_s.1.dylib /usr/lib/libstdc++.6.dylib /usr/lib/libSystem.B.dylib') # only need these dependencies msgfmt_target = msgfmt_tool.Program(target = targetpath, source = ['msgfmt.cc']) -- cgit v1.2.3