diff --git a/glide2x/h3/glide/src/makefile.linux b/glide2x/h3/glide/src/makefile.linux index b951e7c..f439d4e 100644 --- a/glide2x/h3/glide/src/makefile.linux +++ b/glide2x/h3/glide/src/makefile.linux @@ -84,7 +84,7 @@ CDEFS = -D__linux__ XPATH ?= /usr/X11R6/lib ifeq ($(DRI),1) CDEFS += -DDRI_BUILD -DX11 -LDFLAGS = -L$(XPATH) +LDFLAGS = -L$(XPATH) LDLIBS = -lX11 -lXext -lXxf86dga -lXxf86vm endif @@ -112,6 +112,8 @@ override USE_FIFO = 1 ifeq ($(USE_X86),1) CDEFS += -DGLIDE_DISPATCH_SETUP=1 -DGLIDE_DISPATCH_DOWNLOAD=1 override USE_FIFO = 1 +CDEFS += -DHAVE_XDRAWTRI_ASM=1 +override USE_DRAWTRI_ASM = 1 else CDEFS += -DGLIDE_USE_C_TRISETUP=1 endif @@ -139,7 +141,7 @@ ASFLAGS = -O6 -felf -D__linux__ ASFLAGS += $(CDEFS) # compiler -CFLAGS = -Wall -W +CFLAGS = -Wall CFLAGS += -I. -I../../incsrc -I../../minihwc -I../../cinit CFLAGS += -I$(FX_GLIDE_SW)/fxmisc -I$(FX_GLIDE_SW)/newpci/pcilib -I$(FX_GLIDE_SW)/fxmemmap CFLAGS += $(CDEFS) @@ -192,6 +194,9 @@ GLIDE_OBJECTS = \ cpuid.o \ xtexdl_def.o +ifeq ($(USE_DRAWTRI_ASM),1) +GLIDE_OBJECTS += xdrawtri.o +endif ifeq ($(USE_X86),1) GLIDE_OBJECTS += \ xdraw2_def.o \ @@ -257,7 +262,7 @@ $(GLIDE_LIBDIR)/$(GLIDE_SO): $(GLIDE_LIBDIR)/$(GLIDE_SHARED) ln -fs $(GLIDE_SHARED) $(GLIDE_LIBDIR)/$(GLIDE_SO) $(GLIDE_LIBDIR)/$(GLIDE_SHARED): $(GLIDE_OBJECTS:.o=.lo) - $(CC) -o $@ -shared -Wl,-soname,$(GLIDE_SONAME) $^ $(LDFLAGS) $(LDLIBS) + $(CC) -o $@ -shared -Wl,--no-undefined -Wl,-soname,$(GLIDE_SONAME) $^ $(LDFLAGS) $(LDLIBS) ############################################################################### # rules(2) @@ -275,6 +280,8 @@ xdraw3_3dnow.o: xdraw3.asm $(AS) -o $@ $(ASFLAGS) -DGL_AMD3D=1 $< xtexdl_3dnow.o: xtexdl.asm $(AS) -o $@ $(ASFLAGS) -DGL_AMD3D=1 $< +xdrawtri.o: xdrawtri.asm + $(AS) -o $@ $(ASFLAGS) $< cpuid.lo: cpuid.o $(CP) $< $@ @@ -288,6 +295,8 @@ xdraw3_3dnow.lo: xdraw3_3dnow.o $(CP) $< $@ xtexdl_3dnow.lo: xtexdl_3dnow.o $(CP) $< $@ +xdrawtri.lo: xdrawtri.o + $(CP) $< $@ $(GLIDE_OBJECTS): fxinline.h fxgasm.h @@ -309,7 +318,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