From 514ebaf4260f39e7bfd320c2ff3928f73cd22a51 Mon Sep 17 00:00:00 2001 From: qPCR4vir Date: Thu, 5 Dec 2019 13:03:09 +0100 Subject: [PATCH] FIX #469, #492 ? --- build/cmake/shared_libs.cmake | 4 ++-- source/paint/image.cpp | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build/cmake/shared_libs.cmake b/build/cmake/shared_libs.cmake index 85e4a706..a158317d 100644 --- a/build/cmake/shared_libs.cmake +++ b/build/cmake/shared_libs.cmake @@ -39,8 +39,8 @@ endif() if(NANA_STATIC_STDLIB) target_link_libraries(nana PUBLIC - $<$:-static-libgcc> - $<$:-static-libstdc++> + $<$:-static-libgcc -static-libstdc++> + $<$:-static-libgcc -static-libstdc++> ) endif() diff --git a/source/paint/image.cpp b/source/paint/image.cpp index 857c31f7..389ed68e 100644 --- a/source/paint/image.cpp +++ b/source/paint/image.cpp @@ -1,4 +1,4 @@ -/* +/** * Paint Image Implementation * Nana C++ Library(http://www.nanapro.org) * Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com) @@ -7,9 +7,8 @@ * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) * - * @file: nana/paint/image.cpp - * @contributors: - * nabijaczleweli(pr#106) + * @file nana/paint/image.cpp + * @contributors nabijaczleweli(pr#106) */ #include