Skip to content

Instantly share code, notes, and snippets.

@vitallium
Created May 22, 2015 14:12
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save vitallium/a6098ac4b411eb4adbd4 to your computer and use it in GitHub Desktop.
Save vitallium/a6098ac4b411eb4adbd4 to your computer and use it in GitHub Desktop.
From f3650dadb5203f7a9c9ac2c7e7d79d1471697c88 Mon Sep 17 00:00:00 2001
From: Vitaliy Slobodin <vitaliy.slobodin@gmail.com>
Date: Fri, 22 May 2015 17:11:10 +0300
Subject: [PATCH 1/1] Fix zlib detection on Windows
---
build.cmd | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/build.cmd b/build.cmd
index c28d0bd..2348eff 100644
--- a/build.cmd
+++ b/build.cmd
@@ -66,8 +66,13 @@ set LIBXML_INCLUDE=!LIBXML_DIR!\include\libxml2
:: sqlite
set SQLITE3SRCDIR=!ROOT_DIR!\src\qt\qtbase\src\3rdparty\sqlite
-set LIB=!OPENSSL_LIB!;!ICU_LIB!;!LIBXML_LIB!;%LIB%
-set INCLUDE=!OPENSSL_INCLUDE!;!ICU_INCLUDE!;!LIBXML_INCLUDE!;%INCLUDE%
+:: zlib
+set ZLIB_DIR=!_3RDPARTY!\zlib
+set ZLIB_LIB=!ZLIB_DIR!\lib
+set ZLIB_INCLUDE=!ZLIB_DIR!\include
+
+set LIB=!OPENSSL_LIB!;!ICU_LIB!;!LIBXML_LIB!;!ZLIB_LIB!;%LIB%
+set INCLUDE=!OPENSSL_INCLUDE!;!ICU_INCLUDE!;!LIBXML_INCLUDE!;!ZLIB_INCLUDE!;%INCLUDE%
set PATH=!_3RDPARTY!\gnuwin32\bin;%PATH%
echo LIB: %LIB%
--
1.9.5.msysgit.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment