Commit: 0eb0f248a6caf705b1493f1874bde54990b58408
Author: Campbell Barton
Date: Sat Dec 6 13:41:49 2014 +0100
Branches: input_method_editor_partial_support
https://developer.blender.org/rB0eb0f248a6caf705b1493f1874bde54990b58408
Merge branch 'master' into input_method_editor_partial_support
Conflicts:
source/blender/windowmanager/CMakeLists.txt
===================================================================
===================================================================
diff --cc source/blender/windowmanager/CMakeLists.txt
index accd465,4cbadda..78b5d49
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@@ -130,16 -130,6 +130,12 @@@ if(WITH_BUILDINFO
add_definitions(-DWITH_BUILDINFO)
endif()
+if(WIN32)
- list(APPEND INC
- ../../../intern/utfconv
- )
-
+ if(WITH_INPUT_IME)
+ add_definitions(-DWITH_INPUT_IME)
+ endif()
+endif()
+
if(WITH_COMPOSITOR)
add_definitions(-DWITH_COMPOSITOR)
endif()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
