Mercurial > hg > dmlib

changeset 877:4a2ed354ab4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use ?= in the Makefiles to accept preset values.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 04 Feb 2015 19:07:16 +0200
parents 8d909205b0fd
children ac6066a31ec7
files Makefile Makefile.w32
diffstat 2 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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