From 9386cd3336841782aedf12a5f2da7d0606778c05 Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Sun, 11 Oct 2020 21:12:59 +0200 Subject: [PATCH 1/3] Implement the file drag and drop for X11 --- editor/cmake/Vstgui.cmake | 5 +++++ editor/external/vstgui4 | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/editor/cmake/Vstgui.cmake b/editor/cmake/Vstgui.cmake index 06031d80..b8dcdf08 100644 --- a/editor/cmake/Vstgui.cmake +++ b/editor/cmake/Vstgui.cmake @@ -55,6 +55,7 @@ add_library(sfizz-vstgui STATIC EXCLUDE_FROM_ALL "${VSTGUI_BASEDIR}/vstgui/lib/cvstguitimer.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/genericstringlistdatabrowsersource.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/common/genericoptionmenu.cpp" + "${VSTGUI_BASEDIR}/vstgui/lib/platform/platformfactory.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/vstguidebug.cpp") if(WIN32) @@ -71,6 +72,7 @@ if(WIN32) "${VSTGUI_BASEDIR}/vstgui/lib/platform/win32/win32optionmenu.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/win32/win32support.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/win32/win32textedit.cpp" + "${VSTGUI_BASEDIR}/vstgui/lib/platform/win32/win32factory.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/win32/winfileselector.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/win32/winstring.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/win32/wintimer.cpp") @@ -94,6 +96,7 @@ elseif(APPLE) "${VSTGUI_BASEDIR}/vstgui/lib/platform/mac/cocoa/nsviewframe.mm" "${VSTGUI_BASEDIR}/vstgui/lib/platform/mac/cocoa/nsviewoptionmenu.mm" "${VSTGUI_BASEDIR}/vstgui/lib/platform/mac/macclipboard.mm" + "${VSTGUI_BASEDIR}/vstgui/lib/platform/mac/macfactory.mm" "${VSTGUI_BASEDIR}/vstgui/lib/platform/mac/macfileselector.mm" "${VSTGUI_BASEDIR}/vstgui/lib/platform/mac/macglobals.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/mac/macstring.mm" @@ -108,7 +111,9 @@ else() "${VSTGUI_BASEDIR}/vstgui/lib/platform/linux/cairofont.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/linux/cairogradient.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/linux/cairopath.cpp" + "${VSTGUI_BASEDIR}/vstgui/lib/platform/linux/linuxfactory.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/linux/linuxstring.cpp" + "${VSTGUI_BASEDIR}/vstgui/lib/platform/linux/x11dragging.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/linux/x11fileselector.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/linux/x11frame.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/linux/x11platform.cpp" diff --git a/editor/external/vstgui4 b/editor/external/vstgui4 index dbb9a427..055cbcc9 160000 --- a/editor/external/vstgui4 +++ b/editor/external/vstgui4 @@ -1 +1 @@ -Subproject commit dbb9a42742eb42826f2fe15bd047bae0adb13b58 +Subproject commit 055cbcc9ae858f0b07d5d86c205a1111e2fba7a4 From ecc223947c8bbb485c755c7e2dae3c0abb97fb9a Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Sun, 11 Oct 2020 21:33:26 +0200 Subject: [PATCH 2/3] Link Vstgui to Glib on X11 --- editor/cmake/Vstgui.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/editor/cmake/Vstgui.cmake b/editor/cmake/Vstgui.cmake index b8dcdf08..022e4da5 100644 --- a/editor/cmake/Vstgui.cmake +++ b/editor/cmake/Vstgui.cmake @@ -165,6 +165,7 @@ else() pkg_check_modules(LIBXKB_COMMON_X11 REQUIRED xkbcommon-x11) pkg_check_modules(CAIRO REQUIRED cairo) pkg_check_modules(FONTCONFIG REQUIRED fontconfig) + pkg_check_modules(GLIB REQUIRED glib-2.0) target_include_directories(sfizz-vstgui PRIVATE ${X11_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} @@ -176,7 +177,8 @@ else() ${LIBXKB_COMMON_INCLUDE_DIRS} ${LIBXKB_COMMON_X11_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS} - ${FONTCONFIG_INCLUDE_DIRS}) + ${FONTCONFIG_INCLUDE_DIRS} + ${GLIB_INCLUDE_DIRS}) target_link_libraries(sfizz-vstgui PRIVATE ${X11_LIBRARIES} ${FREETYPE_LIBRARIES} @@ -188,7 +190,8 @@ else() ${LIBXKB_COMMON_LIBRARIES} ${LIBXKB_COMMON_X11_LIBRARIES} ${CAIRO_LIBRARIES} - ${FONTCONFIG_LIBRARIES}) + ${FONTCONFIG_LIBRARIES} + ${GLIB_LIBRARIES}) find_library(DL_LIBRARY "dl") if(DL_LIBRARY) target_link_libraries(sfizz-vstgui PRIVATE "${DL_LIBRARY}") From 54b24f7cd1804ce3a4c1eec4ad5b48620e7b7f12 Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Sun, 11 Oct 2020 21:38:31 +0200 Subject: [PATCH 3/3] Update the Vstgui source list (win32) --- editor/cmake/Vstgui.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/editor/cmake/Vstgui.cmake b/editor/cmake/Vstgui.cmake index 022e4da5..4e37f19c 100644 --- a/editor/cmake/Vstgui.cmake +++ b/editor/cmake/Vstgui.cmake @@ -71,6 +71,7 @@ if(WIN32) "${VSTGUI_BASEDIR}/vstgui/lib/platform/win32/win32openglview.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/win32/win32optionmenu.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/win32/win32support.cpp" + "${VSTGUI_BASEDIR}/vstgui/lib/platform/win32/win32resourcestream.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/win32/win32textedit.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/win32/win32factory.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/win32/winfileselector.cpp"