diff --git a/cmake/fragments/thrdparty-early.cmake b/cmake/fragments/thrdparty-early.cmake index 0df3edea..43d21a30 100644 --- a/cmake/fragments/thrdparty-early.cmake +++ b/cmake/fragments/thrdparty-early.cmake @@ -20,3 +20,4 @@ if(JVX_FLUTTER_UI) endif() endif() + diff --git a/sources/jvxLibraries/jvx-flutter-native-static/exports/linux/exports-flutter-native.def b/sources/jvxLibraries/jvx-flutter-native-static/exports/linux/exports-flutter-native.def new file mode 100644 index 00000000..3281ed80 --- /dev/null +++ b/sources/jvxLibraries/jvx-flutter-native-static/exports/linux/exports-flutter-native.def @@ -0,0 +1,102 @@ +ffi_allocate_backend_handle +ffi_deallocate_backend_handle + +ffi_host_initialize +ffi_host_terminate + +; ========================================================================== +ffi_req_command_decode_origin +ffi_req_command_decode_uid +ffi_req_command_decode_sswitch +ffi_req_command_decode_broadcast +ffi_req_command_decode_request_type +ffi_req_command_decode_ident_allocate_char_array +ffi_req_command_decode_sequencer_event + +; ========================================================================== +ffi_periodic_trigger + +; ========================================================================== +ffi_properties_request_handle +ffi_properties_return_handle +ffi_properties_number_properties +ffi_properties_descriptor_property_lin +ffi_properties_descriptor_property_descr +ffi_properties_string_to_array + +ffi_properties_get_string_list +ffi_properties_get_selection_list +ffi_properties_get_content_property_fld +ffi_properties_get_string +ffi_properties_get_value_in_range + +ffi_properties_set_content_property_fld +ffi_properties_set_selection_list +ffi_properties_set_single_string +ffi_properties_set_value_range + +ffi_properties_set_collect_start +ffi_properties_set_collect_stop + +; ========================================================================== +ffi_process_handle_for_uid +ffi_process_decode_iterator_context +ffi_process_iterator_next + +ffi_process_decode_iterator_component +ffi_process_decode_iterator_module +ffi_process_decode_iterator_connector + +ffi_process_system_ready + +; ========================================================================== +ffi_config_save + +; ========================================================================== + +ffi_sequencer_status +ffi_sequencer_start +ffi_sequencer_stop +ffi_sequencer_ack_stop +ffi_sequencer_trigger + +; ========================================================================== +ffi_component_description + +ffi_component_number_components +ffi_component_number_devices +ffi_component_capabilities_device +ffi_component_selection_option +ffi_component_slot_allocation + +ffi_select_component +ffi_activate_selected_component +ffi_deactivate_selected_component +ffi_unselect_selected_component + +; ========================================================================== +; ========================================================================== + +ffi_transfer_command + +ffi_translate_enum_string +ffi_lookup_component_class +ffi_get_compile_flags +ffi_set_operation_flags + +; ffi_get_native_config_parameters +; ffi_set_native_config_parameters + +ffi_encode_component_identification + +ffi_host_request_command_fwd +ffi_host_request_command_reschedule + +ffi_simple_call +ffi_host_delete + +ffi_last_error +ffi_preload_dll + +InitDartApiDL + diff --git a/sources/jvxLibraries/jvx-flutter-native-static/exports/linux/exports.def b/sources/jvxLibraries/jvx-flutter-native-static/exports/linux/exports.def deleted file mode 100644 index d4be7be8..00000000 --- a/sources/jvxLibraries/jvx-flutter-native-static/exports/linux/exports.def +++ /dev/null @@ -1,5 +0,0 @@ -ffi_allocate_backend_handle -ffi_deallocate_backend_handle -ffi_host_initialize -ffi_host_terminate - diff --git a/sources/jvxLibraries/jvx-flutter-native-static/src/flutter_native_boot_shutdown.cpp b/sources/jvxLibraries/jvx-flutter-native-static/src/flutter_native_boot_shutdown.cpp index 5c2fe6d4..d5f09438 100644 --- a/sources/jvxLibraries/jvx-flutter-native-static/src/flutter_native_boot_shutdown.cpp +++ b/sources/jvxLibraries/jvx-flutter-native-static/src/flutter_native_boot_shutdown.cpp @@ -211,7 +211,7 @@ int ffi_host_initialize(void* opaque_hdl, const char** argv, int argc, func_poin if (ll) { - std::string alternativePath = JVX_GET_CURRENT_MODULE_PATH(&ffi_host_initialize); // JVX_GET_MODULE_FILENAME((LPCSTR)&ffi_host_initialize); + std::string alternativePath = JVX_GET_CURRENT_MODULE_PATH((void*)&ffi_host_initialize); // JVX_GET_MODULE_FILENAME((LPCSTR)&ffi_host_initialize); if (!alternativePath.empty()) { if (argc >= 1) diff --git a/sources/jvxLibraries/third_party/git/orc/CMakeLists.txt b/sources/jvxLibraries/third_party/git/orc/CMakeLists.txt index 95b163a4..4005cb30 100644 --- a/sources/jvxLibraries/third_party/git/orc/CMakeLists.txt +++ b/sources/jvxLibraries/third_party/git/orc/CMakeLists.txt @@ -45,9 +45,6 @@ if(${JVX_OS} MATCHES "windows") endif() - add_library(orcImport STATIC IMPORTED GLOBAL) - set_property(TARGET orcImport PROPERTY IMPORTED_LOCATION "${ORC_LIBRARIES}") - elseif(${JVX_OS} MATCHES "linux") set(targetfolder orc) @@ -64,6 +61,10 @@ elseif(${JVX_OS} MATCHES "linux") set(ORC_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/orc/glnx/include/orc-0.4" CACHE INTERNAL "orc include directory") set(ORC_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/orc/glnx/lib/x86_64-linux-gnu/liborc-0.4.a" CACHE INTERNAL "orc libraries") set(ORCC "${CMAKE_SOURCE_DIR}/sources/jvxLibraries/third_party/git/orc/orc/glnx/bin/orcc" CACHE INTERNAL "orc compiler") + endif() +add_library(orcImport STATIC IMPORTED GLOBAL) +set_property(TARGET orcImport PROPERTY IMPORTED_LOCATION "${ORC_LIBRARIES}") + ## message(FATAL_ERROR "Stop here!") diff --git a/sources/jvxLibraries/third_party/web/flutter/CMakeLists.txt b/sources/jvxLibraries/third_party/web/flutter/CMakeLists.txt index a472bf74..71f30caa 100644 --- a/sources/jvxLibraries/third_party/web/flutter/CMakeLists.txt +++ b/sources/jvxLibraries/third_party/web/flutter/CMakeLists.txt @@ -2,11 +2,19 @@ set(PROJECT_NAME flutter) include(${JVX_CMAKE_DIR}/common_local_lib_head.cmake) set(JVX_FLUTTER_VERSION "3.7.4") + if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/flutter) message("flutter sub project not available. Starting script to download it.") message("Make sure you will add ${CMAKE_CURRENT_SOURCE_DIR}/flutter-${JVX_FLUTTER_VERSION}/bin to the PATH environment variable!") message("Make sure you will set FLUTTER_SDK_PATH=${CMAKE_CURRENT_SOURCE_DIR}/flutter-${JVX_FLUTTER_VERSION} in your compile script!") - execute_process(COMMAND ${mysh} -c "cd ${CMAKE_CURRENT_SOURCE_DIR} ; ./prepareModules-win.sh; exit") + if(${JVX_OS} MATCHES "windows") + execute_process(COMMAND ${mysh} -c "cd ${CMAKE_CURRENT_SOURCE_DIR} ; ./prepareModules-win.sh; exit") + elseif(${JVX_OS} MATCHES "linux") + execute_process(COMMAND ${mysh} -c "cd ${CMAKE_CURRENT_SOURCE_DIR} ; ./prepareModules-glnx.sh; exit") + else() + message(FATAL_ERROR "Flutter activated for platform ${JVX_OS} which is not supported yet.") + endif() message("flutter installation complete.") endif() +# message(FATAL_ERROR "Check flutter installation here!") diff --git a/sources/jvxLibraries/third_party/web/flutter/prepareModules-glnx.sh b/sources/jvxLibraries/third_party/web/flutter/prepareModules-glnx.sh new file mode 100755 index 00000000..cdbe6da7 --- /dev/null +++ b/sources/jvxLibraries/third_party/web/flutter/prepareModules-glnx.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +if [ ! -d "flutter-3.7.4" ]; then + + curl -kLSs https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.7.4-stable.tar.xz -o flutter.tar.xz + xz -d flutter.tar.xz + tar -xf flutter.tar + sleep 1 + mv flutter flutter-3.7.4 + rm flutter.tar +fi + +