diff -ru ../../work/release/Makefile ./Makefile
--- ../../work/release/Makefile	Wed Sep 22 18:46:14 1999
+++ ./Makefile	Wed Dec 29 01:54:04 1999
@@ -3,9 +3,9 @@
 #SPC700ASM=1
 NETPLAY=1
 UNZIP=1
-GLIDE=1
+#GLIDE=1
 #GUI=1
-THREAD_SOUND=1
+#THREAD_SOUND=1
 
 ifdef ZSNESFX
 FXOBJ=i386/fxemu2b.o i386/fxemu2.o i386/fxemu2c.o i386/fxtable.o i386/sfxproc.o i386/zsnes.o
@@ -73,13 +73,13 @@
 endif
 
 MOC = $(QTDIR)/bin/moc
-CCC = g++ -fno-rtti
-CC = gcc
+CCC = ${CXX} -fno-rtti
+CC ?= gcc
 NASM = nasm
 
 INCLUDES=-I/usr/X11R6/include -I/usr/local/include
 
-OPTIMISE=-O6 -mpentium -fomit-frame-pointer -fno-exceptions
+OPTIMISE= ${CXXFLAGS} -fomit-frame-pointer
 #OPTIMISE=-g -fno-exceptions 
 #-DMITSHM 
 
@@ -87,7 +87,6 @@
 -Ii386 \
 -I. \
 -Iunzip \
--DJOYSTICK_SUPPORT \
 -DZLIB \
 -DNO_INLINE_SET_GET \
 -DVAR_CYCLES \
@@ -100,7 +99,8 @@
 $(NETPLAYDEFINES) \
 $(UNZIPDEFINES) \
 $(GLIDEDEFINES) \
-$(GUIDEFINES)
+$(GUIDEFINES) \
+-DSOUND
 
 #-DSOUND
 #-DDEBUGGER
@@ -112,12 +112,12 @@
 CFLAGS=$(CCFLAGS)
 
 .SUFFIXES: .o .cpp .c .cc .h .m .i .S .asm
-LDLIBS = -L/usr/X11R6/lib frame.o
+LDLIBS = -L/usr/X11R6/lib
 
 ifdef NETPLAY
-all: offsets snes9x ssnes9x s9xserver
+all: offsets snes9x s9xserver
 else
-all: offsets snes9x ssnes9x
+all: offsets snes9x
 endif
 
 #ggisnes9x
@@ -236,5 +236,4 @@
 snaporig.o: cpuexec.h
 unix/x11.o: snes9x.h port.h
 unix/glide.o: snes9x.h port.h 3d.h
-unix/x11.o: unix/snes9x_gui.h
 unix/snes9x_gui.o: unix/snes9x_gui.h