freetype-commit
[Top][All Lists]
Advanced

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

[freetype2] master 6f85469: * CMakeLists.txt [win32]: Allow MSVC DLL bui


From: Werner LEMBERG
Subject: [freetype2] master 6f85469: * CMakeLists.txt [win32]: Allow MSVC DLL builds (#53287).
Date: Fri, 9 Mar 2018 00:52:33 -0500 (EST)

branch: master
commit 6f854692a86a778a1b88289fbad75666b6eec621
Author: Chun-wei Fan <address@hidden>
Commit: Werner Lemberg <address@hidden>

    * CMakeLists.txt [win32]: Allow MSVC DLL builds (#53287).
    
    Do not limit DLL builds to MinGW, since we already have
    `__declspec(dllexport)' directives in `ftconfig.h'.
    Also suppress more warnings for POSIX functions.
---
 CMakeLists.txt | 5 +----
 ChangeLog      | 8 ++++++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83f26b9..f335fec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,10 +119,6 @@ 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
@@ -164,6 +160,7 @@ set(SHARED_LIBRARY_VERSION 
${VERSION_MAJOR}.${VERSION_MINOR})
 add_definitions(-DFT2_BUILD_LIBRARY)
 if (WIN32)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+  add_definitions(-D_CRT_NONSTDC_NO_WARNINGS)
 endif ()
 
 
diff --git a/ChangeLog b/ChangeLog
index 3bef98b..155ba18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-03-09  Chun-wei Fan  <address@hidden>
+
+       * CMakeLists.txt [win32]: Allow MSVC DLL builds (#53287).
+
+       Do not limit DLL builds to MinGW, since we already have
+       `__declspec(dllexport)' directives in `ftconfig.h'.
+       Also suppress more warnings for POSIX functions.
+
 2018-03-08  Hugh McMaster  <address@hidden>
 
        Make installation of `freetype-config' optional (#53093).



reply via email to

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