qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-29 20:20:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

autoconfiscate the png support

Browse source
This commit is contained in:
Bill Currie 2003-09-08 14:32:54 +00:00
parent cb5f57fb51
commit 61a2840870
3 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
configure.ac
View file

@ -543,6 +543,22 @@ if test "x$enable_zlib" != "xno"; then
fi fi
fi fi
AC_ARG_ENABLE(png,
[ --disable-png disaple png support],
)
HAVE_PNG=no
PNG_LIBS=""
if test "x$enable_zlib" != "xno"; then
AC_CHECK_LIB(png, png_set_read_fn, HAVE_PNG=yes, HAVE_PNG=no, [$LIBS])
if test "x$HAVE_PNG" = "xyes"; then
AC_CHECK_HEADER(png.h, HAVE_PNG=yes, HAVE_PNG=no)
if test "x$HAVE_PNG" = "xyes"; then
PNG_LIBS="-lpng"
AC_DEFINE(HAVE_PNG, 1, [Define if you have libpng])
fi
fi
fi
AC_SUBST(PNG_LIBS)
AC_ARG_WITH(ipv6, AC_ARG_WITH(ipv6,
[ --with-ipv6=DIR enable IPv6 support. Optional argument specifies [ --with-ipv6=DIR enable IPv6 support. Optional argument specifies
@ -2185,7 +2201,7 @@ AC_MSG_RESULT([
Sound support :${SOUND_TYPES- no} Sound support :${SOUND_TYPES- no}
CD Audio system :${CDTYPE- no} CD Audio system :${CDTYPE- no}
IPv6 networking : $NETTYPE_IPV6 IPv6 networking : $NETTYPE_IPV6
Compression support: gz=$HAVE_ZLIB ogg=$HAVE_VORBIS Compression support: gz=$HAVE_ZLIB ogg=$HAVE_VORBIS png=$HAVE_PNG
Compiler version : $CCVER Compiler version : $CCVER
Compiler flags : $CFLAGS Compiler flags : $CFLAGS
qfcc cpp invocation: $CPP_NAME qfcc cpp invocation: $CPP_NAME

2
libs/image/Makefile.am
View file

@ -5,7 +5,7 @@ INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES= libQFimage.la lib_LTLIBRARIES= libQFimage.la
libQFimage_la_LDFLAGS= -version-info 1:0:0 libQFimage_la_LDFLAGS= -version-info 1:0:0
libQFimage_la_LIBADD= -lpng libQFimage_la_LIBADD= $(PNG_LIBS)
libQFimage_la_DEPENDENCIES= libQFimage_la_DEPENDENCIES=
libQFimage_la_SOURCES= \ libQFimage_la_SOURCES= \
image.c pcx.c png.c tga.c image.c pcx.c png.c tga.c

14
libs/image/png.c
View file

@ -31,6 +31,8 @@
static __attribute__ ((unused)) const char rcsid[] = static __attribute__ ((unused)) const char rcsid[] =
"$Id$"; "$Id$";
#ifdef HAVE_PNG
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
# include <string.h> # include <string.h>
#endif #endif
@ -176,3 +178,15 @@ LoadPNG (QFile *infile)
return (tex); return (tex);
} }
#else
#include "QF/image.h"
tex_t *
LoadPNG (QFile *infile)
{
return 0;
}
#endif