From 5cf83a5335cbbc71037930de857b947c5de38948 Mon Sep 17 00:00:00 2001 From: StudioEtrange Date: Tue, 20 Oct 2015 07:19:44 +0200 Subject: [PATCH] * CMakeLists.txt: Enable shared library builds on MinGW (#46233). --- CMakeLists.txt | 8 ++++---- ChangeLog | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f0940ff7..4d0766d32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,14 +100,14 @@ else () endif () endif () -if (WIN32 AND BUILD_SHARED_LIBS) - message(FATAL_ERROR "Shared libraries not supported on Windows.") -endif () - project(freetype) +if (WIN32 AND NOT MINGW AND BUILD_SHARED_LIBS) + message(FATAL_ERROR "Building shared libraries on Windows needs MinGW") +endif () + # Disallow in-source builds if ("${PROJECT_BINARY_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}") message(FATAL_ERROR diff --git a/ChangeLog b/ChangeLog index 3ea8ecd46..97e8b08c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-10-20 StudioEtrange + + * CMakeLists.txt: Enable shared library builds on MinGW (#46233). + 2015-10-20 Werner Lemberg * src/type1/t1afm.c (T1_Read_Metrics): Fix memory leak (#46229).