diff options
Diffstat (limited to 'ports/fltk/findlibsfix.patch')
| -rw-r--r-- | ports/fltk/findlibsfix.patch | 60 |
1 files changed, 28 insertions, 32 deletions
diff --git a/ports/fltk/findlibsfix.patch b/ports/fltk/findlibsfix.patch index 6c2a7158a..80cfa7fa0 100644 --- a/ports/fltk/findlibsfix.patch +++ b/ports/fltk/findlibsfix.patch @@ -1,23 +1,21 @@ diff --git a/CMake/resources.cmake b/CMake/resources.cmake -index 37c0c08..b1f52d1 100644 +index 57173f2..149aa62 100644 --- a/CMake/resources.cmake +++ b/CMake/resources.cmake -@@ -26,10 +26,10 @@ find_file(HAVE_DLFCN_H dlfcn.h) - find_file(HAVE_FREETYPE_H freetype.h PATH_SUFFIXES freetype2 freetype2/freetype) - find_file(HAVE_GL_GL_H GL/gl.h) - find_file(HAVE_GL_GLU_H GL/glu.h) --find_file(HAVE_LIBPNG_PNG_H libpng/png.h) -+#find_file(HAVE_LIBPNG_PNG_H libpng/png.h) - find_file(HAVE_LOCALE_H locale.h) - find_file(HAVE_OPENGL_GLU_H OpenGL/glu.h) --find_file(HAVE_PNG_H png.h) -+#find_file(HAVE_PNG_H png.h) - find_file(HAVE_PTHREAD_H pthread.h) - find_file(HAVE_STDIO_H stdio.h) - find_file(HAVE_STRINGS_H strings.h) -@@ -38,6 +38,17 @@ find_file(HAVE_SYS_STDTYPES_H sys/stdtypes.h) - find_file(HAVE_X11_XREGION_H X11/Xregion.h) - find_path(HAVE_XDBE_H Xdbe.h PATH_SUFFIXES X11/extensions extensions) +@@ -52,10 +52,8 @@ include (FindPkgConfig) + fl_find_header (HAVE_ALSA_ASOUNDLIB_H alsa/asoundlib.h) + fl_find_header (HAVE_DLFCN_H dlfcn.h) + fl_find_header (HAVE_GL_GLU_H GL/glu.h) +-fl_find_header (HAVE_LIBPNG_PNG_H libpng/png.h) + fl_find_header (HAVE_LOCALE_H locale.h) + fl_find_header (HAVE_OPENGL_GLU_H OpenGL/glu.h) +-fl_find_header (HAVE_PNG_H png.h) + fl_find_header (HAVE_STDIO_H stdio.h) + fl_find_header (HAVE_STRINGS_H strings.h) + fl_find_header (HAVE_SYS_SELECT_H sys/select.h) +@@ -64,6 +62,17 @@ fl_find_header (HAVE_SYS_STDTYPES_H sys/stdtypes.h) + fl_find_header (HAVE_X11_XREGION_H "X11/Xlib.h;X11/Xregion.h") + fl_find_header (HAVE_XDBE_H "X11/Xlib.h;X11/extensions/Xdbe.h") +find_package(PNG REQUIRED) +if(PNG_FOUND) @@ -30,22 +28,20 @@ index 37c0c08..b1f52d1 100644 + set(LIB_zlib ${ZLIB_LIBRARIES}) +endif() + - if (MSVC) - message(STATUS "Note: The following three headers should all be found!") - message(STATUS "HAVE_GL_GL_H = '${HAVE_GL_GL_H}'") -@@ -92,12 +103,12 @@ find_library(LIB_freetype freetype) - find_library(LIB_GL GL) - find_library(LIB_MesaGL MesaGL) - find_library(LIB_jpeg jpeg) --find_library(LIB_png png) --find_library(LIB_zlib z) -+#find_library(LIB_png png) -+#find_library(LIB_zlib z) + if (WIN32 AND NOT CYGWIN) + # we don't use pthreads on Windows (except for Cygwin, see options.cmake) + set (HAVE_PTHREAD_H 0) +@@ -171,12 +180,10 @@ find_library (LIB_GL GL) + find_library (LIB_MesaGL MesaGL) + find_library (LIB_GLEW GLEW) + find_library (LIB_jpeg jpeg) +-find_library (LIB_png png) +-find_library (LIB_zlib z) - mark_as_advanced(LIB_CAIRO LIB_dl LIB_fontconfig LIB_freetype) - mark_as_advanced(LIB_GL LIB_MesaGL) --mark_as_advanced(LIB_jpeg LIB_png LIB_zlib) -+mark_as_advanced(LIB_jpeg) + mark_as_advanced (LIB_dl LIB_fontconfig LIB_freetype) + mark_as_advanced (LIB_GL LIB_MesaGL LIB_GLEW) +-mark_as_advanced (LIB_jpeg LIB_png LIB_zlib) ++mark_as_advanced (LIB_jpeg) ####################################################################### # functions |