From 669a78de12871d23f2c94b3c79c9c8518e3592dd Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Sat, 28 Apr 2012 19:38:07 +0000 Subject: [PATCH] Compiletime options in Makefile overwritable from console And a small fix that shuts up a compiler warning --- Makefile | 12 ++++++------ src/unix/hunk.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 6bd6491b..1b04ca10 100644 --- a/Makefile +++ b/Makefile @@ -23,29 +23,29 @@ # for the background music and doesn't add any further # dependencies. It should work on all platforms where # CD playback is supported by SDL. -WITH_CDA=yes +WITH_CDA:=yes # Enables OGG/Vorbis support. OGG/Vorbis files can be # used as a substitute of CD audio playback. Adds # dependencies to libogg, libvorbis and libvorbisfile. -WITH_OGG=yes +WITH_OGG:=yes # Enables the optional OpenAL sound systems. Adds # a dependencx to libopenal -WITH_OPENAL=yes +WITH_OPENAL:=yes # Enables retexturing support. Adds a dependency to # libjpeg -WITH_RETEXTURING=yes +WITH_RETEXTURING:=yes # Set the gamma via X11 and not via SDL. This works # around problems in some SDL version. Adds dependencies # to pkg-config, libX11 and libXxf86vm -WITH_X11GAMMA=no +WITH_X11GAMMA:=no # Enables opening of ZIP files (also known as .pk3 packs). # Adds a dependency to libz -WITH_ZIP=yes +WITH_ZIP:=yes # ====================================================== # # !!! DO NOT ALTER ANYTHING BELOW THIS LINE !!! # diff --git a/src/unix/hunk.c b/src/unix/hunk.c index 68610328..278ff6e7 100644 --- a/src/unix/hunk.c +++ b/src/unix/hunk.c @@ -26,7 +26,7 @@ /* For mremap() - must be before sys/mman.h include! */ -#if defined( __linux__ ) +#if defined( __linux__ ) && ! defined( _GNU_SOURCE ) #define _GNU_SOURCE #endif