diff --git a/libs/openal-soft/CMakeLists.txt b/libs/openal-soft/CMakeLists.txt index 0087edb2..b7d9891b 100644 --- a/libs/openal-soft/CMakeLists.txt +++ b/libs/openal-soft/CMakeLists.txt @@ -30,12 +30,12 @@ OPTION(ALSOFT_DLOPEN "Check for the dlopen API for loading optional libs" ON) OPTION(ALSOFT_WERROR "Treat compile warnings as errors" OFF) -OPTION(ALSOFT_UTILS "Build and install utility programs" ON) +OPTION(ALSOFT_UTILS "Build and install utility programs" OFF) OPTION(ALSOFT_NO_CONFIG_UTIL "Disable building the alsoft-config utility" OFF) -OPTION(ALSOFT_EXAMPLES "Build and install example programs" ON) +OPTION(ALSOFT_EXAMPLES "Build and install example programs" OFF) -OPTION(ALSOFT_CONFIG "Install alsoft.conf sample configuration file" ON) +OPTION(ALSOFT_CONFIG "Install alsoft.conf sample configuration file" OFF) OPTION(ALSOFT_HRTF_DEFS "Install HRTF definition files" ON) @@ -82,6 +82,8 @@ IF ("${CMAKE_C_PLATFORM_ID}" STREQUAL "QNX") SET(EXTRA_LIBS ${EXTRA_LIBS} -L/usr/lib) ENDIF() +SET(OPENAL_LIB_NAME ${LIBNAME} PARENT_SCOPE) + IF(NOT LIBTYPE) SET(LIBTYPE SHARED) ENDIF() @@ -1092,8 +1094,10 @@ IF(WIN32 AND NOT LIBTYPE STREQUAL "STATIC") ENDIF() TARGET_LINK_LIBRARIES(${LIBNAME} common ${EXTRA_LIBS}) +TARGET_INCLUDE_DIRECTORIES(${LIBNAME} PUBLIC include) # Add an install target here +IF(NOT MEGA) INSTALL(TARGETS ${LIBNAME} RUNTIME DESTINATION bin LIBRARY DESTINATION "lib${LIB_SUFFIX}" @@ -1109,7 +1113,7 @@ INSTALL(FILES include/AL/al.h ) INSTALL(FILES "${OpenAL_BINARY_DIR}/openal.pc" DESTINATION "lib${LIB_SUFFIX}/pkgconfig") - +ENDIF() MESSAGE(STATUS "") MESSAGE(STATUS "Building OpenAL with support for the following backends:") @@ -1247,3 +1251,7 @@ IF(ALSOFT_EXAMPLES) MESSAGE(STATUS "") ENDIF() ENDIF() + +IF(MEGA) + install(TARGETS ${LIBNAME} RUNTIME DESTINATION . LIBRARY DESTINATION .) +ENDIF() \ No newline at end of file diff --git a/libs/openal-soft/cmake/CheckFileOffsetBits.cmake b/libs/openal-soft/cmake/CheckFileOffsetBits.cmake index 8b549b69..76148403 100644 --- a/libs/openal-soft/cmake/CheckFileOffsetBits.cmake +++ b/libs/openal-soft/cmake/CheckFileOffsetBits.cmake @@ -18,12 +18,12 @@ MACRO(CHECK_FILE_OFFSET_BITS) MESSAGE(STATUS "Checking _FILE_OFFSET_BITS for large files") TRY_COMPILE(__WITHOUT_FILE_OFFSET_BITS_64 ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/cmake/CheckFileOffsetBits.c + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/CheckFileOffsetBits.c COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}) IF(NOT __WITHOUT_FILE_OFFSET_BITS_64) TRY_COMPILE(__WITH_FILE_OFFSET_BITS_64 ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/cmake/CheckFileOffsetBits.c + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/CheckFileOffsetBits.c COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_FILE_OFFSET_BITS=64) ENDIF(NOT __WITHOUT_FILE_OFFSET_BITS_64)