qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Link libQFmodels* agains libQFimage. 

This is the correct fix for server linking wrt LoadPCX. Sort of. Really, it
would be better to disconnect the dependencies.
This commit is contained in:
Bill Currie 2012-01-27 19:55:30 +09:00
parent 03c7441265
commit 8ac9ff0134
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/Makefile.am
View File

@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS= foreign
# ruamoko depends on gamecode (engine only, not builtins)
# audio depends on gamecode
# console depends on ruamoko and audio
SUBDIRS=util gib gamecode ruamoko models audio console image net qw \
SUBDIRS=util image gib gamecode ruamoko models audio console net qw \
video

18
libs/models/Makefile.am
View File

@ -9,28 +9,30 @@ EXTRA_LTLIBRARIES= libQFmodels_gl.la libQFmodels_glsl.la libQFmodels_sw.la
models_sources = clip_hull.c model.c portal.c skin.c trace.c winding.c
models_libs = $(top_builddir)/libs/image/libQFimage.la $(top_builddir)/libs/util/libQFutil.la
libQFmodels_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -no-undefined
libQFmodels_la_LIBADD= brush/libbrush.la $(top_builddir)/libs/util/libQFutil.la
libQFmodels_la_LIBADD= brush/libbrush.la $(models_libs)
libQFmodels_la_SOURCES= $(models_sources) null_model.c
libQFmodels_la_DEPENDENCIES= brush/libbrush.la
libQFmodels_la_DEPENDENCIES= brush/libbrush.la $(models_libs)
gl_LIBS= \
alias/libalias_gl.la brush/libbrush_gl.la sprite/libsprite_gl.la
libQFmodels_gl_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir)
libQFmodels_gl_la_LIBADD= $(gl_LIBS) $(top_builddir)/libs/util/libQFutil.la
libQFmodels_gl_la_LIBADD= $(gl_LIBS) $(models_libs)
libQFmodels_gl_la_SOURCES= $(models_sources) gl_model_fullbright.c gl_skin.c
libQFmodels_gl_la_DEPENDENCIES= $(gl_LIBS)
libQFmodels_gl_la_DEPENDENCIES= $(gl_LIBS) $(models_libs)
glsl_LIBS= \
alias/libalias_glsl.la brush/libbrush_glsl.la sprite/libsprite_glsl.la
libQFmodels_glsl_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir)
libQFmodels_glsl_la_LIBADD= $(glsl_LIBS) $(top_builddir)/libs/util/libQFutil.la
libQFmodels_glsl_la_LIBADD= $(glsl_LIBS) $(models_libs)
libQFmodels_glsl_la_SOURCES= $(models_sources) glsl_skin.c
libQFmodels_glsl_la_DEPENDENCIES= $(glsl_LIBS)
libQFmodels_glsl_la_DEPENDENCIES= $(glsl_LIBS) $(models_libs)
sw_LIBS= \
alias/libalias_sw.la brush/libbrush_sw.la sprite/libsprite_sw.la
libQFmodels_sw_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir) -no-undefined
libQFmodels_sw_la_LIBADD= $(sw_LIBS) $(top_builddir)/libs/util/libQFutil.la
libQFmodels_sw_la_LIBADD= $(sw_LIBS) $(models_libs)
libQFmodels_sw_la_SOURCES= $(models_sources) sw_skin.c
libQFmodels_sw_la_DEPENDENCIES= $(sw_LIBS)
libQFmodels_sw_la_DEPENDENCIES= $(sw_LIBS) $(models_libs)

7
libs/models/null_model.c
View File

@ -33,7 +33,6 @@ static __attribute__ ((used)) const char rcsid[] =
#include "QF/cvar.h"
#include "QF/model.h"
#include "QF/pcx.h"
#include "QF/render.h"
#include "QF/skin.h"
@ -93,9 +92,3 @@ VISIBLE void
Skin_SetupSkin (skin_t *skin, int cmap)
{
}
VISIBLE struct tex_s *
LoadPCX (QFile *f, qboolean convert, byte *pal)
{
return 0;
}