---  source/Makefile.orig	Sat May 15 22:08:43 2004
+++  source/Makefile		Sat May 15 22:09:47 2004
@@ -91,20 +91,14 @@
 	BUILDOBJS += buildengine/a.o
 endif
 
-CC = gcc
-CFLAGS = -c -g $(SDL_CFLAGS) -DUSE_SDL=1 -DPLATFORM_UNIX=1 -W -Wall -Wno-unused $(EXTRACFLAGS) -funsigned-char
-
-ifeq ($(strip $(macosx)),true)
-OPTIMIZE = -O3 -mdynamic-no-pic -falign-loops=16
-else
-OPTIMIZE = -O2
-endif
+#CC = gcc
+CFLAGS = -c %%CFLAGS%% $(SDL_CFLAGS) -DUSE_SDL=1 -DPLATFORM_UNIX=1 -W -Wall -Wno-unused $(EXTRACFLAGS) -funsigned-char
 
 # Uncomment this to compile with the Intel compiler (v6.0)
 #CC = icc
 #CFLAGS = -g $(SDL_CFLAGS) -DUSE_SDL=1 -DPLATFORM_UNIX=1 -DUSE_I386_ASM=1 $(EXTRACFLAGS) -O2
 
-LDLIBS = $(SDL_LDFLAGS) -lSDL -lSDL_mixer $(EXTRALDFLAGS)
+LDLIBS = $(SDL_LDFLAGS) -lSDL_mixer $(EXTRALDFLAGS) -L%%X11BASE%%/lib
 
 # !!! FIXME: Do we even need this? It doesn't fly on MacOS X.  --ryan.
 #LDLIBS += -Wl,-E