Browse Source

Build fixes for modern versions of binutils.

Need to explicitly list DSOs.
tags/v1.4.90
Peter Åstrand (astrand) 9 years ago
parent
commit
c4bc5a8f0e
2 changed files with 5 additions and 2 deletions
  1. 3
    0
      CMakeLists.txt
  2. 2
    2
      cmake/StaticBuild.cmake

+ 3
- 0
CMakeLists.txt View File

@@ -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)

+ 2
- 2
cmake/StaticBuild.cmake View File

@@ -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()

Loading…
Cancel
Save