From b227fc237489be631768a18992662c4cf8bd9f66 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Sun, 29 Sep 2019 03:27:24 +0000
Subject: [PATCH] Make sure libjpeg links properly.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5553 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/image.c         | 2 +-
 engine/common/config_fteqw.h  | 6 ++++++
 engine/common/config_wastes.h | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/engine/client/image.c b/engine/client/image.c
index ff1c416b6..b757fa64f 100644
--- a/engine/client/image.c
+++ b/engine/client/image.c
@@ -191,7 +191,7 @@ static image_t *imagelist;
 #ifndef LIBPNG_STATIC
 #define DYNAMIC_LIBPNG
 #endif
-#ifndef LIBPNG_STATIC
+#ifndef LIBJPEG_STATIC
 #define DYNAMIC_LIBJPEG
 #endif
 
diff --git a/engine/common/config_fteqw.h b/engine/common/config_fteqw.h
index 8a0325555..4d1d45f9a 100644
--- a/engine/common/config_fteqw.h
+++ b/engine/common/config_fteqw.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
diff --git a/engine/common/config_wastes.h b/engine/common/config_wastes.h
index 4a5575385..140619cde 100644
--- a/engine/common/config_wastes.h
+++ b/engine/common/config_wastes.h
@@ -201,6 +201,12 @@
 #ifndef AVAIL_ZLIB
 -DNO_ZLIB	//disable zlib
 #endif
+#ifdef AVAIL_PNGLIB
+-DLINK_PNG
+#endif
+#ifdef AVAIL_JPEGLIB
+-DLINK_JPEG
+#endif
 
 #ifdef USE_INTERNAL_BULLET	//makefile will respond to this by trying to link bullet into the engine itself, instead of as a plugin.
 -DLINK_INTERNAL_BULLET