diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-10-11 16:17:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-11 16:22:54 +0400 |
| commit | 54ee22130ca0ce59500c6eddb562b78eb4526bcd (patch) | |
| tree | ba21cdaa35656c590059c864e028e24b6e234082 /intern/locale/SConscript | |
| parent | b09f7dcaa7b487ada53c8dbaa811deaa1201d163 (diff) | |
| parent | 04814476c08e9350c424619cd99ccb1149d65365 (diff) | |
Merge branch 'master' into dyntopo_holesdyntopo_holes
Conflicts:
source/blender/blenkernel/intern/pbvh_bmesh.c
Diffstat (limited to 'intern/locale/SConscript')
| -rw-r--r-- | intern/locale/SConscript | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/locale/SConscript b/intern/locale/SConscript index 24828c120ec..02b4d6cda1b 100644 --- a/intern/locale/SConscript +++ b/intern/locale/SConscript @@ -29,6 +29,10 @@ Import('env') sources = env.Glob('*.cpp') +if env['OURPLATFORM'] in ['darwin']: + # Cocoa code to read user locale on OSX + sources.append('osx_user_locale.mm') + incs = '.' defs = [] |