--- emu64/Makefile.orig	2004-07-15 21:50:36.577147160 +0000
+++ emu64/Makefile	2004-07-15 21:53:11.189642488 +0000
@@ -3,14 +3,9 @@
 CC		=gcc
 CXX		=g++
 
-#CFLAGS		=-DX86 -O3 -mpentium -Wall -DEMU64_DEBUG
-CFLAGS		=-DX86 -O3 -fomit-frame-pointer -funroll-loops -ffast-math -mcpu=athlon -Wall -pipe
-#CFLAGS		=-DX86 -O3 -mcpu=pentium -Wall -g -pg
-#CFLAGS		=-DX86 -Wall -pipe -g3 -DEMU64_DEBUG
-#CFLAGS		=-DX86 -Wall -pipe -g -DEMU64_DEBUG -DCOMPARE_CORE
-#CFLAGS		=-DX86 -Wall -pipe -g
-
-CXXFLAGS	=$(CFLAGS)
+COMFLAGS	=-DX86
+CFLAGS		=$(COMFLAGS)
+CXXFLAGS	=$(COMFLAGS)
 
 GL_PATH		=-I/usr/X11R6/include
 
 #endif /* CONFIG_H */
--- mupen64_input/Makefile.orig	2004-07-15 21:53:51.944446816 +0000
+++ mupen64_input/Makefile	2004-07-15 21:54:34.593963104 +0000
@@ -1,8 +1,5 @@
 #Makefile GRAPHIC
-#CXX  		=g++ -O3 -mpentium -Wall -DEMU64_DEBUG
-#CC		=gcc -O3 -I/usr/X11R6/include -fPIC -fomit-frame-pointer -funroll-loops -ffast-math -mcpu=pentium -pipe
-#CC		=gcc -O3 -mpentium -Wall -g -pg
-CC 		=gcc -O3 -fomit-frame-pointer -funroll-loops -ffast-math -mcpu=athlon -Wall -DUSE_GTK `gtk-config --cflags` -I/usr/X11R6/include -pipe
+CC		=gcc -fPIC
 
 OBJ		=main.o
 
--- hack_azi_rsp_hle/Makefile.orig	2004-07-15 21:56:27.429809448 +0000
+++ hack_azi_rsp_hle/Makefile	2004-07-15 21:57:15.940434712 +0000
@@ -1,9 +1,7 @@
 CC = gcc
-CFLAGS = -DUSE_GTK `gtk-config --cflags` -O3 -mcpu=athlon \
-         -ffast-math -funroll-loops -fomit-frame-pointer
-#CFLAGS = -DUSE_GTK `gtk-config --cflags` -g -fPIC
+CFLAGS = -fPIC -DUSE_GTK `gtk-config --cflags`
 CXX = g++
-CXXFLAGS = $(CFLAGS)
+CXXFLAGS = -fPIC -DUSE_GTK `gtk-config --cflags`
 LD = g++
 LDFLAGS =
 
--- mupen64_sound/Makefile.orig	2004-07-04 04:43:39.000000000 -0500
+++ mupen64_sound/Makefile	2004-12-31 23:53:55.329185760 -0600
@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -ffast-math -mcpu=athlon `gtk-config --cflags` -DUSE_GTK -Wall
+CFLAGS = -fPIC `gtk-config --cflags` -DUSE_GTK
 LD = gcc
 LDFLAGS = -shared -Wl,-Bsymbolic `gtk-config --libs` -lpthread