qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 07:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix the libQFrenderer_sw.lai installation error. libtool requires -rpath

Browse source 
for /any/ installed lib, static or not.
This commit is contained in:
Bill Currie 2001-10-24 17:54:56 +00:00
parent dd19f7b500
commit 552a486d87
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -1389,6 +1389,7 @@ SND_REND_TARGETS=""
SND_TARGETS=""
VID_MODEL_TARGETS=""
VID_REND_TARGETS=""
VID_REND_NOINST_TARGETS=""
VID_TARGETS=""
if test "x$HAVE_FBDEV" = xyes; then
@ -1491,7 +1492,7 @@ if test "x$ENABLE_QW_SERVER" = xyes; then
fi
if test "x$BUILD_SW" = xyes; then
VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_sw.la"
VID_REND_NOINST_TARGETS="$VID_REND_NOINST_TARGETS libQFrenderer_sw.la"
VID_MODEL_TARGETS="$VID_MODEL_TARGETS libQFmodels_sw.la"
fi
if test "x$BUILD_SW32" = xyes; then
@ -1629,6 +1630,7 @@ AC_SUBST(SND_REND_TARGETS)
AC_SUBST(SND_TARGETS)
AC_SUBST(VID_MODEL_TARGETS)
AC_SUBST(VID_REND_TARGETS)
AC_SUBST(VID_REND_NOINST_TARGETS)
AC_SUBST(VID_TARGETS)
AM_CONDITIONAL(BUILD_GL, test "$BUILD_GL" = "yes")

6
libs/video/renderer/Makefile.am
View file

@ -2,17 +2,19 @@ SUBDIRS= gl sw sw32
INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES= @VID_REND_TARGETS@
noinst_LTLIBRARIES= @VID_REND_NOINST_TARGETS@
EXTRA_LTLIBRARIES= libQFrenderer_sw.la libQFrenderer_sw32.la libQFrenderer_gl.la
common_sources= r_cvar.c r_efrag.c r_ent.c r_graph.c r_light.c r_main.c r_part.c
libQFrenderer_gl_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir)
libQFrenderer_gl_la_LIBADD= gl/libgl.la
libQFrenderer_gl_la_LIBADD= gl/libgl.la
libQFrenderer_gl_la_SOURCES= $(common_sources)
libQFrenderer_gl_la_DEPENDENCIES= gl/libgl.la
libQFrenderer_sw_la_LIBADD= sw/libsw.la
libQFrenderer_sw_la_LDFLAGS= -static
libQFrenderer_sw_la_LIBADD= sw/libsw.la
libQFrenderer_sw_la_SOURCES= $(common_sources)
libQFrenderer_sw_la_DEPENDENCIES= sw/libsw.la