diff --git a/glide3x/Makefile.DJ b/glide3x/Makefile.DJ index 658fac7..ac7be26 100644 --- a/glide3x/Makefile.DJ +++ b/glide3x/Makefile.DJ @@ -411,8 +411,10 @@ clean: -$(call UNLINK,$(FX_GLIDE_SW)/newpci/pcilib/*.o) -$(call UNLINK,$(FX_GLIDE_HW)/glide3/src/fxinline.h) -$(call UNLINK,$(FX_GLIDE_HW)/glide3/src/fxgasm.h) +ifeq ($(FX_GLIDE_HW),h5) -$(call UNLINK,$(GENDATE)) -$(call UNLINK,$(FXBLDNO)) +endif -$(call UNLINK,$(FX_GLIDE_SW)/texus2/lib/*.o) realclean: clean diff --git a/glide3x/cvg/glide3/src/fxgasm.c b/glide3x/cvg/glide3/src/fxgasm.c index 09139de..69fd8e1 100644 --- a/glide3x/cvg/glide3/src/fxgasm.c +++ b/glide3x/cvg/glide3/src/fxgasm.c @@ -161,6 +161,9 @@ main (int argc, char **argv) OFFSET (gc,state.cull_mode,"cull_mode\t"); #ifndef GLIDE3 OFFSET (gc, regDataList,"regDataList\t"); +#endif +#ifdef GLIDE_DEBUG + OFFSET (gc,checkPtr,"checkPtr\t\t"); #endif OFFSET (gc, tsuDataList,"tsuDataList\t"); #ifdef GLIDE3_SCALER diff --git a/glide3x/cvg/glide3/src/gtexdl.c b/glide3x/cvg/glide3/src/gtexdl.c index 0132a06..061feb6 100644 --- a/glide3x/cvg/glide3/src/gtexdl.c +++ b/glide3x/cvg/glide3/src/gtexdl.c @@ -19,6 +19,9 @@ ** ** $Header$ ** $Log$ +** Revision 1.1.1.1.8.2 2003/11/07 13:38:38 dborca +** unite the clans +** ** Revision 1.1.1.1.8.1 2003/11/03 13:34:29 dborca ** Voodoo2 happiness (DJGPP & Linux) ** @@ -451,7 +454,7 @@ GR_ENTRY(grTexDownloadTableExt, { GR_BEGIN_NOFIFOCHECK("grTexDownloadTableExt",89); GDBG_INFO_MORE(gc->myLevel,"(%d,%d,0x%x)\n",tmu,type,data); - GR_CHECK_TMU(FN_NAME,tmu); + /*GR_CHECK_TMU(FN_NAME,tmu);*/ GR_CHECK_F(myName, type > GR_TEXTABLE_PALETTE_6666_EXT, "invalid table specified"); GR_CHECK_F(myName, !data, "invalid data pointer");