summaryrefslogtreecommitdiff
path: root/fltk/fltk-fix-lib-mess.patch
blob: 62f2645b6ac62b8e0295509eccebb9339366507a (plain)
    1 diff -ruN b/CMake/macros.cmake a/CMake/macros.cmake
    2 --- b/CMake/macros.cmake	2019-03-03 09:40:23.000000000 +0100
    3 +++ a/CMake/macros.cmake	2019-03-10 21:58:32.895224605 +0100
    4 @@ -22,11 +22,7 @@
    5  #######################################################################
    6  macro(FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
    7  
    8 -    if (${LIBTYPE} STREQUAL "SHARED")
    9 -        set (LIBRARY_NAME ${LIBNAME}_SHARED)
   10 -    else ()
   11 -        set (LIBRARY_NAME ${LIBNAME})
   12 -    endif (${LIBTYPE} STREQUAL "SHARED")
   13 +    set (LIBRARY_NAME ${LIBNAME}_${LIBTYPE})
   14  
   15      if (MSVC)
   16  	set (LIBRARY_NAME_DEBUG "${LIBRARY_NAME}d")
   17 @@ -38,7 +34,7 @@
   18  
   19      set_target_properties(${LIBRARY_NAME}
   20          PROPERTIES
   21 -        OUTPUT_NAME ${LIBRARY_NAME}
   22 +        OUTPUT_NAME ${LIBNAME}
   23          DEBUG_OUTPUT_NAME ${LIBRARY_NAME_DEBUG}
   24          CLEAN_DIRECT_OUTPUT TRUE
   25          COMPILE_DEFINITIONS "FL_LIBRARY"
   26 @@ -47,6 +43,7 @@
   27      if (${LIBTYPE} STREQUAL "SHARED")
   28  	set_target_properties(${LIBRARY_NAME}
   29  	    PROPERTIES
   30 +      OUTPUT_NAME ${LIBNAME}
   31  	    VERSION ${FLTK_VERSION_FULL}
   32  	    SOVERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}
   33  	    PREFIX "lib"    # for MSVC static/shared coexistence
   34 diff -ruN b/documentation/CMakeLists.txt a/documentation/CMakeLists.txt
   35 --- b/documentation/CMakeLists.txt	2019-03-03 09:40:23.000000000 +0100
   36 +++ a/documentation/CMakeLists.txt	2019-03-10 22:40:51.077135317 +0100
   37 @@ -45,7 +45,7 @@
   38  	${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
   39  	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   40  	COMMENT "Generating HTML documentation" VERBATIM
   41 -	DEPENDS fltk
   42 +  DEPENDS fltk_STATIC
   43  	)
   44  
   45  endif(OPTION_BUILD_HTML_DOCUMENTATION)
   46 @@ -92,7 +92,7 @@
   47  	COMMAND cp -f latex/refman.pdf fltk.pdf
   48  	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   49  	COMMENT "Generating PDF documentation" VERBATIM
   50 -	DEPENDS fltk
   51 +  DEPENDS fltk_STATIC
   52  	)
   53  
   54      # add target 'pdf'
   55 diff -ruN b/fluid/CMakeLists.txt a/fluid/CMakeLists.txt
   56 --- b/fluid/CMakeLists.txt	2019-03-03 09:40:23.000000000 +0100
   57 +++ a/fluid/CMakeLists.txt	2019-03-10 22:09:52.482801651 +0100
   58 @@ -48,7 +48,7 @@
   59      add_executable(fluid WIN32 ${CPPFILES})
   60  endif(APPLE AND NOT OPTION_APPLE_X11)
   61  
   62 -target_link_libraries(fluid fltk fltk_images fltk_forms)
   63 +target_link_libraries(fluid fltk_STATIC fltk_images_STATIC fltk_forms_STATIC)
   64  
   65  # install fluid
   66  
   67 diff -ruN b/src/CMakeLists.txt a/src/CMakeLists.txt
   68 --- b/src/CMakeLists.txt	2019-03-03 09:40:23.000000000 +0100
   69 +++ a/src/CMakeLists.txt	2019-03-10 22:57:37.458302812 +0100
   70 @@ -246,7 +246,7 @@
   71  endif (WIN32)
   72  
   73  if (FLTK_HAVE_CAIRO)
   74 -    list(APPEND OPTIONAL_LIBS fltk_cairo ${PKG_CAIRO_LIBRARIES})
   75 +  list(APPEND OPTIONAL_LIBS fltk_cairo_STATIC ${PKG_CAIRO_LIBRARIES})
   76  ENDif (FLTK_HAVE_CAIRO)
   77  
   78  if (HAVE_XINERAMA)
   79 @@ -275,41 +275,41 @@
   80  #######################################################################
   81  
   82  FL_ADD_LIBRARY(fltk STATIC "${STATIC_FILES}")
   83 -target_link_libraries(fltk ${OPTIONAL_LIBS})
   84 +target_link_libraries(fltk_STATIC ${OPTIONAL_LIBS})
   85  
   86  #######################################################################
   87  
   88  FL_ADD_LIBRARY(fltk_forms STATIC "${FLCPPFILES}")
   89 -target_link_libraries(fltk_forms fltk)
   90 +target_link_libraries(fltk_forms_STATIC fltk_STATIC)
   91  
   92  #######################################################################
   93  
   94  FL_ADD_LIBRARY(fltk_images STATIC "${IMGCPPFILES}")
   95 -target_link_libraries(fltk_images fltk)
   96 +target_link_libraries(fltk_images_STATIC fltk_STATIC)
   97  
   98  if (OPTION_USE_SYSTEM_LIBJPEG)
   99 -    target_link_libraries(fltk_images ${FLTK_JPEG_LIBRARIES})
  100 +  target_link_libraries(fltk_images_STATIC ${FLTK_JPEG_LIBRARIES})
  101  else()
  102 -    target_link_libraries(fltk_images fltk_jpeg)
  103 +  target_link_libraries(fltk_images_STATIC fltk_jpeg_STATIC)
  104  endif (OPTION_USE_SYSTEM_LIBJPEG)
  105  
  106  if (OPTION_USE_SYSTEM_ZLIB)
  107 -    target_link_libraries(fltk_images ${FLTK_ZLIB_LIBRARIES})
  108 +  target_link_libraries(fltk_images_STATIC ${FLTK_ZLIB_LIBRARIES})
  109  else()
  110 -    target_link_libraries(fltk_images fltk_z)
  111 +  target_link_libraries(fltk_images_STATIC fltk_z_STATIC)
  112  endif (OPTION_USE_SYSTEM_ZLIB)
  113  
  114  if (OPTION_USE_SYSTEM_LIBPNG)
  115 -    target_link_libraries(fltk_images ${FLTK_PNG_LIBRARIES})
  116 +  target_link_libraries(fltk_images_STATIC ${FLTK_PNG_LIBRARIES})
  117  else()
  118 -    target_link_libraries(fltk_images fltk_png)
  119 +  target_link_libraries(fltk_images_STATIC fltk_png_STATIC)
  120  endif (OPTION_USE_SYSTEM_LIBPNG)
  121  
  122  #######################################################################
  123  
  124  if (OPENGL_FOUND)
  125     FL_ADD_LIBRARY(fltk_gl STATIC "${GLCPPFILES}")
  126 -   target_link_libraries(fltk_gl fltk ${OPENGL_LIBRARIES})
  127 +   target_link_libraries(fltk_gl_STATIC fltk_STATIC ${OPENGL_LIBRARIES})
  128  endif (OPENGL_FOUND)
  129  
  130  #######################################################################
  131 @@ -332,7 +332,7 @@
  132  
  133      FL_ADD_LIBRARY(fltk_forms SHARED "${FLCPPFILES}")
  134      if (MSVC)
  135 -      target_link_libraries(fltk_forms_SHARED fltk)
  136 +      target_link_libraries(fltk_forms_SHARED fltk_SHARED)
  137      else ()
  138        target_link_libraries(fltk_forms_SHARED fltk_SHARED)
  139      endif (MSVC)
  140 @@ -341,27 +341,27 @@
  141  
  142      FL_ADD_LIBRARY(fltk_images SHARED "${IMGCPPFILES}")
  143      if (MSVC)
  144 -      target_link_libraries(fltk_images_SHARED fltk)
  145 +      target_link_libraries(fltk_images_SHARED fltk_SHARED)
  146      else ()
  147        target_link_libraries(fltk_images_SHARED fltk_SHARED)
  148      endif (MSVC)
  149  
  150      if (OPTION_USE_SYSTEM_LIBJPEG)
  151 -	target_link_libraries(fltk_images_SHARED ${FLTK_JPEG_LIBRARIES})
  152 +      target_link_libraries(fltk_images_SHARED ${FLTK_JPEG_LIBRARIES})
  153      else()
  154 -	target_link_libraries(fltk_images_SHARED fltk_jpeg_SHARED)
  155 +      target_link_libraries(fltk_images_SHARED fltk_jpeg_SHARED)
  156      endif (OPTION_USE_SYSTEM_LIBJPEG)
  157  
  158      if (OPTION_USE_SYSTEM_LIBPNG)
  159 -	target_link_libraries(fltk_images_SHARED ${FLTK_PNG_LIBRARIES})
  160 +      target_link_libraries(fltk_images_SHARED ${FLTK_PNG_LIBRARIES})
  161      else()
  162 -	target_link_libraries(fltk_images_SHARED fltk_png_SHARED)
  163 +      target_link_libraries(fltk_images_SHARED fltk_png_SHARED)
  164      endif (OPTION_USE_SYSTEM_LIBPNG)
  165  
  166      if (OPTION_USE_SYSTEM_ZLIB)
  167 -	target_link_libraries(fltk_images_SHARED ${FLTK_ZLIB_LIBRARIES})
  168 +      target_link_libraries(fltk_images_SHARED ${FLTK_ZLIB_LIBRARIES})
  169      else()
  170 -	target_link_libraries(fltk_images_SHARED fltk_z_SHARED)
  171 +      target_link_libraries(fltk_images_SHARED fltk_z_SHARED)
  172      endif (OPTION_USE_SYSTEM_ZLIB)
  173  
  174      ###################################################################
  175 @@ -369,9 +369,9 @@
  176      if (OPENGL_FOUND)
  177        FL_ADD_LIBRARY(fltk_gl SHARED "${GLCPPFILES}")
  178        if (MSVC)
  179 -	target_link_libraries(fltk_gl_SHARED fltk ${OPENGL_LIBRARIES})
  180 +        target_link_libraries(fltk_gl_SHARED fltk_SHARED ${OPENGL_LIBRARIES})
  181        else ()
  182 -	target_link_libraries(fltk_gl_SHARED fltk_SHARED ${OPENGL_LIBRARIES})
  183 +        target_link_libraries(fltk_gl_SHARED fltk_SHARED ${OPENGL_LIBRARIES})
  184        endif (MSVC)
  185      endif (OPENGL_FOUND)
  186  
  187 diff -ruN b/test/CMakeLists.txt a/test/CMakeLists.txt
  188 --- b/test/CMakeLists.txt	2019-03-03 09:40:23.000000000 +0100
  189 +++ a/test/CMakeLists.txt	2019-03-10 23:13:36.096519270 +0100
  190 @@ -25,108 +25,108 @@
  191  endif(APPLE AND NOT OPTION_APPLE_X11)
  192  
  193  #######################################################################
  194 -CREATE_EXAMPLE(adjuster adjuster.cxx fltk)
  195 -CREATE_EXAMPLE(arc arc.cxx fltk)
  196 -CREATE_EXAMPLE(animated animated.cxx fltk)
  197 -CREATE_EXAMPLE(ask ask.cxx fltk)
  198 -CREATE_EXAMPLE(bitmap bitmap.cxx fltk)
  199 +CREATE_EXAMPLE(adjuster adjuster.cxx fltk_STATIC)
  200 +CREATE_EXAMPLE(arc arc.cxx fltk_STATIC)
  201 +CREATE_EXAMPLE(animated animated.cxx fltk_STATIC)
  202 +CREATE_EXAMPLE(ask ask.cxx fltk_STATIC)
  203 +CREATE_EXAMPLE(bitmap bitmap.cxx fltk_STATIC)
  204  
  205  set(BLOCKS_ICON "${CMAKE_CURRENT_SOURCE_DIR}/blocks.app/Contents/Resources/blocks.icns")
  206 -CREATE_EXAMPLE(blocks "blocks.cxx;${BLOCKS_ICON}" "fltk;${AUDIOLIBS}")
  207 +CREATE_EXAMPLE(blocks "blocks.cxx;${BLOCKS_ICON}" "fltk_STATIC;${AUDIOLIBS}")
  208  
  209 -CREATE_EXAMPLE(boxtype boxtype.cxx fltk)
  210 -CREATE_EXAMPLE(browser browser.cxx fltk)
  211 -CREATE_EXAMPLE(button button.cxx fltk)
  212 -CREATE_EXAMPLE(buttons buttons.cxx fltk)
  213 +CREATE_EXAMPLE(boxtype boxtype.cxx fltk_STATIC)
  214 +CREATE_EXAMPLE(browser browser.cxx fltk_STATIC)
  215 +CREATE_EXAMPLE(button button.cxx fltk_STATIC)
  216 +CREATE_EXAMPLE(buttons buttons.cxx fltk_STATIC)
  217  
  218  set(CHECKERS_ICON "${CMAKE_CURRENT_SOURCE_DIR}/checkers.app/Contents/Resources/checkers.icns")
  219 -CREATE_EXAMPLE(checkers "checkers.cxx;${CHECKERS_ICON}" fltk)
  220 +CREATE_EXAMPLE(checkers "checkers.cxx;${CHECKERS_ICON}" fltk_STATIC)
  221  
  222 -CREATE_EXAMPLE(clock clock.cxx fltk)
  223 -CREATE_EXAMPLE(colbrowser colbrowser.cxx "fltk;fltk_forms")
  224 -CREATE_EXAMPLE(color_chooser color_chooser.cxx fltk)
  225 -CREATE_EXAMPLE(cursor cursor.cxx fltk)
  226 -CREATE_EXAMPLE(curve curve.cxx fltk)
  227 +CREATE_EXAMPLE(clock clock.cxx fltk_STATIC)
  228 +CREATE_EXAMPLE(colbrowser colbrowser.cxx "fltk_STATIC;fltk_forms_STATIC")
  229 +CREATE_EXAMPLE(color_chooser color_chooser.cxx fltk_STATIC)
  230 +CREATE_EXAMPLE(cursor cursor.cxx fltk_STATIC)
  231 +CREATE_EXAMPLE(curve curve.cxx fltk_STATIC)
  232  
  233 -CREATE_EXAMPLE(demo "demo.cxx;demo.menu" fltk)
  234 +CREATE_EXAMPLE(demo "demo.cxx;demo.menu" fltk_STATIC)
  235  set_source_files_properties(demo.menu PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
  236  
  237 -CREATE_EXAMPLE(device device.cxx fltk)
  238 -CREATE_EXAMPLE(doublebuffer doublebuffer.cxx fltk)
  239 +CREATE_EXAMPLE(device device.cxx fltk_STATIC)
  240 +CREATE_EXAMPLE(doublebuffer doublebuffer.cxx fltk_STATIC)
  241  
  242 -CREATE_EXAMPLE(editor editor.cxx fltk)
  243 +CREATE_EXAMPLE(editor editor.cxx fltk_STATIC)
  244  set_target_properties(editor PROPERTIES
  245      MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/ide/Xcode4/plists/editor-Info.plist"
  246      )
  247  
  248 -CREATE_EXAMPLE(fast_slow fast_slow.fl fltk)
  249 -CREATE_EXAMPLE(file_chooser file_chooser.cxx "fltk;fltk_images")
  250 -CREATE_EXAMPLE(fonts fonts.cxx fltk)
  251 -CREATE_EXAMPLE(forms forms.cxx "fltk;fltk_forms")
  252 -CREATE_EXAMPLE(hello hello.cxx fltk)
  253 -CREATE_EXAMPLE(help help.cxx "fltk;fltk_images")
  254 -CREATE_EXAMPLE(icon icon.cxx fltk)
  255 -CREATE_EXAMPLE(iconize iconize.cxx fltk)
  256 -CREATE_EXAMPLE(image image.cxx fltk)
  257 -CREATE_EXAMPLE(inactive inactive.fl fltk)
  258 -CREATE_EXAMPLE(input input.cxx fltk)
  259 -CREATE_EXAMPLE(input_choice input_choice.cxx fltk)
  260 -CREATE_EXAMPLE(keyboard "keyboard.cxx;keyboard_ui.fl" fltk)
  261 -CREATE_EXAMPLE(label label.cxx "fltk;fltk_forms")
  262 -CREATE_EXAMPLE(line_style line_style.cxx fltk)
  263 -CREATE_EXAMPLE(list_visuals list_visuals.cxx fltk)
  264 -CREATE_EXAMPLE(mandelbrot "mandelbrot_ui.fl;mandelbrot.cxx" fltk)
  265 -CREATE_EXAMPLE(menubar menubar.cxx fltk)
  266 -CREATE_EXAMPLE(message message.cxx fltk)
  267 -CREATE_EXAMPLE(minimum minimum.cxx fltk)
  268 -CREATE_EXAMPLE(native-filechooser native-filechooser.cxx "fltk;fltk_images")
  269 -CREATE_EXAMPLE(navigation navigation.cxx fltk)
  270 -CREATE_EXAMPLE(output output.cxx "fltk;fltk_forms")
  271 -CREATE_EXAMPLE(overlay overlay.cxx fltk)
  272 -CREATE_EXAMPLE(pack pack.cxx fltk)
  273 -CREATE_EXAMPLE(pixmap pixmap.cxx fltk)
  274 -CREATE_EXAMPLE(pixmap_browser pixmap_browser.cxx "fltk;fltk_images")
  275 -CREATE_EXAMPLE(preferences preferences.fl fltk)
  276 -CREATE_EXAMPLE(offscreen offscreen.cxx fltk)
  277 -CREATE_EXAMPLE(radio radio.fl fltk)
  278 -CREATE_EXAMPLE(resize resize.fl fltk)
  279 -CREATE_EXAMPLE(resizebox resizebox.cxx fltk)
  280 -CREATE_EXAMPLE(rotated_text rotated_text.cxx fltk)
  281 -CREATE_EXAMPLE(scroll scroll.cxx fltk)
  282 -CREATE_EXAMPLE(subwindow subwindow.cxx fltk)
  283 +CREATE_EXAMPLE(fast_slow fast_slow.fl fltk_STATIC)
  284 +CREATE_EXAMPLE(file_chooser file_chooser.cxx "fltk_STATIC;fltk_images_STATIC")
  285 +CREATE_EXAMPLE(fonts fonts.cxx fltk_STATIC)
  286 +CREATE_EXAMPLE(forms forms.cxx "fltk_STATIC;fltk_forms_STATIC")
  287 +CREATE_EXAMPLE(hello hello.cxx fltk_STATIC)
  288 +CREATE_EXAMPLE(help help.cxx "fltk_STATIC;fltk_images_STATIC")
  289 +CREATE_EXAMPLE(icon icon.cxx fltk_STATIC)
  290 +CREATE_EXAMPLE(iconize iconize.cxx fltk_STATIC)
  291 +CREATE_EXAMPLE(image image.cxx fltk_STATIC)
  292 +CREATE_EXAMPLE(inactive inactive.fl fltk_STATIC)
  293 +CREATE_EXAMPLE(input input.cxx fltk_STATIC)
  294 +CREATE_EXAMPLE(input_choice input_choice.cxx fltk_STATIC)
  295 +CREATE_EXAMPLE(keyboard "keyboard.cxx;keyboard_ui.fl" fltk_STATIC)
  296 +CREATE_EXAMPLE(label label.cxx "fltk_STATIC;fltk_forms_STATIC")
  297 +CREATE_EXAMPLE(line_style line_style.cxx fltk_STATIC)
  298 +CREATE_EXAMPLE(list_visuals list_visuals.cxx fltk_STATIC)
  299 +CREATE_EXAMPLE(mandelbrot "mandelbrot_ui.fl;mandelbrot.cxx" fltk_STATIC)
  300 +CREATE_EXAMPLE(menubar menubar.cxx fltk_STATIC)
  301 +CREATE_EXAMPLE(message message.cxx fltk_STATIC)
  302 +CREATE_EXAMPLE(minimum minimum.cxx fltk_STATIC)
  303 +CREATE_EXAMPLE(native-filechooser native-filechooser.cxx "fltk_STATIC;fltk_images_STATIC")
  304 +CREATE_EXAMPLE(navigation navigation.cxx fltk_STATIC)
  305 +CREATE_EXAMPLE(output output.cxx "fltk_STATIC;fltk_forms_STATIC")
  306 +CREATE_EXAMPLE(overlay overlay.cxx fltk_STATIC)
  307 +CREATE_EXAMPLE(pack pack.cxx fltk_STATIC)
  308 +CREATE_EXAMPLE(pixmap pixmap.cxx fltk_STATIC)
  309 +CREATE_EXAMPLE(pixmap_browser pixmap_browser.cxx "fltk_STATIC;fltk_images_STATIC")
  310 +CREATE_EXAMPLE(preferences preferences.fl fltk_STATIC)
  311 +CREATE_EXAMPLE(offscreen offscreen.cxx fltk_STATIC)
  312 +CREATE_EXAMPLE(radio radio.fl fltk_STATIC)
  313 +CREATE_EXAMPLE(resize resize.fl fltk_STATIC)
  314 +CREATE_EXAMPLE(resizebox resizebox.cxx fltk_STATIC)
  315 +CREATE_EXAMPLE(rotated_text rotated_text.cxx fltk_STATIC)
  316 +CREATE_EXAMPLE(scroll scroll.cxx fltk_STATIC)
  317 +CREATE_EXAMPLE(subwindow subwindow.cxx fltk_STATIC)
  318  
  319  set(SUDOKU_ICON "${CMAKE_CURRENT_SOURCE_DIR}/sudoku.app/Contents/Resources/sudoku.icns")
  320 -CREATE_EXAMPLE(sudoku "sudoku.cxx;${SUDOKU_ICON}" "fltk;fltk_images;${AUDIOLIBS}")
  321 +CREATE_EXAMPLE(sudoku "sudoku.cxx;${SUDOKU_ICON}" "fltk_STATIC;fltk_images_STATIC;${AUDIOLIBS}")
  322  
  323 -CREATE_EXAMPLE(symbols symbols.cxx fltk)
  324 -CREATE_EXAMPLE(tabs tabs.fl fltk)
  325 -CREATE_EXAMPLE(table table.cxx fltk)
  326 -CREATE_EXAMPLE(threads threads.cxx fltk)
  327 -CREATE_EXAMPLE(tile tile.cxx fltk)
  328 -CREATE_EXAMPLE(tiled_image tiled_image.cxx fltk)
  329 -CREATE_EXAMPLE(tree tree.fl fltk)
  330 -CREATE_EXAMPLE(twowin twowin.cxx fltk)
  331 -CREATE_EXAMPLE(utf8 utf8.cxx fltk)
  332 -CREATE_EXAMPLE(valuators valuators.fl fltk)
  333 -CREATE_EXAMPLE(unittests unittests.cxx fltk)
  334 -CREATE_EXAMPLE(windowfocus windowfocus.cxx fltk)
  335 +CREATE_EXAMPLE(symbols symbols.cxx fltk_STATIC)
  336 +CREATE_EXAMPLE(tabs tabs.fl fltk_STATIC)
  337 +CREATE_EXAMPLE(table table.cxx fltk_STATIC)
  338 +CREATE_EXAMPLE(threads threads.cxx fltk_STATIC)
  339 +CREATE_EXAMPLE(tile tile.cxx fltk_STATIC)
  340 +CREATE_EXAMPLE(tiled_image tiled_image.cxx fltk_STATIC)
  341 +CREATE_EXAMPLE(tree tree.fl fltk_STATIC)
  342 +CREATE_EXAMPLE(twowin twowin.cxx fltk_STATIC)
  343 +CREATE_EXAMPLE(utf8 utf8.cxx fltk_STATIC)
  344 +CREATE_EXAMPLE(valuators valuators.fl fltk_STATIC)
  345 +CREATE_EXAMPLE(unittests unittests.cxx fltk_STATIC)
  346 +CREATE_EXAMPLE(windowfocus windowfocus.cxx fltk_STATIC)
  347  
  348 -CREATE_EXAMPLE(fltk-versions ../examples/fltk-versions.cxx fltk)
  349 +CREATE_EXAMPLE(fltk-versions ../examples/fltk-versions.cxx fltk_STATIC)
  350  
  351  # OpenGL demos...
  352  if(OPENGL_FOUND)
  353 -CREATE_EXAMPLE(CubeView "CubeMain.cxx;CubeView.cxx;CubeViewUI.fl" "fltk;fltk_gl")
  354 -CREATE_EXAMPLE(cube cube.cxx "fltk;fltk_gl;${OPENGL_LIBRARIES}")
  355 -CREATE_EXAMPLE(fractals "fractals.cxx;fracviewer.cxx" "fltk;fltk_gl")
  356 -CREATE_EXAMPLE(fullscreen fullscreen.cxx "fltk;fltk_gl")
  357 -CREATE_EXAMPLE(glpuzzle glpuzzle.cxx "fltk;fltk_gl;${OPENGL_LIBRARIES}")
  358 -CREATE_EXAMPLE(gl_overlay gl_overlay.cxx "fltk;fltk_gl;${OPENGL_LIBRARIES}")
  359 -CREATE_EXAMPLE(shape shape.cxx "fltk;fltk_gl;${OPENGL_LIBRARIES}")
  360 +CREATE_EXAMPLE(CubeView "CubeMain.cxx;CubeView.cxx;CubeViewUI.fl" "fltk_STATIC;fltk_gl_STATIC")
  361 +CREATE_EXAMPLE(cube cube.cxx "fltk_STATIC;fltk_gl_STATIC;${OPENGL_LIBRARIES}")
  362 +CREATE_EXAMPLE(fractals "fractals.cxx;fracviewer.cxx" "fltk_STATIC;fltk_gl_STATIC")
  363 +CREATE_EXAMPLE(fullscreen fullscreen.cxx "fltk_STATIC;fltk_gl_STATIC")
  364 +CREATE_EXAMPLE(glpuzzle glpuzzle.cxx "fltk_STATIC;fltk_gl_STATIC;${OPENGL_LIBRARIES}")
  365 +CREATE_EXAMPLE(gl_overlay gl_overlay.cxx "fltk_STATIC;fltk_gl_STATIC;${OPENGL_LIBRARIES}")
  366 +CREATE_EXAMPLE(shape shape.cxx "fltk_STATIC;fltk_gl_STATIC;${OPENGL_LIBRARIES}")
  367  endif(OPENGL_FOUND)
  368  
  369  # Cairo demo
  370  if(FLTK_HAVE_CAIRO)
  371 -   CREATE_EXAMPLE(cairo_test cairo_test.cxx "fltk;fltk_cairo")
  372 +   CREATE_EXAMPLE(cairo_test cairo_test.cxx "fltk_STATIC;fltk_cairo_STATIC")
  373  endif(FLTK_HAVE_CAIRO)
  374  
  375  # We need some support files for the demo programs:

Generated by cgit