nel-xvidmode.diff

ratmice, 05/08/2010 12:52 am

Download (2.7 kB)

b/code/nel/CMakeLists.txt Fri May 07 15:50:56 2010 -0700
72 72 
FIND_PACKAGE(LibXml2 REQUIRED)
73 73 
FIND_PACKAGE(PNG REQUIRED)
74 74 
FIND_PACKAGE(Jpeg)
75 
FIND_PACKAGE(Xf86VidMode)
75 76 

  		





  76
  77
  
    
NL_SETUP_BUILD()


  		





  77
  78
  
    

  		












  

    
      b/code/nel/CMakeModules/FindXf86VidMode.cmake	Fri May 07 15:50:56 2010 -0700
    
  






  
  1
  
    
# - Locate Jpeg library

  		





  
  2
  
    
# This module defines

  		





  
  3
  
    
#  XF86VidMode_LIBRARY, the library to link against

  		





  
  4
  
    
#  XF86VidMode_FOUND, if false, do not try to link to XF86VidMode

  		





  
  5
  
    
#  XF86VidMode_INCLUDE_DIR, where to find headers.

  		





  
  6
  
    

  		





  
  7
  
    
IF(XF86VidMode_LIBRARY AND XF86VidMode_INCLUDE_DIR)

  		





  
  8
  
    
  # in cache already

  		





  
  9
  
    
  SET(XF86VidMode_FIND_QUIETLY TRUE)

  		





  
  10
  
    
ENDIF(XF86VidMode_LIBRARY AND XF86VidMode_INCLUDE_DIR)

  		





  
  11
  
    

  		





  
  12
  
    

  		





  
  13
  
    
FIND_PATH(XF86VidMode_INCLUDE_DIR

  		





  
  14
  
    
  xf86vm.h

  		





  
  15
  
    
  PATHS

  		





  
  16
  
    
  $ENV{XF86VidMode_DIR}/include

  		





  
  17
  
    
  /usr/include/X11/

  		





  
  18
  
    
  /usr/X11R6/include/

  		





  
  19
  
    
  PATH_SUFFIXES extensions 

  		





  
  20
  
    
)

  		





  
  21
  
    

  		





  
  22
  
    
FIND_LIBRARY(XF86VidMode_LIBRARY

  		





  
  23
  
    
  Xxf86vm 

  		





  
  24
  
    
  PATHS

  		





  
  25
  
    
  $ENV{XF86VidMode_DIR}/lib

  		





  
  26
  
    
  /usr/X11R6/lib

  		





  
  27
  
    
  /usr/lib

  		





  
  28
  
    
  /sw/lib

  		





  
  29
  
    
  /opt/local/lib

  		





  
  30
  
    
  /opt/csw/lib

  		





  
  31
  
    
  /opt/lib

  		





  
  32
  
    
  /usr/freeware/lib64

  		





  
  33
  
    
)

  		





  
  34
  
    

  		





  
  35
  
    
IF(XF86VidMode_LIBRARY AND XF86VidMode_INCLUDE_DIR)

  		





  
  36
  
    
  SET(XF86VidMode_FOUND "YES")

  		





  
  37
  
    
  ADD_DEFINITIONS(-DXF86VIDMODE)

  		





  
  38
  
    
  IF(NOT XF86VidMode_FIND_QUIETLY)

  		





  
  39
  
    
    MESSAGE(STATUS "Found XF86VidMode: ${XF86VidMode_LIBRARY}")

  		





  
  40
  
    
  ENDIF(NOT XF86VidMode_FIND_QUIETLY)

  		





  
  41
  
    
ELSE(XF86VidMode_LIBRARY AND XF86VidMode_INCLUDE_DIR)

  		





  
  42
  
    
  IF(NOT XF86VidMode_FIND_QUIETLY)

  		





  
  43
  
    
    MESSAGE(STATUS "Warning: Unable to find XF86VidMode!")

  		





  
  44
  
    
  ENDIF(NOT XF86VidMode_FIND_QUIETLY)

  		





  
  45
  
    
ENDIF(XF86VidMode_LIBRARY AND XF86VidMode_INCLUDE_DIR)

  		












  

    
      b/code/nel/src/3d/driver/opengl/CMakeLists.txt	Fri May 07 15:50:56 2010 -0700
    
  






  9
  9
  
    
ADD_LIBRARY(${NLDRV_OGL_LIB} SHARED ${SRC})


  		





  10
  10
  
    

  		





  11
  11
  
    
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})


  		





  12
  
  
    
TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} nel3d nelmisc ${OPENGL_LIBRARIES})


  		





  
  12
  
    
TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} nel3d nelmisc ${OPENGL_LIBRARIES} ${XF86VidMode_LIBRARY})


  		





  13
  13
  
    
SET_TARGET_PROPERTIES(${NLDRV_OGL_LIB} PROPERTIES 


  		





  14
  14
  
    
  VERSION ${NL_VERSION}


  		





  15
  15
  
    
  PROJECT_LABEL "Driver, Video: OpenGL")


  		





  ......




  31
  31
  
    
INSTALL(TARGETS ${NLDRV_OGL_LIB} LIBRARY DESTINATION lib RUNTIME DESTINATION bin COMPONENT drivers3d)


  		





  32
  32
  
    
IF(WITH_MAXPLUGIN)


  		





  33
  33
  
    
  INSTALL(TARGETS ${NLDRV_OGL_LIB} RUNTIME DESTINATION maxplugin COMPONENT drivers3d)


  		





  34
  
  
    
ENDIF(WITH_MAXPLUGIN)

  		





  
  34
  
    
ENDIF(WITH_MAXPLUGIN)