Update to 1.3.8

3 files changed, 26 insertions, 404 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3e5c6e9a5ec3..4cae3a4ca66b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,23 @@
 pkgbase = lib32-fltk
 	pkgdesc = Graphical user interface toolkit for X (32-bit)
-	pkgver = 1.3.5
+	pkgver = 1.3.8
 	pkgrel = 1
 	url = https://www.fltk.org
 	arch = x86_64
-	license = custom:LGPL
+	license = custom:FLTK
 	makedepends = cmake
 	makedepends = lib32-alsa-lib
 	makedepends = libxft
 	depends = fltk
 	depends = lib32-glu
 	depends = lib32-libjpeg-turbo
+	depends = lib32-libpng
 	depends = lib32-libxcursor
 	depends = lib32-libxinerama
 	depends = lib32-libxft
 	options = staticlibs
-	source = fltk-1.3.5.tar.gz::https://github.com/fltk/fltk/archive/release-1.3.5.tar.gz
-	source = fltk-fix-lib-mess.patch
-	sha512sums = 35732df4d66573fdabf95f57069c5a2df63b0029d7b904d4ac02bd4c3ab3e5b287d4f06998b67129e8195c42c0b39e137e5d4f10baf4d73992077bb5ae0bef6c
-	sha512sums = 14592ba5616483df1b36f6e2b8309a3d1e898c5c4dcf0ddfbb374bbd1332eca6ba3490569fc8f903023a069b7771ed06baddef36140253e2e81eb409892bbba5
+	source = fltk-1.3.8.tar.gz::https://github.com/fltk/fltk/archive/release-1.3.8.tar.gz
+	sha512sums = 197848d3b80a65cca936daf4f0b74609f0fe8332a4cd11af53385fb2aa45ad698b1e239a48732b118cd3cb189bc531711b72fb2eeeb85be887dc6c5a558fa4b3
 
 pkgname = lib32-fltk
 
diff --git a/PKGBUILD b/PKGBUILD
index f5ccd1a39cf6..70bf69d7f969 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,48 +3,46 @@
 # Contributor: genesis66
 
 pkgname=lib32-fltk
-pkgver=1.3.5
+pkgver=1.3.8
 pkgrel=1
 pkgdesc="Graphical user interface toolkit for X (32-bit)"
 arch=('x86_64')
 url="https://www.fltk.org"
-license=('custom:LGPL')
-depends=("${pkgname#lib32-}" 'lib32-glu' 'lib32-libjpeg-turbo' 'lib32-libxcursor' 'lib32-libxinerama' 'lib32-libxft')
+license=(custom:FLTK)
+depends=("${pkgname#lib32-}" 'lib32-glu' 'lib32-libjpeg-turbo' 'lib32-libpng' 'lib32-libxcursor' 'lib32-libxinerama' 'lib32-libxft')
 makedepends=('cmake' 'lib32-alsa-lib' 'libxft')
 options=('staticlibs')
-source=("${pkgname#lib32-}-${pkgver}.tar.gz::https://github.com/fltk/fltk/archive/release-${pkgver}.tar.gz"
-        "${pkgname#lib32-}-fix-lib-mess.patch")
-sha512sums=('35732df4d66573fdabf95f57069c5a2df63b0029d7b904d4ac02bd4c3ab3e5b287d4f06998b67129e8195c42c0b39e137e5d4f10baf4d73992077bb5ae0bef6c'
-            '14592ba5616483df1b36f6e2b8309a3d1e898c5c4dcf0ddfbb374bbd1332eca6ba3490569fc8f903023a069b7771ed06baddef36140253e2e81eb409892bbba5')
+source=("${pkgname#lib32-}-${pkgver}.tar.gz::https://github.com/fltk/fltk/archive/release-${pkgver}.tar.gz")
+sha512sums=('197848d3b80a65cca936daf4f0b74609f0fe8332a4cd11af53385fb2aa45ad698b1e239a48732b118cd3cb189bc531711b72fb2eeeb85be887dc6c5a558fa4b3')
 
-prepare() {
-  mv -v "${pkgname#lib32-}-release-${pkgver}" "${pkgname#lib32-}-${pkgver}"
-  cd "${pkgname#lib32-}-${pkgver}"
-  # fix bizarre renaming of shared libraries
-  # https://github.com/fltk/fltk/issues/20
-  patch -Np1 -i ../${pkgname#lib32-}-fix-lib-mess.patch
-  mkdir -v build
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+    d="$srcdir/$p/${f#$pkgdir/}"
+    mkdir -p "$(dirname "$d")"
+    mv "$f" "$d"
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
 }
 
 build() {
   # Modify environment to generate 32-bit ELF. Respects flags defined in makepkg.conf
-  export CC='gcc -m32'
-  export CXX='g++ -m32'
+  export CFLAGS="-m32 -ffat-lto-objects ${CFLAGS}"
+  export CXXFLAGS="-m32 -ffat-lto-objects ${CXXFLAGS}"
   export LDFLAGS="-m32 ${LDFLAGS}"
-  export PKG_CONFIG_LIBDIR='/usr/lib32/pkgconfig'
+  export PKG_CONFIG_LIBDIR="/usr/lib32/pkgconfig"
 
-  cd "${pkgname#lib32-}-${pkgver}/build"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
         -DFLTK_LIBDIR=/usr/lib32 \
         -DOPTION_CREATE_LINKS=ON \
         -DOPTION_BUILD_SHARED_LIBS=ON \
-        ..
-  make VERBOSE=1
+        -B build \
+        -S "${pkgname#lib32-}-release-${pkgver}"
+  make VERBOSE=1 -C build
 }
 
 package() {
-  cd "${pkgname#lib32-}-${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
+  make VERBOSE=1 DESTDIR="${pkgdir}/" install -C build
   rm -rf "${pkgdir}/usr/"{bin,include,share}
-  install -vDm 644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -vDm 644 "${pkgname#lib32-}-release-${pkgver}/"COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"LICENSE
 }
diff --git a/fltk-fix-lib-mess.patch b/fltk-fix-lib-mess.patch
deleted file mode 100644
index 62f2645b6ac6..000000000000
--- a/fltk-fix-lib-mess.patch
+++ /dev/null
@@ -1,375 +0,0 @@
-diff -ruN b/CMake/macros.cmake a/CMake/macros.cmake
---- b/CMake/macros.cmake	2019-03-03 09:40:23.000000000 +0100
-+++ a/CMake/macros.cmake	2019-03-10 21:58:32.895224605 +0100
-@@ -22,11 +22,7 @@
- #######################################################################
- macro(FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
- 
--    if (${LIBTYPE} STREQUAL "SHARED")
--        set (LIBRARY_NAME ${LIBNAME}_SHARED)
--    else ()
--        set (LIBRARY_NAME ${LIBNAME})
--    endif (${LIBTYPE} STREQUAL "SHARED")
-+    set (LIBRARY_NAME ${LIBNAME}_${LIBTYPE})
- 
-     if (MSVC)
- 	set (LIBRARY_NAME_DEBUG "${LIBRARY_NAME}d")
-@@ -38,7 +34,7 @@
- 
-     set_target_properties(${LIBRARY_NAME}
-         PROPERTIES
--        OUTPUT_NAME ${LIBRARY_NAME}
-+        OUTPUT_NAME ${LIBNAME}
-         DEBUG_OUTPUT_NAME ${LIBRARY_NAME_DEBUG}
-         CLEAN_DIRECT_OUTPUT TRUE
-         COMPILE_DEFINITIONS "FL_LIBRARY"
-@@ -47,6 +43,7 @@
-     if (${LIBTYPE} STREQUAL "SHARED")
- 	set_target_properties(${LIBRARY_NAME}
- 	    PROPERTIES
-+      OUTPUT_NAME ${LIBNAME}
- 	    VERSION ${FLTK_VERSION_FULL}
- 	    SOVERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}
- 	    PREFIX "lib"    # for MSVC static/shared coexistence
-diff -ruN b/documentation/CMakeLists.txt a/documentation/CMakeLists.txt
---- b/documentation/CMakeLists.txt	2019-03-03 09:40:23.000000000 +0100
-+++ a/documentation/CMakeLists.txt	2019-03-10 22:40:51.077135317 +0100
-@@ -45,7 +45,7 @@
- 	${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
- 	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- 	COMMENT "Generating HTML documentation" VERBATIM
--	DEPENDS fltk
-+  DEPENDS fltk_STATIC
- 	)
- 
- endif(OPTION_BUILD_HTML_DOCUMENTATION)
-@@ -92,7 +92,7 @@
- 	COMMAND cp -f latex/refman.pdf fltk.pdf
- 	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- 	COMMENT "Generating PDF documentation" VERBATIM
--	DEPENDS fltk
-+  DEPENDS fltk_STATIC
- 	)
- 
-     # add target 'pdf'
-diff -ruN b/fluid/CMakeLists.txt a/fluid/CMakeLists.txt
---- b/fluid/CMakeLists.txt	2019-03-03 09:40:23.000000000 +0100
-+++ a/fluid/CMakeLists.txt	2019-03-10 22:09:52.482801651 +0100
-@@ -48,7 +48,7 @@
-     add_executable(fluid WIN32 ${CPPFILES})
- endif(APPLE AND NOT OPTION_APPLE_X11)
- 
--target_link_libraries(fluid fltk fltk_images fltk_forms)
-+target_link_libraries(fluid fltk_STATIC fltk_images_STATIC fltk_forms_STATIC)
- 
- # install fluid
- 
-diff -ruN b/src/CMakeLists.txt a/src/CMakeLists.txt
---- b/src/CMakeLists.txt	2019-03-03 09:40:23.000000000 +0100
-+++ a/src/CMakeLists.txt	2019-03-10 22:57:37.458302812 +0100
-@@ -246,7 +246,7 @@
- endif (WIN32)
- 
- if (FLTK_HAVE_CAIRO)
--    list(APPEND OPTIONAL_LIBS fltk_cairo ${PKG_CAIRO_LIBRARIES})
-+  list(APPEND OPTIONAL_LIBS fltk_cairo_STATIC ${PKG_CAIRO_LIBRARIES})
- ENDif (FLTK_HAVE_CAIRO)
- 
- if (HAVE_XINERAMA)
-@@ -275,41 +275,41 @@
- #######################################################################
- 
- FL_ADD_LIBRARY(fltk STATIC "${STATIC_FILES}")
--target_link_libraries(fltk ${OPTIONAL_LIBS})
-+target_link_libraries(fltk_STATIC ${OPTIONAL_LIBS})
- 
- #######################################################################
- 
- FL_ADD_LIBRARY(fltk_forms STATIC "${FLCPPFILES}")
--target_link_libraries(fltk_forms fltk)
-+target_link_libraries(fltk_forms_STATIC fltk_STATIC)
- 
- #######################################################################
- 
- FL_ADD_LIBRARY(fltk_images STATIC "${IMGCPPFILES}")
--target_link_libraries(fltk_images fltk)
-+target_link_libraries(fltk_images_STATIC fltk_STATIC)
- 
- if (OPTION_USE_SYSTEM_LIBJPEG)
--    target_link_libraries(fltk_images ${FLTK_JPEG_LIBRARIES})
-+  target_link_libraries(fltk_images_STATIC ${FLTK_JPEG_LIBRARIES})
- else()
--    target_link_libraries(fltk_images fltk_jpeg)
-+  target_link_libraries(fltk_images_STATIC fltk_jpeg_STATIC)
- endif (OPTION_USE_SYSTEM_LIBJPEG)
- 
- if (OPTION_USE_SYSTEM_ZLIB)
--    target_link_libraries(fltk_images ${FLTK_ZLIB_LIBRARIES})
-+  target_link_libraries(fltk_images_STATIC ${FLTK_ZLIB_LIBRARIES})
- else()
--    target_link_libraries(fltk_images fltk_z)
-+  target_link_libraries(fltk_images_STATIC fltk_z_STATIC)
- endif (OPTION_USE_SYSTEM_ZLIB)
- 
- if (OPTION_USE_SYSTEM_LIBPNG)
--    target_link_libraries(fltk_images ${FLTK_PNG_LIBRARIES})
-+  target_link_libraries(fltk_images_STATIC ${FLTK_PNG_LIBRARIES})
- else()
--    target_link_libraries(fltk_images fltk_png)
-+  target_link_libraries(fltk_images_STATIC fltk_png_STATIC)
- endif (OPTION_USE_SYSTEM_LIBPNG)
- 
- #######################################################################
- 
- if (OPENGL_FOUND)
-    FL_ADD_LIBRARY(fltk_gl STATIC "${GLCPPFILES}")
--   target_link_libraries(fltk_gl fltk ${OPENGL_LIBRARIES})
-+   target_link_libraries(fltk_gl_STATIC fltk_STATIC ${OPENGL_LIBRARIES})
- endif (OPENGL_FOUND)
- 
- #######################################################################
-@@ -332,7 +332,7 @@
- 
-     FL_ADD_LIBRARY(fltk_forms SHARED "${FLCPPFILES}")
-     if (MSVC)
--      target_link_libraries(fltk_forms_SHARED fltk)
-+      target_link_libraries(fltk_forms_SHARED fltk_SHARED)
-     else ()
-       target_link_libraries(fltk_forms_SHARED fltk_SHARED)
-     endif (MSVC)
-@@ -341,27 +341,27 @@
- 
-     FL_ADD_LIBRARY(fltk_images SHARED "${IMGCPPFILES}")
-     if (MSVC)
--      target_link_libraries(fltk_images_SHARED fltk)
-+      target_link_libraries(fltk_images_SHARED fltk_SHARED)
-     else ()
-       target_link_libraries(fltk_images_SHARED fltk_SHARED)
-     endif (MSVC)
- 
-     if (OPTION_USE_SYSTEM_LIBJPEG)
--	target_link_libraries(fltk_images_SHARED ${FLTK_JPEG_LIBRARIES})
-+      target_link_libraries(fltk_images_SHARED ${FLTK_JPEG_LIBRARIES})
-     else()
--	target_link_libraries(fltk_images_SHARED fltk_jpeg_SHARED)
-+      target_link_libraries(fltk_images_SHARED fltk_jpeg_SHARED)
-     endif (OPTION_USE_SYSTEM_LIBJPEG)
- 
-     if (OPTION_USE_SYSTEM_LIBPNG)
--	target_link_libraries(fltk_images_SHARED ${FLTK_PNG_LIBRARIES})
-+      target_link_libraries(fltk_images_SHARED ${FLTK_PNG_LIBRARIES})
-     else()
--	target_link_libraries(fltk_images_SHARED fltk_png_SHARED)
-+      target_link_libraries(fltk_images_SHARED fltk_png_SHARED)
-     endif (OPTION_USE_SYSTEM_LIBPNG)
- 
-     if (OPTION_USE_SYSTEM_ZLIB)
--	target_link_libraries(fltk_images_SHARED ${FLTK_ZLIB_LIBRARIES})
-+      target_link_libraries(fltk_images_SHARED ${FLTK_ZLIB_LIBRARIES})
-     else()
--	target_link_libraries(fltk_images_SHARED fltk_z_SHARED)
-+      target_link_libraries(fltk_images_SHARED fltk_z_SHARED)
-     endif (OPTION_USE_SYSTEM_ZLIB)
- 
-     ###################################################################
-@@ -369,9 +369,9 @@
-     if (OPENGL_FOUND)
-       FL_ADD_LIBRARY(fltk_gl SHARED "${GLCPPFILES}")
-       if (MSVC)
--	target_link_libraries(fltk_gl_SHARED fltk ${OPENGL_LIBRARIES})
-+        target_link_libraries(fltk_gl_SHARED fltk_SHARED ${OPENGL_LIBRARIES})
-       else ()
--	target_link_libraries(fltk_gl_SHARED fltk_SHARED ${OPENGL_LIBRARIES})
-+        target_link_libraries(fltk_gl_SHARED fltk_SHARED ${OPENGL_LIBRARIES})
-       endif (MSVC)
-     endif (OPENGL_FOUND)
- 
-diff -ruN b/test/CMakeLists.txt a/test/CMakeLists.txt
---- b/test/CMakeLists.txt	2019-03-03 09:40:23.000000000 +0100
-+++ a/test/CMakeLists.txt	2019-03-10 23:13:36.096519270 +0100
-@@ -25,108 +25,108 @@
- endif(APPLE AND NOT OPTION_APPLE_X11)
- 
- #######################################################################
--CREATE_EXAMPLE(adjuster adjuster.cxx fltk)
--CREATE_EXAMPLE(arc arc.cxx fltk)
--CREATE_EXAMPLE(animated animated.cxx fltk)
--CREATE_EXAMPLE(ask ask.cxx fltk)
--CREATE_EXAMPLE(bitmap bitmap.cxx fltk)
-+CREATE_EXAMPLE(adjuster adjuster.cxx fltk_STATIC)
-+CREATE_EXAMPLE(arc arc.cxx fltk_STATIC)
-+CREATE_EXAMPLE(animated animated.cxx fltk_STATIC)
-+CREATE_EXAMPLE(ask ask.cxx fltk_STATIC)
-+CREATE_EXAMPLE(bitmap bitmap.cxx fltk_STATIC)
- 
- set(BLOCKS_ICON "${CMAKE_CURRENT_SOURCE_DIR}/blocks.app/Contents/Resources/blocks.icns")
--CREATE_EXAMPLE(blocks "blocks.cxx;${BLOCKS_ICON}" "fltk;${AUDIOLIBS}")
-+CREATE_EXAMPLE(blocks "blocks.cxx;${BLOCKS_ICON}" "fltk_STATIC;${AUDIOLIBS}")
- 
--CREATE_EXAMPLE(boxtype boxtype.cxx fltk)
--CREATE_EXAMPLE(browser browser.cxx fltk)
--CREATE_EXAMPLE(button button.cxx fltk)
--CREATE_EXAMPLE(buttons buttons.cxx fltk)
-+CREATE_EXAMPLE(boxtype boxtype.cxx fltk_STATIC)
-+CREATE_EXAMPLE(browser browser.cxx fltk_STATIC)
-+CREATE_EXAMPLE(button button.cxx fltk_STATIC)
-+CREATE_EXAMPLE(buttons buttons.cxx fltk_STATIC)
- 
- set(CHECKERS_ICON "${CMAKE_CURRENT_SOURCE_DIR}/checkers.app/Contents/Resources/checkers.icns")
--CREATE_EXAMPLE(checkers "checkers.cxx;${CHECKERS_ICON}" fltk)
-+CREATE_EXAMPLE(checkers "checkers.cxx;${CHECKERS_ICON}" fltk_STATIC)
- 
--CREATE_EXAMPLE(clock clock.cxx fltk)
--CREATE_EXAMPLE(colbrowser colbrowser.cxx "fltk;fltk_forms")
--CREATE_EXAMPLE(color_chooser color_chooser.cxx fltk)
--CREATE_EXAMPLE(cursor cursor.cxx fltk)
--CREATE_EXAMPLE(curve curve.cxx fltk)
-+CREATE_EXAMPLE(clock clock.cxx fltk_STATIC)
-+CREATE_EXAMPLE(colbrowser colbrowser.cxx "fltk_STATIC;fltk_forms_STATIC")
-+CREATE_EXAMPLE(color_chooser color_chooser.cxx fltk_STATIC)
-+CREATE_EXAMPLE(cursor cursor.cxx fltk_STATIC)
-+CREATE_EXAMPLE(curve curve.cxx fltk_STATIC)
- 
--CREATE_EXAMPLE(demo "demo.cxx;demo.menu" fltk)
-+CREATE_EXAMPLE(demo "demo.cxx;demo.menu" fltk_STATIC)
- set_source_files_properties(demo.menu PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
- 
--CREATE_EXAMPLE(device device.cxx fltk)
--CREATE_EXAMPLE(doublebuffer doublebuffer.cxx fltk)
-+CREATE_EXAMPLE(device device.cxx fltk_STATIC)
-+CREATE_EXAMPLE(doublebuffer doublebuffer.cxx fltk_STATIC)
- 
--CREATE_EXAMPLE(editor editor.cxx fltk)
-+CREATE_EXAMPLE(editor editor.cxx fltk_STATIC)
- set_target_properties(editor PROPERTIES
-     MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/ide/Xcode4/plists/editor-Info.plist"
-     )
- 
--CREATE_EXAMPLE(fast_slow fast_slow.fl fltk)
--CREATE_EXAMPLE(file_chooser file_chooser.cxx "fltk;fltk_images")
--CREATE_EXAMPLE(fonts fonts.cxx fltk)
--CREATE_EXAMPLE(forms forms.cxx "fltk;fltk_forms")
--CREATE_EXAMPLE(hello hello.cxx fltk)
--CREATE_EXAMPLE(help help.cxx "fltk;fltk_images")
--CREATE_EXAMPLE(icon icon.cxx fltk)
--CREATE_EXAMPLE(iconize iconize.cxx fltk)
--CREATE_EXAMPLE(image image.cxx fltk)
--CREATE_EXAMPLE(inactive inactive.fl fltk)
--CREATE_EXAMPLE(input input.cxx fltk)
--CREATE_EXAMPLE(input_choice input_choice.cxx fltk)
--CREATE_EXAMPLE(keyboard "keyboard.cxx;keyboard_ui.fl" fltk)
--CREATE_EXAMPLE(label label.cxx "fltk;fltk_forms")
--CREATE_EXAMPLE(line_style line_style.cxx fltk)
--CREATE_EXAMPLE(list_visuals list_visuals.cxx fltk)
--CREATE_EXAMPLE(mandelbrot "mandelbrot_ui.fl;mandelbrot.cxx" fltk)
--CREATE_EXAMPLE(menubar menubar.cxx fltk)
--CREATE_EXAMPLE(message message.cxx fltk)
--CREATE_EXAMPLE(minimum minimum.cxx fltk)
--CREATE_EXAMPLE(native-filechooser native-filechooser.cxx "fltk;fltk_images")
--CREATE_EXAMPLE(navigation navigation.cxx fltk)
--CREATE_EXAMPLE(output output.cxx "fltk;fltk_forms")
--CREATE_EXAMPLE(overlay overlay.cxx fltk)
--CREATE_EXAMPLE(pack pack.cxx fltk)
--CREATE_EXAMPLE(pixmap pixmap.cxx fltk)
--CREATE_EXAMPLE(pixmap_browser pixmap_browser.cxx "fltk;fltk_images")
--CREATE_EXAMPLE(preferences preferences.fl fltk)
--CREATE_EXAMPLE(offscreen offscreen.cxx fltk)
--CREATE_EXAMPLE(radio radio.fl fltk)
--CREATE_EXAMPLE(resize resize.fl fltk)
--CREATE_EXAMPLE(resizebox resizebox.cxx fltk)
--CREATE_EXAMPLE(rotated_text rotated_text.cxx fltk)
--CREATE_EXAMPLE(scroll scroll.cxx fltk)
--CREATE_EXAMPLE(subwindow subwindow.cxx fltk)
-+CREATE_EXAMPLE(fast_slow fast_slow.fl fltk_STATIC)
-+CREATE_EXAMPLE(file_chooser file_chooser.cxx "fltk_STATIC;fltk_images_STATIC")
-+CREATE_EXAMPLE(fonts fonts.cxx fltk_STATIC)
-+CREATE_EXAMPLE(forms forms.cxx "fltk_STATIC;fltk_forms_STATIC")
-+CREATE_EXAMPLE(hello hello.cxx fltk_STATIC)
-+CREATE_EXAMPLE(help help.cxx "fltk_STATIC;fltk_images_STATIC")
-+CREATE_EXAMPLE(icon icon.cxx fltk_STATIC)
-+CREATE_EXAMPLE(iconize iconize.cxx fltk_STATIC)
-+CREATE_EXAMPLE(image image.cxx fltk_STATIC)
-+CREATE_EXAMPLE(inactive inactive.fl fltk_STATIC)
-+CREATE_EXAMPLE(input input.cxx fltk_STATIC)
-+CREATE_EXAMPLE(input_choice input_choice.cxx fltk_STATIC)
-+CREATE_EXAMPLE(keyboard "keyboard.cxx;keyboard_ui.fl" fltk_STATIC)
-+CREATE_EXAMPLE(label label.cxx "fltk_STATIC;fltk_forms_STATIC")
-+CREATE_EXAMPLE(line_style line_style.cxx fltk_STATIC)
-+CREATE_EXAMPLE(list_visuals list_visuals.cxx fltk_STATIC)
-+CREATE_EXAMPLE(mandelbrot "mandelbrot_ui.fl;mandelbrot.cxx" fltk_STATIC)
-+CREATE_EXAMPLE(menubar menubar.cxx fltk_STATIC)
-+CREATE_EXAMPLE(message message.cxx fltk_STATIC)
-+CREATE_EXAMPLE(minimum minimum.cxx fltk_STATIC)
-+CREATE_EXAMPLE(native-filechooser native-filechooser.cxx "fltk_STATIC;fltk_images_STATIC")
-+CREATE_EXAMPLE(navigation navigation.cxx fltk_STATIC)
-+CREATE_EXAMPLE(output output.cxx "fltk_STATIC;fltk_forms_STATIC")
-+CREATE_EXAMPLE(overlay overlay.cxx fltk_STATIC)
-+CREATE_EXAMPLE(pack pack.cxx fltk_STATIC)
-+CREATE_EXAMPLE(pixmap pixmap.cxx fltk_STATIC)
-+CREATE_EXAMPLE(pixmap_browser pixmap_browser.cxx "fltk_STATIC;fltk_images_STATIC")
-+CREATE_EXAMPLE(preferences preferences.fl fltk_STATIC)
-+CREATE_EXAMPLE(offscreen offscreen.cxx fltk_STATIC)
-+CREATE_EXAMPLE(radio radio.fl fltk_STATIC)
-+CREATE_EXAMPLE(resize resize.fl fltk_STATIC)
-+CREATE_EXAMPLE(resizebox resizebox.cxx fltk_STATIC)
-+CREATE_EXAMPLE(rotated_text rotated_text.cxx fltk_STATIC)
-+CREATE_EXAMPLE(scroll scroll.cxx fltk_STATIC)
-+CREATE_EXAMPLE(subwindow subwindow.cxx fltk_STATIC)
- 
- set(SUDOKU_ICON "${CMAKE_CURRENT_SOURCE_DIR}/sudoku.app/Contents/Resources/sudoku.icns")
--CREATE_EXAMPLE(sudoku "sudoku.cxx;${SUDOKU_ICON}" "fltk;fltk_images;${AUDIOLIBS}")
-+CREATE_EXAMPLE(sudoku "sudoku.cxx;${SUDOKU_ICON}" "fltk_STATIC;fltk_images_STATIC;${AUDIOLIBS}")
- 
--CREATE_EXAMPLE(symbols symbols.cxx fltk)
--CREATE_EXAMPLE(tabs tabs.fl fltk)
--CREATE_EXAMPLE(table table.cxx fltk)
--CREATE_EXAMPLE(threads threads.cxx fltk)
--CREATE_EXAMPLE(tile tile.cxx fltk)
--CREATE_EXAMPLE(tiled_image tiled_image.cxx fltk)
--CREATE_EXAMPLE(tree tree.fl fltk)
--CREATE_EXAMPLE(twowin twowin.cxx fltk)
--CREATE_EXAMPLE(utf8 utf8.cxx fltk)
--CREATE_EXAMPLE(valuators valuators.fl fltk)
--CREATE_EXAMPLE(unittests unittests.cxx fltk)
--CREATE_EXAMPLE(windowfocus windowfocus.cxx fltk)
-+CREATE_EXAMPLE(symbols symbols.cxx fltk_STATIC)
-+CREATE_EXAMPLE(tabs tabs.fl fltk_STATIC)
-+CREATE_EXAMPLE(table table.cxx fltk_STATIC)
-+CREATE_EXAMPLE(threads threads.cxx fltk_STATIC)
-+CREATE_EXAMPLE(tile tile.cxx fltk_STATIC)
-+CREATE_EXAMPLE(tiled_image tiled_image.cxx fltk_STATIC)
-+CREATE_EXAMPLE(tree tree.fl fltk_STATIC)
-+CREATE_EXAMPLE(twowin twowin.cxx fltk_STATIC)
-+CREATE_EXAMPLE(utf8 utf8.cxx fltk_STATIC)
-+CREATE_EXAMPLE(valuators valuators.fl fltk_STATIC)
-+CREATE_EXAMPLE(unittests unittests.cxx fltk_STATIC)
-+CREATE_EXAMPLE(windowfocus windowfocus.cxx fltk_STATIC)
- 
--CREATE_EXAMPLE(fltk-versions ../examples/fltk-versions.cxx fltk)
-+CREATE_EXAMPLE(fltk-versions ../examples/fltk-versions.cxx fltk_STATIC)
- 
- # OpenGL demos...
- if(OPENGL_FOUND)
--CREATE_EXAMPLE(CubeView "CubeMain.cxx;CubeView.cxx;CubeViewUI.fl" "fltk;fltk_gl")
--CREATE_EXAMPLE(cube cube.cxx "fltk;fltk_gl;${OPENGL_LIBRARIES}")
--CREATE_EXAMPLE(fractals "fractals.cxx;fracviewer.cxx" "fltk;fltk_gl")
--CREATE_EXAMPLE(fullscreen fullscreen.cxx "fltk;fltk_gl")
--CREATE_EXAMPLE(glpuzzle glpuzzle.cxx "fltk;fltk_gl;${OPENGL_LIBRARIES}")
--CREATE_EXAMPLE(gl_overlay gl_overlay.cxx "fltk;fltk_gl;${OPENGL_LIBRARIES}")
--CREATE_EXAMPLE(shape shape.cxx "fltk;fltk_gl;${OPENGL_LIBRARIES}")
-+CREATE_EXAMPLE(CubeView "CubeMain.cxx;CubeView.cxx;CubeViewUI.fl" "fltk_STATIC;fltk_gl_STATIC")
-+CREATE_EXAMPLE(cube cube.cxx "fltk_STATIC;fltk_gl_STATIC;${OPENGL_LIBRARIES}")
-+CREATE_EXAMPLE(fractals "fractals.cxx;fracviewer.cxx" "fltk_STATIC;fltk_gl_STATIC")
-+CREATE_EXAMPLE(fullscreen fullscreen.cxx "fltk_STATIC;fltk_gl_STATIC")
-+CREATE_EXAMPLE(glpuzzle glpuzzle.cxx "fltk_STATIC;fltk_gl_STATIC;${OPENGL_LIBRARIES}")
-+CREATE_EXAMPLE(gl_overlay gl_overlay.cxx "fltk_STATIC;fltk_gl_STATIC;${OPENGL_LIBRARIES}")
-+CREATE_EXAMPLE(shape shape.cxx "fltk_STATIC;fltk_gl_STATIC;${OPENGL_LIBRARIES}")
- endif(OPENGL_FOUND)
- 
- # Cairo demo
- if(FLTK_HAVE_CAIRO)
--   CREATE_EXAMPLE(cairo_test cairo_test.cxx "fltk;fltk_cairo")
-+   CREATE_EXAMPLE(cairo_test cairo_test.cxx "fltk_STATIC;fltk_cairo_STATIC")
- endif(FLTK_HAVE_CAIRO)
- 
- # We need some support files for the demo programs: