diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ce37e84..5d3df4ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1056,36 +1056,29 @@ IF(ALSOFT_NATIVE_TOOLS_PATH) find_program(BIN2H_NATIVE_COMMAND NAMES bin2h PATHS "${ALSOFT_NATIVE_TOOLS_PATH}" NO_DEFAULT_PATH) - find_program(BSINCGEN_NATIVE_COMMAND NAMES bsincgen - PATHS "${ALSOFT_NATIVE_TOOLS_PATH}" - NO_DEFAULT_PATH) - if(NOT BIN2H_NATIVE_COMMAND OR NOT BSINCGEN_NATIVE_COMMAND) + if(NOT BIN2H_NATIVE_COMMAND) message(FATAL_ERROR "Failed to find native tools in ${ALSOFT_NATIVE_TOOLS_PATH}. -bin2h: ${BIN2H_NATIVE_COMMAND} -bsincgen: ${BSINCGEN_NATIVE_COMMAND}") +bin2h: ${BIN2H_NATIVE_COMMAND}") endif() SET(BIN2H_COMMAND ${BIN2H_NATIVE_COMMAND}) - SET(BSINCGEN_COMMAND ${BSINCGEN_NATIVE_COMMAND}) ELSE() SET(NATIVE_BIN_DIR "${OpenAL_BINARY_DIR}/native-tools") FILE(MAKE_DIRECTORY "${NATIVE_BIN_DIR}") SET(BIN2H_COMMAND "${NATIVE_BIN_DIR}/bin2h") - SET(BSINCGEN_COMMAND "${NATIVE_BIN_DIR}/bsincgen") - ADD_CUSTOM_COMMAND(OUTPUT "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}" + ADD_CUSTOM_COMMAND(OUTPUT "${BIN2H_COMMAND}" COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" "${NATIVE_SRC_DIR}" - COMMAND ${CMAKE_COMMAND} -E remove "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}" + COMMAND ${CMAKE_COMMAND} -E remove "${BIN2H_COMMAND}" COMMAND ${CMAKE_COMMAND} --build . --config "Release" WORKING_DIRECTORY "${NATIVE_BIN_DIR}" DEPENDS "${NATIVE_SRC_DIR}/CMakeLists.txt" IMPLICIT_DEPENDS C "${NATIVE_SRC_DIR}/bin2h.c" - C "${NATIVE_SRC_DIR}/bsincgen.c" VERBATIM ) ENDIF() ADD_CUSTOM_TARGET(native-tools - DEPENDS "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}" + DEPENDS "${BIN2H_COMMAND}" VERBATIM ) @@ -1106,13 +1099,6 @@ if(ALSOFT_EMBED_HRTF_DATA) make_hrtf_header("Default HRTF.mhr" "hrtf_default") endif() -ADD_CUSTOM_COMMAND(OUTPUT "${OpenAL_BINARY_DIR}/bsinc_inc.h" - COMMAND "${BSINCGEN_COMMAND}" "${OpenAL_BINARY_DIR}/bsinc_inc.h" - DEPENDS native-tools "${NATIVE_SRC_DIR}/bsincgen.c" - VERBATIM -) -SET(ALC_OBJS ${ALC_OBJS} "${OpenAL_BINARY_DIR}/bsinc_inc.h") - IF(ALSOFT_UTILS AND NOT ALSOFT_NO_CONFIG_UTIL) add_subdirectory(utils/alsoft-config) |