sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix non-Windows SCons compiling error after IME merge

Browse Source
This commit is contained in:
julianeisel 2014-12-07 23:57:51 +01:00
parent 12e5a32557
commit 983c71931b
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
intern/ghost/SConscript
View File

@ -154,12 +154,18 @@ if env['BF_GHOST_DEBUG']:
else:
sources.remove('intern' + os.sep + 'GHOST_EventPrinter.cpp')
if env['WITH_BF_IME']:
if window_system in ('win32-vc', 'win32-mingw', 'win64-vc', 'win64-mingw'):
defs.append('WITH_INPUT_IME')
else:
if env['WITH_BF_IME'] and window_system in ('win32-vc', 'win32-mingw', 'win64-vc', 'win64-mingw'):
defs.append('WITH_INPUT_IME')
else:
try:
sources.remove('intern' + os.sep + 'GHOST_ImeWin32.h')
except ValueError:
pass
try:
sources.remove('intern' + os.sep + 'GHOST_ImeWin32.cpp')
except ValueError:
pass
if env['WITH_BF_3DMOUSE']:
defs.append('WITH_INPUT_NDOF')