From 8ac9ff0134552f839ce2c846fd19470e8a8413fd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Jan 2012 19:55:30 +0900
Subject: [PATCH] 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.
---
 libs/Makefile.am         |  2 +-
 libs/models/Makefile.am  | 18 ++++++++++--------
 libs/models/null_model.c |  7 -------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/libs/Makefile.am b/libs/Makefile.am
index 56d482972..0eda60f70 100644
--- a/libs/Makefile.am
+++ b/libs/Makefile.am
@@ -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
diff --git a/libs/models/Makefile.am b/libs/models/Makefile.am
index 43cf30053..835da5d8f 100644
--- a/libs/models/Makefile.am
+++ b/libs/models/Makefile.am
@@ -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)
diff --git a/libs/models/null_model.c b/libs/models/null_model.c
index bfd86964f..0e3df284c 100644
--- a/libs/models/null_model.c
+++ b/libs/models/null_model.c
@@ -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;
-}