move pcx.c and tga.c out of libQFutil and into libQFimage with the hopes

for more image formats :)
This commit is contained in:
Bill Currie 2003-08-15 16:19:10 +00:00
parent 53448a483e
commit 323a6182fd
9 changed files with 28 additions and 5 deletions

View file

@ -1978,7 +1978,7 @@ AC_SUBST(plugin_libadd)
QF_DEPS(BSP2IMG,
[-I$(top_srcdir)/tools/qfbsp/include],
[$(top_builddir)/libs/util/libQFutil.la],
[$(top_builddir)/libs/image/libQFimage.la $(top_builddir)/libs/util/libQFutil.la],
[$(WIN32_LIBS)],
)
QF_DEPS(QFBSP,
@ -2072,11 +2072,12 @@ AC_OUTPUT(
libs/audio/cd/Makefile
libs/audio/targets/Makefile
libs/audio/renderer/Makefile
libs/gib/Makefile
libs/console/Makefile
libs/gamecode/Makefile
libs/gamecode/engine/Makefile
libs/gamecode/builtins/Makefile
libs/gib/Makefile
libs/image/Makefile
libs/models/Makefile
libs/models/alias/Makefile
libs/models/brush/Makefile

View file

@ -1,3 +1,3 @@
AUTOMAKE_OPTIONS= foreign
SUBDIRS= audio console gamecode gib models net video util
SUBDIRS= audio console gamecode gib image models net video util

7
libs/image/.gitignore vendored Normal file
View file

@ -0,0 +1,7 @@
*.la
*.lo
.deps
.libs
.vimrc
Makefile
Makefile.in

13
libs/image/Makefile.am Normal file
View file

@ -0,0 +1,13 @@
AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES= libQFimage.la
libQFimage_la_LDFLAGS= -version-info 1:0:0
libQFimage_la_LIBADD=
libQFimage_la_DEPENDENCIES=
libQFimage_la_SOURCES= \
pcx.c tga.c
EXTRA_DIST=

View file

@ -28,8 +28,8 @@ libQFutil_la_DEPENDENCIES= libasm.la
libQFutil_la_SOURCES= \
bspfile.c buildnum.c cbuf.c checksum.c cmd.c crc.c cvar.c dstring.c \
fendian.c getopt.c getopt1.c hash.c idparse.c info.c link.c llist.c \
mathlib.c mdfour.c msg.c pakfile.c pcx.c plugin.c qargs.c qendian.c \
qfplist.c quakefs.c quakeio.c riff.c sizebuf.c string.c sys.c tga.c \
mathlib.c mdfour.c msg.c pakfile.c plugin.c qargs.c qendian.c \
qfplist.c quakefs.c quakeio.c riff.c sizebuf.c string.c sys.c \
va.c ver_check.c wad.c zone.c $(fnmatch)
EXTRA_DIST= $(asm_src) $(fnmatch_src)

View file

@ -73,6 +73,7 @@ common_LIBFILES= \
$(top_builddir)/libs/console/libQFconsole.la \
$(top_builddir)/libs/gamecode/builtins/libQFgamecode_builtins.la \
$(top_builddir)/libs/gamecode/engine/libQFgamecode.la \
$(top_builddir)/libs/image/libQFimage.la \
$(top_builddir)/libs/util/libQFutil.la \
$(top_builddir)/libs/gib/libQFgib.la

View file

@ -104,6 +104,7 @@ qf_client_LIBS= \
$(top_builddir)/libs/gamecode/engine/libQFgamecode.la \
$(top_builddir)/libs/audio/libQFcd.la \
$(top_builddir)/libs/audio/libQFsound.la \
$(top_builddir)/libs/image/libQFimage.la \
$(top_builddir)/libs/util/libQFutil.la \
$(top_builddir)/libs/gib/libQFgib.la