diff --git a/glide2x/sst1/glide/src/gdraw.c b/glide2x/sst1/glide/src/gdraw.c
index 34415c4..10b5eeb 100644
--- a/glide2x/sst1/glide/src/gdraw.c
+++ b/glide2x/sst1/glide/src/gdraw.c
@@ -336,10 +336,9 @@ all_done:  /* come here on degenerate lines */
 ** grDrawTriangle
 */
 
-#if !defined(__linux__) || defined(GLIDE_USE_C_TRISETUP) || defined(GLIDE_DEBUG)
+#if defined(GLIDE_USE_C_TRISETUP) || defined(__WATCOMC__) /* why is Watcom special-case?? */
 GR_ENTRY(grDrawTriangle, void, ( const GrVertex *a, const GrVertex *b, const GrVertex *c ))
 {
-#if defined(GLIDE_USE_C_TRISETUP) || defined( __WATCOMC__ ) || defined( GLIDE_DEBUG )
   GR_BEGIN_NOFIFOCHECK("grDrawTriangle",92);
   GDBG_INFO_MORE((gc->myLevel,"(0x%x,0x%x,0x%x)\n",a,b,c));
   GR_CHECK_F(myName, !a || !b || !c, "NULL pointer passed");
@@ -380,15 +379,6 @@ if (0) {                        /* GMT: only use this if needed */
 
 all_done:
   GR_END();
-#else
-#if defined( __linux__ )
-  asm("jmp grDrawTriangle_asm");
-#endif
-#  if defined( __MSC__ )
-  extern void grDrawTriangle_asm(void);
-  {_asm jmp grDrawTriangle_asm}
-#  endif
-#endif
 } /* grDrawTriangle */
 #endif
 
diff --git a/glide2x/sst1/glide/src/xdraw.asm b/glide2x/sst1/glide/src/xdraw.asm
index 35c4638..858257c 100644
--- a/glide2x/sst1/glide/src/xdraw.asm
+++ b/glide2x/sst1/glide/src/xdraw.asm
@@ -171,8 +171,10 @@ segment		SEG_TEXT
 ;--------------------------------------------------------------------------        
 
             align 4
+%if XOS != XOS_WATCD ; gdraw.c special-cases __WATCOMC__ , for what reason???
 proc grDrawTriangle, 12
 endp
+%endif
 %if XOS == XOS_WIN32
 %ifdef __MINGW32__
 ; GNU LD fails with '_' prefix
diff --git a/glide2x/sst1/glide/src/xdraw96.asm b/glide2x/sst1/glide/src/xdraw96.asm
index eb3150b..3e2015a 100644
--- a/glide2x/sst1/glide/src/xdraw96.asm
+++ b/glide2x/sst1/glide/src/xdraw96.asm
@@ -172,8 +172,10 @@ segment		SEG_TEXT
 ;--------------------------------------------------------------------------        
 
             align 4
+%if XOS != XOS_WATCD ; gdraw.c special-cases __WATCOMC__ , for what reason???
 proc grDrawTriangle, 12
 endp
+%endif
 %if XOS == XOS_WIN32
 %ifdef __MINGW32__
 ; GNU LD fails with '_' prefix