--- Makefile.orig	2009-02-02 19:09:59.000000000 +0300
+++ Makefile	2009-02-17 02:45:45.000000000 +0300
@@ -4,19 +4,18 @@
 MKDIR=mkdir
 CP=cp
 RM=rm -f
-CPP=c++
+CPP=${CXX}
 
-INCLUDES = -I psi3d -I source -I .
+INCLUDES = -I psi3d -I source -I . `${SDL_CONFIG} --cflags`
 
 ifneq (,$(findstring Win,$(OS)))
 	LIBRARIES= -lmingw32 -lSDLmain -lSDL -lOpenGL32 -lGLU32 -lopenal32 -lalut
 	TARGET=dist/linwarrior.exe
 else
-	LIBRARIES= -lGL -lGLU -lSDL -lopenal -lalut
+	LIBRARIES= -lGL -lGLU `${SDL_CONFIG} --libs` -lopenal -lalut
 	TARGET=dist/linwarrior
 endif
 
-CFLAGS =-Wp,-M,-MP,-MT,$@,-MF,dep/$(subst /,-,$@).d
 #CFLAGS =-Wp,-M,-MP,-MT,$@,-MF,dep/$(@F).d
 CFLAGS += $(INCLUDES)
 
