--- Makefile.linux.orig	Fri Apr 30 17:57:48 1999
+++ Makefile.linux	Thu Jul  1 09:57:11 1999
@@ -6,7 +6,7 @@
 #GLIDE=1
 
 ifdef ZSNESFX
-FXOBJ=i386/zsnes.o
+FXOBJ=i386/zsnes.o fxinst.o fxemu.o fxdbg.o
 FXDEFINES=-DZSNES_FX -DEXECUTE_SUPERFX_PER_LINE
 FXDEPENDS=zsnes_fx
 FXNO_DEPENDS=c_fx
@@ -17,7 +17,7 @@
 FXNO_DEPENDS=zsnes_fx
 endif
 
-LINUXDEFINES=-DUSE_DGA_EXTENSION -DUSE_VIDMODE_EXTENSION
+LINUXDEFINES=-DUSE_DGA_EXTENSION -DUSE_VIDMODE_EXTENSION -D__linux
 
 ifdef ASMCPU
 ifdef SPC700ASM
@@ -59,8 +59,8 @@
 GLIDENO_DEPENDS=use_glide
 endif
 
-CCC = gcc
-CC = gcc
+CCC = egcc
+CC = egcc
 NASM = nasm
 
 INCLUDES=-I/usr/X11R6/include -I/usr/local/include
@@ -71,7 +71,6 @@
 -Ii386 \
 -I. \
 -Iunzip \
--DJOYSTICK_SUPPORT \
 -DZLIB \
 -DNO_INLINE_SET_GET \
 -DVAR_CYCLES \
@@ -101,7 +100,7 @@
 # system using the egcs compiler get an undefined __register_frame_info
 # symbol error when run on a Redhat box.
 
-LDLIBS = -L/usr/X11R6/lib frame.o
+LDLIBS = -L/usr/X11R6/lib
 
 ifdef GLIDE
 ifdef NETPLAY