diff options
| author | Ray <[email protected]> | 2018-02-12 11:27:26 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-02-12 11:27:26 +0100 |
| commit | dd8f0765b833bff2fbcc523e2d0a20d4fd28b5f3 (patch) | |
| tree | 298dc5f3d8890bdb478c73c3737c751486b6ec5b /utils.cmake | |
| parent | b908a4078a2f318e6bc9cbdcb7045d1ccab0c6a4 (diff) | |
| parent | 8af5f9dfe0e23d918bb88a5fca9e5671c9100f3a (diff) | |
| download | raylib-dd8f0765b833bff2fbcc523e2d0a20d4fd28b5f3.tar.gz raylib-dd8f0765b833bff2fbcc523e2d0a20d4fd28b5f3.zip | |
Merge pull request #465 from raysan5/develop
Integrate develop branch into master
Diffstat (limited to 'utils.cmake')
| -rw-r--r-- | utils.cmake | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/utils.cmake b/utils.cmake index 68fd1f76..2c6a3771 100644 --- a/utils.cmake +++ b/utils.cmake @@ -32,7 +32,11 @@ else() find_library(XCURSOR_LIBRARY Xcursor) include_directories(${OPENGL_INCLUDE_DIR}) - set(LIBS_PRIVATE m ${pthread} ${OPENGL_LIBRARIES} ${X11_LIBRARIES} ${XRANDR_LIBRARY} ${XINERAMA_LIBRARY} ${XI_LIBRARY} ${XXF86VM_LIBRARY} ${XCURSOR_LIBRARY}) + if ("${CMAKE_SYSTEM_NAME}" MATCHES "(Net|Open)BSD") + find_library(OSS_LIBRARY ossaudio) + endif() + + set(LIBS_PRIVATE m ${pthread} ${OPENGL_LIBRARIES} ${X11_LIBRARIES} ${XRANDR_LIBRARY} ${XINERAMA_LIBRARY} ${XI_LIBRARY} ${XXF86VM_LIBRARY} ${XCURSOR_LIBRARY} ${OSS_LIBRARY}) endif() endif() @@ -70,8 +74,8 @@ foreach(L ${LIBS_PRIVATE}) set(LASTDIR ${DIR}) - set(PKG_CONFIG_LIBS_PRIVATE ${PKG_CONFIG_LIBS_PRIVATE} ${DIR_OPT} ${FILE_OPT}) - string (REPLACE ";" " " PKG_CONFIG_LIBS_PRIVATE "${PKG_CONFIG_LIBS_PRIVATE}") + set(__PKG_CONFIG_LIBS_PRIVATE ${__PKG_CONFIG_LIBS_PRIVATE} ${DIR_OPT} ${FILE_OPT}) + string (REPLACE ";" " " __PKG_CONFIG_LIBS_PRIVATE "${__PKG_CONFIG_LIBS_PRIVATE}") endforeach(L) @@ -82,7 +86,7 @@ function(link_libraries_to_executable executable) if (TARGET raylib_shared) target_link_libraries(${executable} raylib_shared) else() - target_link_libraries(${executable} raylib ${PKG_CONFIG_LIBS_PRIVATE}) + target_link_libraries(${executable} raylib ${__PKG_CONFIG_LIBS_PRIVATE}) endif() endfunction() |