From 8e9505c100a32048e9b33a3340e8d49198f7c2f8 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Tue, 23 Oct 2001 18:48:49 +0000 Subject: [PATCH] /finally/ get asm in the sw renderer when not using --disable-shared. libtool was using the wrong objects. --- libs/video/renderer/sw/Makefile.am | 2 ++ libs/video/renderer/sw/nonintel.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/video/renderer/sw/Makefile.am b/libs/video/renderer/sw/Makefile.am index d6d9a1bc2..8447a64a7 100644 --- a/libs/video/renderer/sw/Makefile.am +++ b/libs/video/renderer/sw/Makefile.am @@ -24,8 +24,10 @@ sw_src= \ sw_redge.c sw_rmain.c sw_rmisc.c sw_rpart.c sw_rsky.c sw_rsprite.c \ sw_rsurf.c sw_skin.c +libasm_la_LDFLAGS= -static libasm_la_SOURCES= $(asm_src) +libsw_la_LDFLAGS= -static libsw_la_SOURCES= $(sw_src) if ASM_ARCH libsw_la_LIBADD= $(asm) diff --git a/libs/video/renderer/sw/nonintel.c b/libs/video/renderer/sw/nonintel.c index 59354382d..eab047268 100644 --- a/libs/video/renderer/sw/nonintel.c +++ b/libs/video/renderer/sw/nonintel.c @@ -37,7 +37,7 @@ static const char rcsid[] = #ifndef USE_INTEL_ASM -extern int r_bmodelactive; //FIXME this shouldn't even be getting compiled +int r_bmodelactive; void