UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CMake: remove OpenAL dependency

Browse source
This commit is contained in:
Ahmad Fatoum 2018-01-26 22:57:57 +01:00
parent d5bbcbc15f
commit 1093766669
No known key found for this signature in database
GPG key ID: C3EAC3DE9321D59B
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CMakeLists.txt
View file

@ -99,7 +99,7 @@ if(${PLATFORM} MATCHES "PLATFORM_DESKTOP")
if(APPLE) if(APPLE)
# TODO extract framework location and name from ${LIBS_PRIVATE} # TODO extract framework location and name from ${LIBS_PRIVATE}
# and specify them as -F and -framework instead of hardcoding # and specify them as -F and -framework instead of hardcoding
foreach(F OpenGL OpenAL Cocoa) foreach(F OpenGL Cocoa)
set(PKG_CONFIG_LIBS_PRIVATE "${PKG_CONFIG_LIBS_PRIVATE} -framework ${F}") set(PKG_CONFIG_LIBS_PRIVATE "${PKG_CONFIG_LIBS_PRIVATE} -framework ${F}")
endforeach(F) endforeach(F)
endif() endif()

10
utils.cmake
View file

@ -9,18 +9,16 @@ endif()
# Will do nothing on other OSes # Will do nothing on other OSes
if(APPLE) if(APPLE)
find_library(OPENGL_LIBRARY OpenGL) find_library(OPENGL_LIBRARY OpenGL)
find_library(OPENAL_LIBRARY OpenAL)
find_library(COCOA_LIBRARY Cocoa) find_library(COCOA_LIBRARY Cocoa)
find_library(IOKIT_LIBRARY IOKit) find_library(IOKIT_LIBRARY IOKit)
find_library(COREFOUNDATION_LIBRARY CoreFoundation) find_library(COREFOUNDATION_LIBRARY CoreFoundation)
find_library(COREVIDEO_LIBRARY CoreVideo) find_library(COREVIDEO_LIBRARY CoreVideo)
set(LIBS_PRIVATE ${OPENGL_LIBRARY} ${OPENAL_LIBRARY} ${COCOA_LIBRARY} set(LIBS_PRIVATE ${OPENGL_LIBRARY} ${COCOA_LIBRARY}
${IOKIT_LIBRARY} ${COREFOUNDATION_LIBRARY} ${COREVIDEO_LIBRARY}) ${IOKIT_LIBRARY} ${COREFOUNDATION_LIBRARY} ${COREVIDEO_LIBRARY})
endif() endif()
if(CMAKE_SYSTEM_NAME STREQUAL Linux) if(CMAKE_SYSTEM_NAME STREQUAL Linux)
# Elsewhere (such as Linux), need `-lopenal -lGL`, etc...
set(LIBS_PRIVATE set(LIBS_PRIVATE
m pthread dl m pthread dl
GL GL
@ -29,11 +27,9 @@ endif()
if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD) if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
find_package(OpenAL REQUIRED) include_directories(${OPENGL_INCLUDE_DIR})
include_directories(${OPENGL_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR})
find_package(X11 REQUIRED) find_package(X11 REQUIRED)
find_library(OpenAL REQUIRED)
find_library(pthread NAMES pthread) find_library(pthread NAMES pthread)
find_library(Xrandr NAMES Xrandr) find_library(Xrandr NAMES Xrandr)
find_library(Xi NAMES Xi) find_library(Xi NAMES Xi)
@ -41,7 +37,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
find_library(Xxf86vm NAMES Xxf86vm) find_library(Xxf86vm NAMES Xxf86vm)
find_library(Xcursor NAMES Xcursor) find_library(Xcursor NAMES Xcursor)
set(LIBS_PRIVATE m ${pthread} ${OPENAL_LIBRARY} ${X11_LIBRARIES} ${Xrandr} ${Xinerama} ${Xi} ${Xxf86vm} ${Xcursor}) set(LIBS_PRIVATE m ${pthread} ${X11_LIBRARIES} ${Xrandr} ${Xinerama} ${Xi} ${Xxf86vm} ${Xcursor})
endif() endif()
# TODO Support Windows # TODO Support Windows