Skip to content

Commit

Permalink
Merge pull request RobertBeckebans#624 from coldtobi/fix_openal_build…
Browse files Browse the repository at this point in the history
…_issue

Thanks Tobi :)
  • Loading branch information
RobertBeckebans authored Nov 15, 2021
2 parents cbf0ffb + b11cd5d commit d1d9038
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions neo/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1714,17 +1714,19 @@ else()
if(OPENAL)
find_package(OpenAL REQUIRED)
add_definitions(-DUSE_OPENAL)
# SRS - Added support for OpenAL Soft headers on OSX (vs default macOS SDK headers)
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT OPENAL_INCLUDE_DIR MATCHES "SDKs/MacOSX.*\.sdk")
include_directories(${OPENAL_INCLUDE_DIR})
add_definitions(-DUSE_OPENAL_SOFT_INCLUDES)
endif()

# SRS - Added support for OpenAL Soft headers on OSX (vs default macOS SDK headers)
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT OPENAL_INCLUDE_DIR MATCHES "SDKs/MacOSX.*\.sdk")
include_directories(${OPENAL_INCLUDE_DIR})
add_definitions(-DUSE_OPENAL_SOFT_INCLUDES)
endif()

list(APPEND RBDOOM3_INCLUDES ${OPENAL_INCLUDES})
list(APPEND RBDOOM3_SOURCES
${OPENAL_SOURCES}
${DOOMCLASSIC_OPENAL_SOURCES})
list(APPEND RBDOOM3_SOURCES ${OPENAL_SOURCES})

if(DOOM_CLASSIC)
list(APPEND RBDOOM3_SOURCES ${DOOMCLASSIC_OPENAL_SOURCES})
endif()
else()
list(APPEND RBDOOM3_INCLUDES ${STUBAUDIO_INCLUDES})
list(APPEND RBDOOM3_SOURCES ${STUBAUDIO_SOURCES})
Expand Down

0 comments on commit d1d9038

Please sign in to comment.