pyFLTK fix for Windows using System libraries.

ggarra13 · Apr 7, 2024 · 914eee3 · 914eee3
1 parent 1279b05
commit 914eee3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/cmake/Modules/BuildFLTK.cmake b/cmake/Modules/BuildFLTK.cmake
@@ -5,7 +5,8 @@
 include( ExternalProject )
 
 #set( FLTK_GIT_TAG master )
-set(FLTK_GIT_TAG 26f5b38a0113be817d13193387913580b5996d77) # Stable TAG
+#set(FLTK_GIT_TAG 26f5b38a0113be817d13193387913580b5996d77) # Previous stable TAG
+set(FLTK_GIT_TAG 31170c47314a8b71331dd7d63c898478edc98c84)
 
 set( FLTK_BUILD_SHARED_LIBS ON )  # We no longer compile static.
 

diff --git a/cmake/patches/pyFLTK-patch/setup.py b/cmake/patches/pyFLTK-patch/setup.py
@@ -75,7 +75,7 @@
     lib_dir_list = [fltk_lib_dir, opengl_lib_dir]
     win32_lib_list = ["kernel32", "user32", "gdi32", "winspool", "comdlg32", "Comctl32", "advapi32", "shell32", "ole32", "oleaut32", "uuid", "odbc32", "odbccp32", "wsock32", "gdiplus", "glu32", "opengl32"]
     static_lib_list = [ "fltk", "fltk_images", "fltk_forms", "fltk_gl", "opengl32", "fltk_jpeg", "fltk_png", "fltk_z"] + win32_lib_list
-    shared_lib_list = ["fltk_dll", "fltk_jpeg_dll", "fltk_png_dll", "fltk_z_dll"] + win32_lib_list
+    shared_lib_list = ["fltk_dll"] + win32_lib_list
     if doShared:
         def_list = def_list + [('FL_DLL', 1)]
         lib_list = shared_lib_list

diff --git a/mrv2/lib/mrvPanels/mrvPythonPanel.cpp b/mrv2/lib/mrvPanels/mrvPythonPanel.cpp
@@ -725,7 +725,15 @@ from mrv2 import playlist, timeline, usd, session, settings
                     std::string command =
                         string::Format(editor).arg(line).arg(file);
                     LOG_INFO(command);
-                    std::system(command.c_str());
+                    int ret = std::system(command.c_str());
+                    if (ret != 0)
+                    {
+                        const std::string msg =
+                            tl::string::Format(
+                                _("Could not open python editor: {0}"))
+                                .arg(command);
+                        LOG_ERROR(msg);
+                    }
                 }
             }
             catch (const std::regex_error& e)