From e355a095c4c3456487be8bc48675757ab79d44d3 Mon Sep 17 00:00:00 2001
From: nabijaczleweli <nabijaczleweli@gmail.com>
Date: Sat, 14 Mar 2020 01:24:45 +0100
Subject: [PATCH] Force vendor zlib, png, and FreeType on Win32, too

This has lead to linker problems if the environment does have standard
versions of zlib/png (like from MSYS2), see discussion in referenced
issue

Closes #559
---
 CMakeLists.txt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d442eee9..bc15578b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,11 +144,9 @@ if(WIN32 OR APPLE)
     include(FindVendoredPackage)
     include(AddVendoredSubdirectory)
 
-    if(APPLE)
-        set(FORCE_VENDORED_ZLIB     ON)
-        set(FORCE_VENDORED_PNG      ON)
-        set(FORCE_VENDORED_Freetype ON)
-    endif()
+    set(FORCE_VENDORED_ZLIB     ON)
+    set(FORCE_VENDORED_PNG      ON)
+    set(FORCE_VENDORED_Freetype ON)
 
     find_vendored_package(ZLIB zlib
         ZLIB_LIBRARY            zlibstatic