Skip to content

Merge decoder and encoder libs, and use dynamic linking #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Merge decoder and encoder libs, and use dynamic linking #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ set(XAAC_ROOT "${CMAKE_CURRENT_SOURCE_DIR}")
set(XAAC_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}")
find_package(Threads REQUIRED)

set(CMAKE_STATIC_LIBRARY_PREFIX "")

include("${XAAC_ROOT}/cmake/utils.cmake")

libxaac_add_compile_options()
Expand All @@ -18,12 +16,13 @@ if(NOT COMPILER_HAS_SANITIZER)
libxaac_set_link_libraries()
endif()

include("${XAAC_ROOT}/cmake/libxaac.cmake")

include("${XAAC_ROOT}/common/common.cmake")
include("${XAAC_ROOT}/decoder/libxaacdec.cmake")

include("${XAAC_ROOT}/test/decoder/xaacdec.cmake")
include("${XAAC_ROOT}/fuzzer/xaac_dec_fuzzer.cmake")

include("${XAAC_ROOT}/encoder/libxaacenc.cmake")
include("${XAAC_ROOT}/test/encoder/xaacenc.cmake")
include("${XAAC_ROOT}/fuzzer/xaac_enc_fuzzer.cmake")

14 changes: 14 additions & 0 deletions cmake/libxaac.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# include old library and common
include("${XAAC_ROOT}/decoder/libxaacdec.cmake")
include("${XAAC_ROOT}/encoder/libxaacenc.cmake")
include("${XAAC_ROOT}/common/common.cmake")

# generate object files without linking
add_library(xaacobjlib OBJECT ${LIBXAACENC_SRCS} ${LIBXAAC_COMMON_SRCS} ${LIBXAACDEC_SRCS} ${LIBXAACCDEC_ASMS})

# PIC for shared libraries
set_property(TARGET xaacobjlib PROPERTY POSITION_INDEPENDENT_CODE 1)

# build from same object files
add_library(xaac SHARED $<TARGET_OBJECTS:xaacobjlib>)
add_library(xaac_static STATIC $<TARGET_OBJECTS:xaacobjlib>)
1 change: 0 additions & 1 deletion decoder/libxaacdec.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,4 +136,3 @@ else()
include("${XAAC_ROOT}/decoder/x86/libxaacdec_x86.cmake")
endif()

add_library(libxaacdec STATIC ${LIBXAAC_COMMON_SRCS} ${LIBXAACDEC_SRCS} ${LIBXAACCDEC_ASMS})
2 changes: 0 additions & 2 deletions encoder/libxaacenc.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,5 +136,3 @@ set(LIBXAACENC_INCLUDES ${XAAC_ROOT}/encoder ${XAAC_ROOT}/encoder/drc_src)
include_directories(${LIBXAACENC_INCLUDES})

include("${XAAC_ROOT}/encoder/drc_src/libxaacenc_drc.cmake")

add_library(libxaacenc STATIC ${LIBXAACENC_SRCS} ${LIBXAAC_COMMON_SRCS})
2 changes: 1 addition & 1 deletion fuzzer/xaac_dec_fuzzer.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ list(APPEND XAAC_DEC_FUZZER_SRCS "${XAAC_ROOT}/fuzzer/xaac_dec_fuzzer.cpp")
set(LIBXAACDEC_INCLUDES ${XAAC_ROOT}/decoder ${XAAC_ROOT}/test
${XAAC_ROOT}/decoder/drc_src)

libxaac_add_fuzzer(xaac_dec_fuzzer libxaacdec SOURCES ${XAAC_DEC_FUZZER_SRCS}
libxaac_add_fuzzer(xaac_dec_fuzzer xaac SOURCES ${XAAC_DEC_FUZZER_SRCS}
INCLUDES ${LIBXAACDEC_INCLUDES})
2 changes: 1 addition & 1 deletion fuzzer/xaac_enc_fuzzer.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ list(APPEND XAAC_ENC_FUZZER_SRCS "${XAAC_ROOT}/fuzzer/xaac_enc_fuzzer.cpp")

set(LIBXAACENC_INCLUDES ${XAAC_ROOT}/encoder ${XAAC_ROOT}/test/encoder ${XAAC_ROOT}/common)

libxaac_add_fuzzer(xaac_enc_fuzzer libxaacenc SOURCES ${XAAC_ENC_FUZZER_SRCS}
libxaac_add_fuzzer(xaac_enc_fuzzer xaac SOURCES ${XAAC_ENC_FUZZER_SRCS}
INCLUDES ${LIBXAACENC_INCLUDES})
2 changes: 1 addition & 1 deletion test/decoder/xaacdec.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set(LIBXAACDEC_INCLUDES ${XAAC_ROOT}/decoder ${XAAC_ROOT}/test/decoder/

include_directories(${LIBXAACDEC_INCLUDES})

libxaac_add_executable(xaacdec libxaacdec SOURCES ${XAACDEC_SRCS} INCLUDES
libxaac_add_executable(xaacdec xaac SOURCES ${XAACDEC_SRCS} INCLUDES
${LIBXAACDEC_INCLUDES})

if(MSVC)
Expand Down
2 changes: 1 addition & 1 deletion test/encoder/xaacenc.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set(LIBXAACENC_INCLUDES ${XAAC_ROOT}/encoder

include_directories(${LIBXAACENC_INCLUDES})

libxaac_add_executable(xaacenc libxaacenc SOURCES ${XAACENC_SRCS} INCLUDES
libxaac_add_executable(xaacenc xaac SOURCES ${XAACENC_SRCS} INCLUDES
${LIBXAACENC_INCLUDES})

if (MSVC)
Expand Down