From df3fca5bc00f6493796c9c9bf231a24dc0c2bc98 Mon Sep 17 00:00:00 2001 From: Spoike Date: Sun, 29 Sep 2019 03:27:44 +0000 Subject: [PATCH] Make sure libjpeg links properly. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5554 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/common/config_freecs.h | 7 ++++++- engine/common/config_minimal.h | 6 ++++++ engine/common/config_nocompat.h | 6 ++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/engine/common/config_freecs.h b/engine/common/config_freecs.h index e1a40e137..39c895c1f 100644 --- a/engine/common/config_freecs.h +++ b/engine/common/config_freecs.h @@ -195,7 +195,12 @@ #ifndef AVAIL_ZLIB -DNO_ZLIB //disable zlib #endif - +#ifdef AVAIL_PNGLIB +-DLINK_PNG +#endif +#ifdef AVAIL_JPEGLIB +-DLINK_JPEG +#endif -DNO_SPEEX //disable static speex #ifndef BOTLIB_STATIC diff --git a/engine/common/config_minimal.h b/engine/common/config_minimal.h index 9ca854571..e2fc06816 100644 --- a/engine/common/config_minimal.h +++ b/engine/common/config_minimal.h @@ -204,6 +204,12 @@ #ifndef AVAIL_ZLIB -DNO_ZLIB //disable zlib #endif +#ifdef AVAIL_PNGLIB +-DLINK_PNG +#endif +#ifdef AVAIL_JPEGLIB +-DLINK_JPEG +#endif -DNO_OPUS -DNO_SPEEX //disable static speex diff --git a/engine/common/config_nocompat.h b/engine/common/config_nocompat.h index b05b0d591..9f74114b2 100644 --- a/engine/common/config_nocompat.h +++ b/engine/common/config_nocompat.h @@ -202,6 +202,12 @@ #ifndef AVAIL_ZLIB //-DNO_ZLIB //disable zlib #endif +#ifdef AVAIL_PNGLIB +-DLINK_PNG +#endif +#ifdef AVAIL_JPEGLIB +-DLINK_JPEG +#endif //-DNO_OPUS //-DNO_SPEEX //disable static speex