[Bf-blender-cvs] [c71c7f0] master: Correction for non-Windows SCons compiling fix after IME Merge

[julianeisel]

Commit: c71c7f0e0b2d18bd095d3d7910b9de84bc0d2079
Author: julianeisel
Date:   Thu Dec 11 00:22:17 2014 +0100
Branches: master
https://developer.blender.org/rBc71c7f0e0b2d18bd095d3d7910b9de84bc0d2079

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.

===================================================================

M	intern/ghost/SConscript

===================================================================

diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript
index 573e705..025559e 100644
--- a/intern/ghost/SConscript
+++ b/intern/ghost/SConscript
@@ -156,16 +156,11 @@ else:
 
 if env['WITH_BF_IME'] and window_system in ('win32-vc', 'win32-mingw', 'win64-vc', 'win64-mingw'):
     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:
-    try:
-        sources.remove('intern' + os.sep + 'GHOST_ImeWin32.h')
-    except ValueError:
-        pass
-
-    try:
-        sources.remove('intern' + os.sep + 'GHOST_ImeWin32.cpp')
-    except ValueError:
-        pass
+    sources.remove('intern' + os.sep + 'GHOST_ImeWin32.cpp')
 
 if env['WITH_BF_3DMOUSE']:
     defs.append('WITH_INPUT_NDOF')