1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-29 03:33:48 +00:00

keep openAL around but make mojoAL the default

This commit is contained in:
fgenesis 2022-03-30 22:54:03 +02:00
parent 960871ccae
commit e894f1ad6e

View file

@ -209,20 +209,29 @@ endif(NOT SDL_FOUND)
### OpenAL ### OpenAL
#OPTION(AQUARIA_INTERNAL_OPENAL "Always use included OpenAL library" ${WIN32_TRUE}) if(AQUARIA_USE_SDL2)
#if(NOT AQUARIA_INTERNAL_OPENAL) OPTION(AQUARIA_USE_MOJOAL "Use mojoAL instead of OpenAL (requires SDL2)" TRUE)
# find_package(OpenAL) endif()
#endif(NOT AQUARIA_INTERNAL_OPENAL)
#if (NOT OPENAL_FOUND) if(AQUARIA_USE_MOJOAL)
# if(WIN32) set(OPENALDIR "${EXTLIBDIR}/AL")
# set(OPENALDIR "${EXTLIBDIR}/AL") set(OPENAL_INCLUDE_DIR "${OPENALDIR}/include" CACHE PATH "OpenAL include directory" FORCE)
# set(OPENAL_INCLUDE_DIR "${OPENALDIR}/include" CACHE PATH "OpenAL include directory" FORCE) else()
# message(STATUS "Using internal copy of OpenAL") OPTION(AQUARIA_INTERNAL_OPENAL "Always use included OpenAL library" ${WIN32_TRUE})
# set(OPENAL_LIBRARY "${OPENALDIR}/lib/win32/OpenAL32.lib" CACHE FILEPATH "Where the OpenAL library can be found" FORCE) if(NOT AQUARIA_INTERNAL_OPENAL)
# else(WIN32) find_package(OpenAL)
# message(SEND_ERROR "We don't have a prebuilt OpenAL for this platform.") endif(NOT AQUARIA_INTERNAL_OPENAL)
# endif(WIN32) if (NOT OPENAL_FOUND)
#endif (NOT OPENAL_FOUND) if(WIN32)
set(OPENALDIR "${EXTLIBDIR}/AL")
set(OPENAL_INCLUDE_DIR "${OPENALDIR}/include" CACHE PATH "OpenAL include directory" FORCE)
message(STATUS "Using internal copy of OpenAL")
set(OPENAL_LIBRARY "${OPENALDIR}/lib/win32/OpenAL32.lib" CACHE FILEPATH "Where the OpenAL library can be found" FORCE)
else(WIN32)
message(SEND_ERROR "We don't have a prebuilt OpenAL for this platform.")
endif(WIN32)
endif (NOT OPENAL_FOUND)
endif()
### TinyXML2 ### TinyXML2
@ -547,9 +556,12 @@ SET(BBGE_SRCS
${EXTLIBDIR}/glfont2/glfont2.cpp ${EXTLIBDIR}/glfont2/glfont2.cpp
${EXTLIBDIR}/minihttp.cpp ${EXTLIBDIR}/minihttp.cpp
${EXTLIBDIR}/jps.hh ${EXTLIBDIR}/jps.hh
${EXTLIBDIR}/mojoal.c
) )
if(AQUARIA_USE_MOJOAL)
set(BBGE_SRCS ${BBGE_SRCS} ${EXTLIBDIR}/mojoal.c)
endif()
SET(ZLIB_SRCS SET(ZLIB_SRCS
${ZLIBDIR}/adler32.c ${ZLIBDIR}/adler32.c
${ZLIBDIR}/crc32.c ${ZLIBDIR}/crc32.c
@ -753,7 +765,10 @@ IF(HAIKU)
ENDIF() ENDIF()
SET(OPTIONAL_LIBS ${OPTIONAL_LIBS} ${SDL_LIBRARY}) SET(OPTIONAL_LIBS ${OPTIONAL_LIBS} ${SDL_LIBRARY})
#SET(OPTIONAL_LIBS ${OPTIONAL_LIBS} ${OPENAL_LIBRARY})
if(NOT AQUARIA_USE_MOJOAL)
SET(OPTIONAL_LIBS ${OPTIONAL_LIBS} ${OPENAL_LIBRARY})
endif()
IF(ZLIB_FOUND) IF(ZLIB_FOUND)
SET(OPTIONAL_LIBS ${OPTIONAL_LIBS} ${ZLIB_LIBRARIES}) SET(OPTIONAL_LIBS ${OPTIONAL_LIBS} ${ZLIB_LIBRARIES})