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