From e6806397b9607ea71a7d29092d00c1436685f9e3 Mon Sep 17 00:00:00 2001
From: Marcus Comstedt <marcus@mc.pp.se>
Date: Thu, 13 May 2010 00:13:57 +0200
Subject: [PATCH] Use system g++ and SDL/OpenAL on Linux

---
 makefile.old | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/makefile.old b/makefile.old
index c042a08..b790e48 100644
--- a/makefile.old
+++ b/makefile.old
@@ -101,12 +101,15 @@ ifeq ($(strip $(macosx)),true)
   	LDFLAGS += -framework Cocoa -framework OpenGL -framework IOKit -framework CoreFoundation -framework Carbon -framework OpenAL
   	LDFLAGS += ./libSDL-1.2.0.dylib ./libSDLmain-osx.a
 else
-	CXX := /opt/crosstool/gcc-4.1.2-glibc-2.3.6/i686-unknown-linux-gnu/i686-unknown-linux-gnu/bin/g++
-	CC := /opt/crosstool/gcc-4.1.2-glibc-2.3.6/i686-unknown-linux-gnu/i686-unknown-linux-gnu/bin/gcc
-	LD := /opt/crosstool/gcc-4.1.2-glibc-2.3.6/i686-unknown-linux-gnu/i686-unknown-linux-gnu/bin/g++
+	CXX := g++
+	CC := gcc
+	LD := g++
 
   	CFLAGS += -DPLATFORM_LINUX=1
-  	LDFLAGS += ./libSDL-1.2.so.0 -Wl,-rpath,\$$ORIGIN
+  	LDFLAGS += `pkg-config --libs sdl`
+	INCLUDES += `pkg-config --cflags sdl`
+	# Don't use bundled headers
+	SDLDIR := /dummy
 
   	ifeq ($(strip $(use_devil)),true)
     	LDFLAGS += ./libIL.so.1 ./libILU.so.1 ./libILUT.so.1
@@ -115,7 +118,10 @@ else
   	ifeq ($(strip $(use_fmod)),true)
     	POSTLDFLAGS += -lpthread ./libfmod-linux-x86.a
   	else
-    	LDFLAGS += ./libopenal.so.1
+    	LDFLAGS += `pkg-config --libs openal`
+    	INCLUDES += `pkg-config --cflags openal`
+	# Don't use bundled headers
+	OPENALDIR := /dummy
   	endif
 endif
 
-- 
2.39.2