From b11bb573b0faedd8893237d0cccf55f4ee601b1a Mon Sep 17 00:00:00 2001
From: guillemj <>
Date: Thu, 30 Nov 2006 09:10:25 +0000
Subject: [PATCH] Link against fxmisc/fxos.o and fxmisc/fximg.o to match the
 old library signature, should be checked if it's really needed.

---
 glide3x/cvg/glide3/src/makefile.linux  | 7 +++++++
 glide3x/h3/glide3/src/makefile.linux   | 8 +++++++-
 glide3x/h5/glide3/src/makefile.linux   | 8 +++++++-
 glide3x/sst1/glide3/src/makefile.linux | 7 +++++++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/glide3x/cvg/glide3/src/makefile.linux b/glide3x/cvg/glide3/src/makefile.linux
index 8ff5ab1..4b92ce4 100644
--- a/glide3x/cvg/glide3/src/makefile.linux
+++ b/glide3x/cvg/glide3/src/makefile.linux
@@ -204,6 +204,12 @@ GLIDE_OBJECTS += \
 	../../init/video.o \
 	../../init/fxremap.o
 
+# FIXME: needed for now to match the old library signature, should be checked
+#        if it's really needed.
+GLIDE_OBJECTS += \
+	$(FX_GLIDE_SW)/fxmisc/fxos.o \
+	$(FX_GLIDE_SW)/fxmisc/fximg.o
+
 TEXUS_SOURCES = \
 	$(FX_GLIDE_SW)/texus2/lib/texuslib.c \
 	$(FX_GLIDE_SW)/texus2/lib/clamp.c \
@@ -317,6 +323,7 @@ clean:
 	-$(RM) *.o *.obj *.lo
 	-$(RM) ../../init/*.o ../../init/*.lo
 	-$(RM) $(FX_GLIDE_SW)/newpci/pcilib/*.o $(FX_GLIDE_SW)/newpci/pcilib/*.lo
+	-$(RM) $(FX_GLIDE_SW)/fxmisc/*.o $(FX_GLIDE_SW)/fxmisc/*.lo
 	-$(RM) fxinline.h
 	-$(RM) fxgasm.h
 	-$(RM) $(FX_GLIDE_SW)/texus2/lib/*.o $(FX_GLIDE_SW)/texus2/lib/*.lo
diff --git a/glide3x/h3/glide3/src/makefile.linux b/glide3x/h3/glide3/src/makefile.linux
index 99539b0..d1dc8e8 100644
--- a/glide3x/h3/glide3/src/makefile.linux
+++ b/glide3x/h3/glide3/src/makefile.linux
@@ -201,6 +201,12 @@ GLIDE_OBJECTS += \
 	../../minihwc/hwcio.o \
 	../../minihwc/gdebug.o
 
+# FIXME: needed for now to match the old library signature, should be checked
+#        if it's really needed.
+GLIDE_OBJECTS += \
+	$(FX_GLIDE_SW)/fxmisc/fxos.o \
+	$(FX_GLIDE_SW)/fxmisc/fximg.o
+
 ifeq ($(DRI),1)
 GLIDE_OBJECTS += \
 	../../minihwc/linhwc.o \
@@ -324,7 +330,7 @@ clean:
 	-$(RM) ../../cinit/*.o ../../cinit/*.lo
 	-$(RM) ../../minihwc/*.o ../../minihwc/*.lo
 	-$(RM) $(FX_GLIDE_SW)/newpci/pcilib/*.o $(FX_GLIDE_SW)/newpci/pcilib/*.lo
-	-$(RM) $(FX_GLIDE_SW)/fxmisc/linutil.o $(FX_GLIDE_SW)/fxmisc/linutil.lo
+	-$(RM) $(FX_GLIDE_SW)/fxmisc/*.o $(FX_GLIDE_SW)/fxmisc/*.lo
 	-$(RM) fxinline.h
 	-$(RM) fxgasm.h
 	-$(RM) $(FX_GLIDE_SW)/texus2/lib/*.o $(FX_GLIDE_SW)/texus2/lib/*.lo
diff --git a/glide3x/h5/glide3/src/makefile.linux b/glide3x/h5/glide3/src/makefile.linux
index 9683edb..5f3c671 100644
--- a/glide3x/h5/glide3/src/makefile.linux
+++ b/glide3x/h5/glide3/src/makefile.linux
@@ -233,6 +233,12 @@ GLIDE_OBJECTS += \
 	../../minihwc/hwcio.o \
 	../../minihwc/gdebug.o
 
+# FIXME: needed for now to match the old library signature, should be checked
+#        if it's really needed.
+GLIDE_OBJECTS += \
+	$(FX_GLIDE_SW)/fxmisc/fxos.o \
+	$(FX_GLIDE_SW)/fxmisc/fximg.o
+
 ifeq ($(DRI),1)
 GLIDE_OBJECTS += \
 	../../minihwc/linhwc.o \
@@ -377,7 +383,7 @@ clean:
 	-$(RM) ../../cinit/*.o ../../cinit/*.lo
 	-$(RM) ../../minihwc/*.o ../../minihwc/*.lo
 	-$(RM) $(FX_GLIDE_SW)/newpci/pcilib/*.o $(FX_GLIDE_SW)/newpci/pcilib/*.lo
-	-$(RM) $(FX_GLIDE_SW)/fxmisc/linutil.o $(FX_GLIDE_SW)/fxmisc/linutil.lo
+	-$(RM) $(FX_GLIDE_SW)/fxmisc/*.o $(FX_GLIDE_SW)/fxmisc/*.lo
 	-$(RM) fxinline.h
 	-$(RM) fxgasm.h
 	-$(RM) ../../incsrc/gendate.h
diff --git a/glide3x/sst1/glide3/src/makefile.linux b/glide3x/sst1/glide3/src/makefile.linux
index d2dde65..c982944 100644
--- a/glide3x/sst1/glide3/src/makefile.linux
+++ b/glide3x/sst1/glide3/src/makefile.linux
@@ -202,6 +202,12 @@ GLIDE_OBJECTS += \
 	$(FX_GLIDE_SW)/newpci/pcilib/fxpci.o \
 	$(FX_GLIDE_SW)/newpci/pcilib/fxlinux.o
 
+# FIXME: needed for now to match the old library signature, should be checked
+#        if it's really needed.
+GLIDE_OBJECTS += \
+	$(FX_GLIDE_SW)/fxmisc/fxos.o \
+	$(FX_GLIDE_SW)/fxmisc/fximg.o
+
 TEXUS_SOURCES = \
 	$(FX_GLIDE_SW)/texus2/lib/texuslib.c \
 	$(FX_GLIDE_SW)/texus2/lib/clamp.c \
@@ -343,6 +349,7 @@ clean:
 	-$(RM) ../../init/initvg/*.o ../../init/initvg/*.lo
 	-$(RM) ../../init/init96/*.o ../../init/init96/*.lo
 	-$(RM) $(FX_GLIDE_SW)/newpci/pcilib/*.o $(FX_GLIDE_SW)/newpci/pcilib/*.lo
+	-$(RM) $(FX_GLIDE_SW)/fxmisc/*.o $(FX_GLIDE_SW)/fxmisc/*.lo
 	-$(RM) fxinline.h
 	-$(RM) fxgasm.h
 	-$(RM) $(FX_GLIDE_SW)/texus2/lib/*.o $(FX_GLIDE_SW)/texus2/lib/*.lo