--- Makefile.orig	2010-02-05 22:50:30.000000000 +0300
+++ Makefile	2010-04-04 06:18:24.000000000 +0400
@@ -2,7 +2,7 @@
 # Makefile with auto-dependency generation
 
 # Add Include directories here.
-INCLUDES = -I . 
+INCLUDES = -I . `${SDL_CONFIG} --cflags`
 
 # Automatic searching for source files.
 # Objects to compile are all sources (cpp) and put the .o below build-dir.
@@ -20,18 +20,17 @@
 	LIMITER=$(dir \file)
 	CFLAGS+= -static-libgcc
 else
-	LIBRARIES= -lGL -lGLU -lSDL -lopenal -lalut
+	LIBRARIES= -lGL -lGLU `${SDL_CONFIG} --libs` -lopenal -lalut
 	TARGET=dist/linwarrior
 	MKDIR=mkdir
 	RM=rm -f
 	RMREC=rm -f -r
 	CP=cp
-	CPP=c++
+	CPP=${CXX}
 	LIMITER=/
 endif
 
 # Creation of dependency information when compiling.
-CFLAGS += -Wp,-M,-MP,-MT,$@,-MF,dep/$(subst /,-,$@).d
 
 # Print warnings when compiling.
 CFLAGS += -Wall
@@ -40,7 +39,6 @@
 CFLAGS += $(INCLUDES)
 
 # Optimizations.
-CFLAGS += -O1 -funroll-loops
 
 # Default makefile Target.
 all: $(TARGET)