From d1595aca30c03c7bfa13eb433cae6a35e7d87de4 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 29 Jan 2017 15:38:44 -0800 Subject: Fixed incorrect naming of files Reverting the naming to stick with how the FLTK library naturally decided to name their files. There was an error in the renaming where the incorrect libraries were being renamed. Reverting this fixes build linking issues --- ports/fltk/portfile.cmake | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/ports/fltk/portfile.cmake b/ports/fltk/portfile.cmake index 848096dce..261a03c7f 100644 --- a/ports/fltk/portfile.cmake +++ b/ports/fltk/portfile.cmake @@ -48,25 +48,7 @@ file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fltk-config) vcpkg_copy_pdbs() if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fltk_formsd.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fltk_gld.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fltk_imagesd.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fltkd.lib) - - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_forms_SHAREDd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_formsd.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_gl_SHAREDd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_gld.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_images_SHAREDd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_imagesd.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_SHAREDd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fltkd.lib) - - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/fltk_forms.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/fltk_gl.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/fltk_images.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/fltk.lib) - - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fltk_forms_SHARED.lib ${CURRENT_PACKAGES_DIR}/lib/fltk_forms.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fltk_gl_SHARED.lib ${CURRENT_PACKAGES_DIR}/lib/fltk_gl.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fltk_images_SHARED.lib ${CURRENT_PACKAGES_DIR}/lib/fltk_images.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fltk_SHARED.lib ${CURRENT_PACKAGES_DIR}/lib/fltk.lib) + else() file(REMOVE_RECURSE @@ -77,11 +59,6 @@ else() endif() -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_formsd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_forms.lib) -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_gld.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_gl.lib) -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_imagesd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_images.lib) -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fltkd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fltk.lib) - file(INSTALL -- cgit v1.2.3 From ae3f4149ed67169c325626ad1a8e8f1efd5be956 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 30 Jan 2017 19:47:14 -0800 Subject: [fltk] Bump version to correspond with binary layout change --- ports/fltk/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/fltk/CONTROL b/ports/fltk/CONTROL index 4f8519550..985c6b1c0 100644 --- a/ports/fltk/CONTROL +++ b/ports/fltk/CONTROL @@ -1,4 +1,4 @@ Source: fltk -Version: 1.3.4-1 +Version: 1.3.4-2 Description: FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation. Build-Depends: zlib, libpng, libjpeg-turbo \ No newline at end of file -- cgit v1.2.3