From 73b8178a771b277a11ba09b7c75005335bec04fc Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Thu, 9 Aug 2012 21:32:04 +0100 Subject: [PATCH] Check for bzip2 headers and libs in sconscript, fixes #68 --- SConscript | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/SConscript b/SConscript index 516ee8098..ed885242c 100644 --- a/SConscript +++ b/SConscript @@ -92,6 +92,15 @@ if not conf.CheckLib('fftw3f') and not conf.CheckLib('fftw3f-3'): print "libfftw3f not found or not installed" raise SystemExit(1) +#Check for Bzip lib +if not conf.CheckLib('bz2'): + print "libbz2 not found or not installed" + raise SystemExit(1) + +if not conf.CheckCHeader("bzlib.h"): + print "bzip2 headers not found" + raise SystemExit(1) + #Check for Lua lib if not conf.CheckLib('lua') and not conf.CheckLib('lua5.1') and not conf.CheckLib('lua51') and not conf.CheckLib('lua-5.1'): print "liblua not found or not installed" @@ -101,7 +110,7 @@ env = conf.Finish(); env.Append(CPPPATH=['src/', 'data/', 'generated/']) env.Append(CCFLAGS=['-w', '-std=c99', '-fkeep-inline-functions']) -env.Append(LIBS=['pthread', 'm', 'bz2']) +env.Append(LIBS=['pthread', 'm']) env.Append(CPPDEFINES=["USE_SDL", "LUACONSOLE", "GRAVFFT", "_GNU_SOURCE", "USE_STDINT", "_POSIX_C_SOURCE=200112L"]) if GetOption("ptw32-static"):