Merge pull request #1 from bentley/sconsdict

Use arrays instead of dicts. Fixes build on OpenBSD.
This commit is contained in:
sinamas 2013-06-01 07:42:42 -07:00
commit 70426fd776

View File

@ -9,7 +9,7 @@ vars.Add('CXX')
env = Environment(CPPPATH = ['src', '../libgambatte/include', '../common'],
CFLAGS = cflags,
CXXFLAGS = cxxflags,
CPPDEFINES = { 'HAVE_STDINT_H': None },
CPPDEFINES = [ 'HAVE_STDINT_H', None ],
variables = vars)
env.ParseConfig('sdl-config --cflags --libs')
@ -44,11 +44,11 @@ conf = env.Configure()
conf.CheckLib('z')
conf.Finish()
version_str_def = {}
version_str_def = []
if Dir('../.git').exists():
try:
git_revno = subprocess.check_output("git rev-list HEAD --count", shell=True).strip()
version_str_def = { 'GAMBATTE_SDL_VERSION_STR': r'\"r' + git_revno + r'\"' }
version_str_def = [ 'GAMBATTE_SDL_VERSION_STR', r'\"r' + git_revno + r'\"' ]
except subprocess.CalledProcessError:
pass