diff options
| author | Ahmad Fatoum <[email protected]> | 2018-01-26 22:57:57 +0100 |
|---|---|---|
| committer | Ahmad Fatoum <[email protected]> | 2018-01-27 01:05:17 +0100 |
| commit | 1093766669f7a96de09e205e9bab97c0e361a427 (patch) | |
| tree | ab4cbcdf01219896858138f810be2320ebcb0d0d | |
| parent | d5bbcbc15f9111381b82bd02e7c498c9fca586d2 (diff) | |
| download | raylib-1093766669f7a96de09e205e9bab97c0e361a427.tar.gz raylib-1093766669f7a96de09e205e9bab97c0e361a427.zip | |
CMake: remove OpenAL dependency
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | utils.cmake | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e86bff9b..c8958c28 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -99,7 +99,7 @@ if(${PLATFORM} MATCHES "PLATFORM_DESKTOP") if(APPLE) # TODO extract framework location and name from ${LIBS_PRIVATE} # 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}") endforeach(F) endif() diff --git a/utils.cmake b/utils.cmake index d2c82cd1..d07dce3e 100644 --- a/utils.cmake +++ b/utils.cmake @@ -9,18 +9,16 @@ endif() # Will do nothing on other OSes if(APPLE) find_library(OPENGL_LIBRARY OpenGL) - find_library(OPENAL_LIBRARY OpenAL) find_library(COCOA_LIBRARY Cocoa) find_library(IOKIT_LIBRARY IOKit) find_library(COREFOUNDATION_LIBRARY CoreFoundation) 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}) endif() if(CMAKE_SYSTEM_NAME STREQUAL Linux) - # Elsewhere (such as Linux), need `-lopenal -lGL`, etc... set(LIBS_PRIVATE m pthread dl GL @@ -29,11 +27,9 @@ endif() if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD) find_package(OpenGL REQUIRED) - find_package(OpenAL REQUIRED) - include_directories(${OPENGL_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR}) + include_directories(${OPENGL_INCLUDE_DIR}) find_package(X11 REQUIRED) - find_library(OpenAL REQUIRED) find_library(pthread NAMES pthread) find_library(Xrandr NAMES Xrandr) find_library(Xi NAMES Xi) @@ -41,7 +37,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD) find_library(Xxf86vm NAMES Xxf86vm) 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() # TODO Support Windows |