mirror of
https://github.com/nzp-team/fteqw.git
synced 2025-02-14 15:51:26 +00:00
Make sure libjpeg links properly.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5553 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
fde25234df
commit
b227fc2374
3 changed files with 13 additions and 1 deletions
|
@ -191,7 +191,7 @@ static image_t *imagelist;
|
||||||
#ifndef LIBPNG_STATIC
|
#ifndef LIBPNG_STATIC
|
||||||
#define DYNAMIC_LIBPNG
|
#define DYNAMIC_LIBPNG
|
||||||
#endif
|
#endif
|
||||||
#ifndef LIBPNG_STATIC
|
#ifndef LIBJPEG_STATIC
|
||||||
#define DYNAMIC_LIBJPEG
|
#define DYNAMIC_LIBJPEG
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -202,6 +202,12 @@
|
||||||
#ifndef AVAIL_ZLIB
|
#ifndef AVAIL_ZLIB
|
||||||
//-DNO_ZLIB //disable zlib
|
//-DNO_ZLIB //disable zlib
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef AVAIL_PNGLIB
|
||||||
|
-DLINK_PNG
|
||||||
|
#endif
|
||||||
|
#ifdef AVAIL_JPEGLIB
|
||||||
|
-DLINK_JPEG
|
||||||
|
#endif
|
||||||
|
|
||||||
//-DNO_OPUS
|
//-DNO_OPUS
|
||||||
//-DNO_SPEEX //disable static speex
|
//-DNO_SPEEX //disable static speex
|
||||||
|
|
|
@ -201,6 +201,12 @@
|
||||||
#ifndef AVAIL_ZLIB
|
#ifndef AVAIL_ZLIB
|
||||||
-DNO_ZLIB //disable zlib
|
-DNO_ZLIB //disable zlib
|
||||||
#endif
|
#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.
|
#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
|
-DLINK_INTERNAL_BULLET
|
||||||
|
|
Loading…
Reference in a new issue