|
|
Author: piumarta
Date: 2010-08-06 16:36:49 -0700 (Fri, 06 Aug 2010)
New Revision: 2250
Modified:
trunk/platforms/unix/ChangeLog
trunk/platforms/unix/vm-display-X11/config.cmake
Log:
manually check for libXrender
Modified: trunk/platforms/unix/ChangeLog
===================================================================
--- trunk/platforms/unix/ChangeLog 2010-07-28 03:33:19 UTC (rev 2249)
+++ trunk/platforms/unix/ChangeLog 2010-08-06 23:36:49 UTC (rev 2250)
@@ -1,3 +1,8 @@
+2010-08-06 Ian Piumarta <com -dot- gmail -at- piumarta (backwards)>
+
+ * vm-display-X11/config.cmake: Manually check for Xrender library.
+ Set HAVE_LIBXRENDER instead of HAVE_LIB_XRENDER.
+
2010-05-13 Ian Piumarta <com -dot- gmail -at- piumarta (backwards)>
* plugins/CameraPlugin/sqCamera.c: Added.
Modified: trunk/platforms/unix/vm-display-X11/config.cmake
===================================================================
--- trunk/platforms/unix/vm-display-X11/config.cmake 2010-07-28 03:33:19 UTC (rev 2249)
+++ trunk/platforms/unix/vm-display-X11/config.cmake 2010-08-06 23:36:49 UTC (rev 2250)
@@ -5,12 +5,15 @@
ELSE ()
SET (USE_X11 1)
IF (X11_Xext_FOUND)
- SET (HAVE_LIB_XEXT 1)
+ SET (HAVE_LIBXEXT 1)
CHECK_LIBRARY_EXISTS (Xext XShmAttach ${X11_LIBRARY_DIR} USE_XSHM)
ENDIF ()
CHECK_INCLUDE_FILE (X11/extensions/Xrender.h HAVE_X11_EXTENSIONS_XRENDER_H -I${X11_INCLUDE_DIR})
IF (HAVE_X11_EXTENSIONS_XRENDER_H)
- CHECK_LIBRARY_EXISTS (Xrender XRenderQueryVersion ${X11_LIBRARY_DIR} HAVE_LIB_XRENDER)
+ CHECK_LIBRARY_EXISTS (Xrender XRenderQueryVersion ${X11_LIBRARY_DIR} HAVE_LIBXRENDER)
+ IF (HAVE_LIBXRENDER)
+ PLUGIN_LINK_LIBRARIES (Xrender)
+ ENDIF ()
ENDIF (HAVE_X11_EXTENSIONS_XRENDER_H)
IF (OPENGL_FOUND)
CHECK_INCLUDE_FILE (GL/gl.h HAVE_GL_GL_H -I${X11_INCLUDE_DIR})
@@ -27,8 +30,8 @@
CONFIG_DEFINE (USE_X11)
CONFIG_DEFINE (USE_X11_GLX)
-CONFIG_DEFINE (HAVE_LIB_XEXT)
-CONFIG_DEFINE (HAVE_LIB_XRENDER)
+CONFIG_DEFINE (HAVE_LIBXEXT)
+CONFIG_DEFINE (HAVE_LIBXRENDER)
CONFIG_DEFINE (USE_XSHM)
|
Locked
