forked from bartvdbraak/blender
Correction for non-Windows SCons compiling fix after IME Merge
As discussed in rB983c71931b1886d4, we should print a warning in case of building on non-Windows and WITH_BF_IME enabled. We also terminate build in this case, so the warning isn't scrolled away. Was worked out together with @sergey.
This commit is contained in:
parent
1e02a5ff43
commit
c71c7f0e0b
@ -156,16 +156,11 @@ else:
|
|||||||
|
|
||||||
if env['WITH_BF_IME'] and window_system in ('win32-vc', 'win32-mingw', 'win64-vc', 'win64-mingw'):
|
if env['WITH_BF_IME'] and window_system in ('win32-vc', 'win32-mingw', 'win64-vc', 'win64-mingw'):
|
||||||
defs.append('WITH_INPUT_IME')
|
defs.append('WITH_INPUT_IME')
|
||||||
|
elif env['WITH_BF_IME']:
|
||||||
|
print "IME input is only supported on Windows! Please disable WITH_BF_IME!"
|
||||||
|
Exit()
|
||||||
else:
|
else:
|
||||||
try:
|
sources.remove('intern' + os.sep + 'GHOST_ImeWin32.cpp')
|
||||||
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']:
|
if env['WITH_BF_3DMOUSE']:
|
||||||
defs.append('WITH_INPUT_NDOF')
|
defs.append('WITH_INPUT_NDOF')
|
||||||
|
Loading…
Reference in New Issue
Block a user