From 8d080254a1ba9300a12e2d546b33acfe6daa3e2e Mon Sep 17 00:00:00 2001 From: Anjal Doshi Date: Mon, 14 Oct 2024 14:49:09 -0700 Subject: [PATCH] Disable `JUCE_WEB_BROWSER` --- CMakeLists.txt | 19 +++++-------------- JuceLibraryCode/AppConfig.h | 2 +- .../Scripts/install_linux_dependencies.sh | 2 +- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 327a9ce212..f4c047040f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -213,22 +213,15 @@ elseif(LINUX) find_package(CURL REQUIRED) find_package(PkgConfig REQUIRED) find_package(Fontconfig REQUIRED) - - pkg_check_modules(WEBKIT2GTK QUIET webkit2gtk-4.0) - if (NOT WEBKIT2GTK_FOUND) - message(STATUS "webkit2gtk-4.0 not found. Looking for webkit2gtk-4.1...") - pkg_check_modules(WEBKIT2GTK REQUIRED webkit2gtk-4.1) - endif() # pkg_check_modules(GTK REQUIRED gtk+-3.0) target_include_directories(open-ephys PRIVATE /usr/include /usr/include/freetype2 - ${CURL_INCLUDE_DIRS} - ${WEBKIT2GTK_INCLUDE_DIRS} - ) - target_link_libraries(open-ephys GL X11 Xext Xinerama asound dl freetype pthread rt ${Fontconfig_LIBRARIES} ${CURL_LIBRARIES} ${WEBKIT2GTK_LIBRARIES}) + ${CURL_INCLUDE_DIRS}) + + target_link_libraries(open-ephys GL X11 Xext Xinerama asound dl freetype pthread rt ${Fontconfig_LIBRARIES} ${CURL_LIBRARIES}) set_property(TARGET open-ephys APPEND_STRING PROPERTY LINK_FLAGS "-fvisibility=hidden -fPIC -rdynamic -Wl,-rpath,'$ORIGIN/shared'") @@ -238,10 +231,8 @@ elseif(LINUX) target_include_directories(gui_testable_source PRIVATE /usr/include /usr/include/freetype2 - ${CURL_INCLUDE_DIRS} - ${WEBKIT2GTK_INCLUDE_DIRS} - ) - target_link_libraries(gui_testable_source GL X11 Xext Xinerama asound dl freetype pthread rt ${Fontconfig_LIBRARIES} ${CURL_LIBRARIES} ${WEBKIT2GTK_LIBRARIES}) + ${CURL_INCLUDE_DIRS}) + target_link_libraries(gui_testable_source GL X11 Xext Xinerama asound dl freetype pthread rt ${Fontconfig_LIBRARIES} ${CURL_LIBRARIES}) set_property(TARGET gui_testable_source APPEND_STRING PROPERTY LINK_FLAGS "-fvisibility=hidden -fPIC -rdynamic -Wl,-rpath,'$ORIGIN/shared'") diff --git a/JuceLibraryCode/AppConfig.h b/JuceLibraryCode/AppConfig.h index 8f71659c7a..1e6164d7c3 100644 --- a/JuceLibraryCode/AppConfig.h +++ b/JuceLibraryCode/AppConfig.h @@ -273,7 +273,7 @@ // juce_gui_extra flags: #ifndef JUCE_WEB_BROWSER - //#define JUCE_WEB_BROWSER 1 + #define JUCE_WEB_BROWSER 0 #endif #ifndef JUCE_USE_WIN_WEBVIEW2 diff --git a/Resources/Scripts/install_linux_dependencies.sh b/Resources/Scripts/install_linux_dependencies.sh index 3944aac364..604403b8f8 100755 --- a/Resources/Scripts/install_linux_dependencies.sh +++ b/Resources/Scripts/install_linux_dependencies.sh @@ -8,4 +8,4 @@ apt-get -y install build-essential # install Juce dependencies -apt-get -y install freeglut3-dev libfreetype6-dev libxinerama-dev libxcursor-dev libasound2-dev libxrandr-dev libcurl4-openssl-dev libwebkit2gtk-4.0-dev +apt-get -y install freeglut3-dev libfreetype*-dev libxinerama-dev libxcursor-dev libasound2-dev libxrandr-dev libcurl4-openssl-dev \ No newline at end of file