[Bf-blender-cvs] [983c719] master: Fix non-Windows SCons compiling error after IME merge

[julianeisel]

Commit: 983c71931b1886d4349b6e964ece4622c8cd74fb
Author: julianeisel
Date:   Sun Dec 7 23:57:51 2014 +0100
Branches: master
https://developer.blender.org/rB983c71931b1886d4349b6e964ece4622c8cd74fb

Fix non-Windows SCons compiling error after IME merge

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

M	intern/ghost/SConscript

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

diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript
index a41fadf..573e705 100644
--- a/intern/ghost/SConscript
+++ b/intern/ghost/SConscript
@@ -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')