Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Use shared libs for X11 because API doesn't change

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2015-12-25 15:35:04 +01:00
parent cbc1acfcd2
commit 4a1f4cd725
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
code/nel/src/3d/driver/opengl/CMakeLists.txt
View file

@ -5,8 +5,11 @@ IF(NOT WIN32)
FIND_LIBRARY(CARBON NAMES Carbon) FIND_LIBRARY(CARBON NAMES Carbon)
FIND_LIBRARY(COCOA NAMES Cocoa) FIND_LIBRARY(COCOA NAMES Cocoa)
ELSE() ELSE()
SET(OLD_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
SET(CMAKE_FIND_LIBRARY_SUFFIXES .so)
FIND_PACKAGE(X11) FIND_PACKAGE(X11)
FIND_PACKAGE(XF86VidMode) FIND_PACKAGE(XF86VidMode)
SET(CMAKE_FIND_LIBRARY_SUFFIXES ${OLD_CMAKE_FIND_LIBRARY_SUFFIXES})
ENDIF() ENDIF()
ENDIF() ENDIF()
@ -71,12 +74,12 @@ IF(UNIX AND NOT APPLE)
TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${X11_Xext_LIB}) TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${X11_Xext_LIB})
ENDIF() ENDIF()
# libraries needed to be linked while linking to static X11 libraries # libraries needed to be linked while linking to static X11 libraries
FIND_LIBRARY(XCB_LIBRARY # FIND_LIBRARY(XCB_LIBRARY
NAMES xcb # NAMES xcb
HINTS ${X11_LIB_SEARCH_PATH}) # HINTS ${X11_LIB_SEARCH_PATH})
IF(XCB_LIBRARY) # IF(XCB_LIBRARY)
TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${XCB_LIBRARY}) # TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${XCB_LIBRARY})
ENDIF() # ENDIF()
ENDIF() ENDIF()
IF(WITH_PCH) IF(WITH_PCH)