Link against fxmisc/fxos.o and fxmisc/fximg.o to match the old library

signature, should be checked if it's really needed.
This commit is contained in:
guillemj
2006-11-30 09:10:25 +00:00
parent 019a1ff4dc
commit b11bb573b0
4 changed files with 28 additions and 2 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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