--- Makefile.orig	Thu Jun 17 23:58:24 2004
+++ Makefile	Sun Jul 24 14:38:41 2005
@@ -4,7 +4,6 @@
 # For more information, please visit http://www.garthgillespie.com/annelid/ .
 
 # Comment the next line for non-windows.  This is not well tested.
-WINDOWS=1
 
 ifdef WINDOWS
 NAME=annelid.exe
@@ -14,16 +13,16 @@
 
 OBJS=main.o mixer.o highscore.o texture.o centeredtexture.o fonttexture.o scrolltexture.o targa.o worm.o apple.o powerup.o visual.o
 
-CC=gcc
-CCC=g++
-CFLAGS=-I. `sdl-config --cflags` -c -Wall -ggdb -fomit-frame-pointer -O3
+CCC=$(CXX)
+CFLAGS=%%CFLAGS%% -I. -I%%X11BASE%%/include `sdl-config --cflags` -c -Wall $(OPT)
+OPT = -fomit-frame-pointer -O3
 
-LD=g++
+LD=$(CXX)
 
 ifdef WINDOWS
 LIBS=-lopengl32 `sdl-config --libs`
 else
-LIBS=-L/usr/X11R6/lib -lGL `sdl-config --libs`
+LIBS=-L%%X11BASE%%/lib -lGL `sdl-config --libs`
 endif
 
 all: $(NAME)