Skip to content

Commit

Permalink
Removed component libraries from flutter native lib. We have establis…
Browse files Browse the repository at this point in the history
…hed a "forward" mechanism to pre-load backend!
  • Loading branch information
hkbinaurics committed May 17, 2024
1 parent f7d2bdf commit 7de29b9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 99 deletions.
78 changes: 2 additions & 76 deletions sources/jvxLibraries/jvx-flutter-native-shared/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ if(DEFINED JVX_SDK_PATH)
endif(DEFINED JVX_SDK_PATH)

set(PROJECT_NAME jvx-flutter-native-shared)
set(JVX_AUTOMATION_VERBOSE FALSE)
set(JVX_LOCAL_AUTOMATION_ON_START FALSE)
set(AYFBINRENDER_WEBSERVER TRUE)

include(${JVX_CMAKE_DIR}/common_local_lib_head.cmake)

Expand All @@ -32,78 +29,7 @@ set(LOCAL_SOURCES
${JVX_SUBPRODUCT_ROOT}/sources/jvxLibraries/jvx-flutter-native-static/exports/${JVX_OS}/exports-flutter-native.def
)

set(LOCAL_LIBS
ayfAuNBinRenderMixer_static
jvxSpNAsyncIo_sm_static
jvxAuTFileReader_static
jvxAuTFileWriter_static
jvxAuCPcm_static
jvxAuNForwardBuffer_static
jvxAuNBitstreamDecoder_static
jvxAuNBitstreamEncoder_static
jvxAuNChannelRearrange_static
jvxAuNBinauralRender_static
jvx-flutter-native-static_static)

include_directories(
${JVX_SUBPRODUCT_BINARY_DIR}/sources/jvxComponents/jvxAudioTechnologies/jvxAuTPortAudio/
${JVX_SUBPRODUCT_BINARY_DIR}/sources/jvxComponents/jvxAudioTechnologies/jvxAuTAlsa/
${JVX_SUBPRODUCT_BINARY_DIR}/sources/jvxComponents/jvxAudioTechnologies/jvxAuTCoreAudio/
${JVX_BINARY_DIR}/base/sources/jvxComponents/jvxAudioTechnologies/jvxAuTAsio/
${JVX_SUBPRODUCT_BINARY_DIR}/sources/jvxComponents/jvxAudioTechnologies/jvxAuTWindows
${JVX_SUBPRODUCT_AYFBINRENDER_LIBS_BINARY_DIR}/sources/jvxComponents/jvxAudioNodes/ayfAuNBinRenderMixer/
${JVX_SUBPRODUCT_BINARY_DIR}/sources/jvxComponents/jvxAudioNodes/jvxAuNBinauralRender/
${JVX_BASE_BINARY_DIR}/sources/jvxComponents/jvxSignalProcessingNodes/jvxSpNAsyncIo
${JVX_SUBPRODUCT_BINARY_DIR}/sources/jvxComponents/jvxAudioTechnologies/jvxAuTFileReader
${JVX_SUBPRODUCT_BINARY_DIR}/sources/jvxComponents/jvxAudioTechnologies/jvxAuTFileWriter
${JVX_SUBPRODUCT_BINARY_DIR}/sources/jvxComponents/jvxAudioCodecs/jvxAuCPcm/
${JVX_SUBPRODUCT_BINARY_DIR}/sources/jvxComponents/jvxAudioNodes/jvxAuNBitstreamDecoder/
${JVX_SUBPRODUCT_BINARY_DIR}/sources/jvxComponents/jvxAudioNodes/jvxAuNBitstreamEncoder/
${JVX_SUBPRODUCT_BINARY_DIR}/sources/jvxComponents/jvxAudioNodes/jvxAuNForwardBuffer/
${JVX_SUBPRODUCT_BINARY_DIR}/sources/jvxComponents/jvxAudioNodes/jvxAuNChannelRearrange/
)

if(JVX_LOCAL_AUTOMATION_ON_START)
include_directories({JVX_BASE_ROOT}/sources/jvxLibraries/jvx-automate/include)

set(LOCAL_SOURCES ${LOCAL_SOURCES}

${CMAKE_CURRENT_SOURCE_DIR}/../../shared/ayfbinrender-defines.h
${CMAKE_CURRENT_SOURCE_DIR}/../../shared/ayfbinrender-automation.h
${CMAKE_CURRENT_SOURCE_DIR}/../../shared/ayfbinrender-automation.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../../shared/ayfbinrender-automation-inputfiles.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../../shared/ayfbinrender-automation-outputfiles.cpp)

set(LOCAL_LIBS ${LOCAL_LIBS} jvx-automate_static)

else()

include_directories(${JVX_SUBPRODUCT_AYFBINRENDER_LIBS_BINARY_DIR}/sources/jvxComponents/jvxAutomation/ayfATBinRender/)
set(LOCAL_LIBS ${LOCAL_LIBS} ayfATBinRender_static)

endif()

if(JVX_AUTOMATION_VERBOSE)
set(LOCAL_COMPILE_DEFINITIONS "${LOCAL_COMPILE_DEFINITIONS};JVX_AUTOMATION_VERBOSE")
endif()

# Specify the max number of devices to be mixed during processing per technology. Here we can use inf
set(LOCAL_COMPILE_DEFINITIONS "${LOCAL_COMPILE_DEFINITIONS};JVX_NUMBER_AUDIO_DEVICES_MIX=JVX_SIZE_UNSELECTED")
##

if(AYFBINRENDER_WEBSERVER)
set(LOCAL_COMPILE_DEFINITIONS "${LOCAL_COMPILE_DEFINITIONS};AYFBINRENDER_WEBSERVER")
include_directories(
${JVX_BASE_BINARY_DIR}/sources/jvxComponents/jvxAppCtrNodes/jvxAppNWeb/
${JVX_BASE_BINARY_DIR}/sources/jvxTools/jvxTWebServer)
set(LOCAL_LIBS ${LOCAL_LIBS} jvxAppNWeb_static jvxTWebServer_static)

endif()

## ======================================================================
## The audio libs
# Pull in all audio components
include(${JVX_CMAKE_DIR}/packages/cmake-audio-components.cmake)
set(LOCAL_LIBS jvx-flutter-native-static_static)

## ======================================================================

Expand All @@ -115,7 +41,7 @@ set(BUILD_STATIC FALSE)
# are compiled to form a runtime
set(JVX_FORCE_RUNTIME_IMPORTLIB TRUE)

# This allows to copy import lib (.lib file) to sdk also
# This extends the previous option and allows to copy import lib (.lib file) to sdk also
set(JVX_SDK_FORCE_DEPLOY_IMPORT_STATIC_LIB TRUE)

include(${JVX_CMAKE_DIR}/common_local_lib_foot.cmake)
Expand Down
23 changes: 0 additions & 23 deletions sources/jvxLibraries/jvx-flutter-native-static/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,31 +70,8 @@ set(LOCAL_COMPILE_DEFINITIONS "${LOCAL_COMPILE_DEFINITIONS};JVX_HOST_USE_ONLY_ST
set(LOCAL_LIBS
jvx-lib-host-app-binary-static_static)

include_directories(
${JVX_SUBPRODUCT_BINARY_DIR}/sources/jvxComponents/jvxAudioTechnologies/jvxAuTPortAudio/
${JVX_SUBPRODUCT_BINARY_DIR}/sources/jvxComponents/jvxAudioTechnologies/jvxAuTAlsa/
${JVX_SUBPRODUCT_BINARY_DIR}/sources/jvxComponents/jvxAudioTechnologies/jvxAuTCoreAudio/
${JVX_BINARY_DIR}/base/sources/jvxComponents/jvxAudioTechnologies/jvxAuTAsio/
)

## ======================================================================
## The audio libs
if(JVX_USE_PART_PAUDIO)
set(LOCAL_COMPILE_DEFINITIONS "${LOCAL_COMPILE_DEFINITIONS};JVX_USE_PORTAUDIO")
set(LOCAL_LIBS ${LOCAL_LIBS} jvxAuTPortAudio_static)
endif()

if(JVX_USE_PART_ASIO)
set(LOCAL_LIBS ${LOCAL_LIBS} jvxAuTAsio_static)
endif()

if(JVX_USE_PART_COREAUDIO)
set(LOCAL_LIBS ${LOCAL_LIBS} jvxAuTCoreAudio_static ${COREAUDIO} ${COREFOUNDATION} ${AUDIOUNIT} ${COREAUDIOKIT} ${AUDIOTOOLBOX} ${CORESERVICES})
endif()

if(JVX_USE_PART_ALSA)
set(LOCAL_LIBS ${LOCAL_LIBS} jvxAuTAlsa_static asound)
endif()
## ======================================================================

set(BUILD_STATIC TRUE)
Expand Down

0 comments on commit 7de29b9

Please sign in to comment.