Bläddra i källkod

Disable verbose debug output (z_verbose & z_error) from FreeType's zlib, to make sure it doesn't clash with Assimp's zlib in a debug build.

Lasse Öörni 8 år sedan
förälder
incheckning
12c394232c

+ 2 - 2
Source/ThirdParty/FreeType/src/gzip/zutil.c

@@ -5,7 +5,7 @@
 
 /* @(#) $Id$ */
 
-// Modified by Yao Wei Tjong for Urho3D
+// Modified by Yao Wei Tjong & Lasse Oorni for Urho3D
 
 #include "zutil.h"
 
@@ -14,7 +14,7 @@ extern void exit OF((int));
 #endif
 
 // Urho3D: quick fix for debug build
-#ifdef DEBUG
+#if 0
 
 #  ifndef verbose
 #    define verbose 0

+ 4 - 1
Source/ThirdParty/FreeType/src/gzip/zutil.h

@@ -10,6 +10,8 @@
 
 /* @(#) $Id$ */
 
+// Modified by Lasse Oorni for Urho3D
+
 #ifndef _Z_UTIL_H
 #define _Z_UTIL_H
 
@@ -182,7 +184,8 @@ typedef unsigned long  ulg;
 #endif
 
 /* Diagnostic functions */
-#ifdef DEBUG
+// Urho3D: disabled to prevent clash with Assimp's zlib
+#if 0
 #  include <stdio.h>
    extern int z_verbose;
    extern void z_error    OF((char *m));