freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master 5cf83a5: * CMakeLists.txt: Enable shared library buil


From: Werner LEMBERG
Subject: [freetype2] master 5cf83a5: * CMakeLists.txt: Enable shared library builds on MinGW (#46233).
Date: Tue, 20 Oct 2015 05:20:53 +0000

branch: master
commit 5cf83a5335cbbc71037930de857b947c5de38948
Author: StudioEtrange <address@hidden>
Commit: Werner Lemberg <address@hidden>

    * 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 0f0940f..4d0766d 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 3ea8ecd..97e8b08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-20  StudioEtrange  <address@hidden>
+
+       * CMakeLists.txt: Enable shared library builds on MinGW (#46233).
+
 2015-10-20  Werner Lemberg  <address@hidden>
 
        * src/type1/t1afm.c (T1_Read_Metrics): Fix memory leak (#46229).



reply via email to

[Prev in Thread] Current Thread [Next in Thread]