# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1423069636 -7200
# Node ID 4a2ed354ab4c8af87852ef82b944ba8bdc955b8c
# Parent  8d909205b0fd380b4139862b3249e503b97922cc
Use ?= in the Makefiles to accept preset values.

diff -r 8d909205b0fd -r 4a2ed354ab4c Makefile
--- a/Makefile	Wed Feb 04 18:00:48 2015 +0200
+++ b/Makefile	Wed Feb 04 19:07:16 2015 +0200
@@ -1,19 +1,19 @@
 #
 # Generic UNIX targets
 #
-DMLIB = ./
+DMLIB ?= ./
 BINPATH ?= 
 OBJPATH ?= ./obj/unix/
 EXEEXT ?=
 PREFIX ?= /usr/local
-INSTALL = install
-RANLIB = ranlib
+INSTALL ?= install
+RANLIB ?= ranlib
 
-SDL_CFLAGS=`sdl-config --cflags`
-SDL_LDFLAGS=`sdl-config --static-libs`
+SDL_CFLAGS=`pkg-config --cflags sdl`
+SDL_LDFLAGS=`pkg-config --libs sdl`
 
-SDL_TTF_CFLAGS=
-SDL_TTF_LDFLAGS=-lSDL_ttf
+SDL_TTF_CFLAGS=`pkg-config --cflags SDL_ttf`
+SDL_TTF_LDFLAGS=`pkg-config --libs SDL_ttf`
 
 TREMOR_CFLAGS=`pkg-config --cflags ogg`
 TREMOR_LDFLAGS=/usr/lib/libvorbisidec.a `pkg-config --variable=libdir ogg`/libogg.a
diff -r 8d909205b0fd -r 4a2ed354ab4c Makefile.w32
--- a/Makefile.w32	Wed Feb 04 18:00:48 2015 +0200
+++ b/Makefile.w32	Wed Feb 04 19:07:16 2015 +0200
@@ -1,13 +1,13 @@
 #
 # For win32 version cross-compilation with MinGW suite @ Linux
 #
-DMLIB = ./
-BINPATH=./exe/
-OBJPATH=./obj/win32/
-EXEEXT=.exe
+DMLIB ?= ./
+BINPATH ?= ./exe/
+OBJPATH ?= ./obj/win32/
+EXEEXT ?= .exe
 
-MINGW_PREFIX=i686-w64-mingw32-
-MINGW_PATH=/usr/i686-w64-mingw32
+MINGW_PREFIX ?= i686-w64-mingw32-
+MINGW_PATH ?= /usr/i686-w64-mingw32
 
 # C-compiler, flags and linker flags
 CC=$(MINGW_PREFIX)gcc