Build fixes for modern versions of binutils.

Need to explicitly list DSOs.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3091d7b2bc6129abce2487a4db74432228be653a..5ecd89e4dcf558bba95ee004cd398273343c221f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,6 +226,9 @@ if(UNIX AND NOT APPLE)
   if(X11_Xcursor_FOUND)
     set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xcursor_LIB})
   endif()
+  if(X11_Xrender_FOUND)
+    set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xrender_LIB})
+  endif()
 endif()
 
 if(FLTK_FOUND)

diff --git a/cmake/StaticBuild.cmake b/cmake/StaticBuild.cmake
index 49706bd356bf4f689a22d4b711501945b50bedde..1ac4f6e3b1236fa765b11f44f4e16369499e1909 100644 (file)
--- a/cmake/StaticBuild.cmake
+++ b/cmake/StaticBuild.cmake
@@ -75,12 +75,12 @@ if(BUILD_STATIC)
     elseif(APPLE)
       set(FLTK_LIBRARIES "${FLTK_LIBRARIES} -framework Cocoa")
     else()
-      set(FLTK_LIBRARIES "${FLTK_LIBRARIES} -lm")
+      set(FLTK_LIBRARIES "${FLTK_LIBRARIES} -lm -ldl")
     endif()
 
     if(X11_FOUND AND NOT APPLE)
       if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-        set(FLTK_LIBRARIES "${FLTK_LIBRARIES} ${X11_Xcursor_LIB} ${X11_Xfixes_LIB} -Wl,-Bstatic -lXft -Wl,-Bdynamic -lfontconfig -lXext -R/usr/sfw/lib")
+        set(FLTK_LIBRARIES "${FLTK_LIBRARIES} ${X11_Xcursor_LIB} ${X11_Xfixes_LIB} -Wl,-Bstatic -lXft -Wl,-Bdynamic -lfontconfig -lXrender -lXext -R/usr/sfw/lib -L=/usr/sfw/lib -lfreetype -lsocket -lnsl")
       else()
         set(FLTK_LIBRARIES "${FLTK_LIBRARIES} -Wl,-Bstatic -lXcursor -lXfixes -lXft -lfontconfig -lexpat -lfreetype -lbz2 -lXrender -lXext -lXinerama -Wl,-Bdynamic")
       endif()