fixed conflicts

This commit is contained in:
Jakob Meier
2022-02-25 14:39:18 +01:00
62 changed files with 3851 additions and 1018 deletions

View File

@ -41,12 +41,12 @@ add_compile_options(
$<$<COMPILE_LANGUAGE:ASM>:${ASM_FLAGS}>
)
set(STRIPPED_OBSW_NAME ${OBSW_NAME}-stripped)
set(STRIPPED_OBSW_NAME ${OBSW_BIN_NAME}-stripped)
add_custom_command(
TARGET ${OBSW_NAME}
POST_BUILD
COMMAND ${CMAKE_STRIP} --strip-all ${OBSW_NAME} -o ${STRIPPED_OBSW_NAME}
COMMAND ${CMAKE_STRIP} --strip-all ${OBSW_BIN_NAME} -o ${STRIPPED_OBSW_NAME}
BYPRODUCTS ${STRIPPED_OBSW_NAME}
COMMENT "Generating stripped executable ${STRIPPED_OBSW_NAME}.."
)