[Bf-blender-cvs] [93de165] soc-2014-viewport_context: removed options for XInput and XF86Vidmode on OSX because they are not available for XQuartz

Jason Wilkins noreply at git.blender.org
Thu Jul 24 09:13:26 CEST 2014


Commit: 93de165f5d83289fb30b037723622259b1fc7c37
Author: Jason Wilkins
Date:   Thu Jul 24 02:05:00 2014 -0500
Branches: soc-2014-viewport_context
https://developer.blender.org/rB93de165f5d83289fb30b037723622259b1fc7c37

removed options for XInput and XF86Vidmode on OSX because they are not available for XQuartz

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfd2c01..5de6a73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -172,7 +172,7 @@ else()
 endif()
 
 if(WITH_X11)
-	if(UNIX)
+	if(UNIX AND NOT APPLE)
 		option(WITH_X11_XINPUT    "Enable X11 Xinput (tablet support and unicode input)" ON)
 		option(WITH_X11_XF86VMODE "Enable X11 video mode switching"                      ON)
 	else()




More information about the Bf-blender-cvs mailing list