From dfd57da14f2a6ba50779705c9c8888a88f895780 Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Sun, 13 Jul 2014 09:23:42 -0700
Subject: [PATCH] Correcting some build problems with old-style SConscripts

---
 lib/gtest/SConscript | 6 +++++-
 src/SConscript       | 4 +++-
 test/SConscript      | 8 ++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/gtest/SConscript b/lib/gtest/SConscript
index 42a81b0..8187e5e 100644
--- a/lib/gtest/SConscript
+++ b/lib/gtest/SConscript
@@ -6,6 +6,11 @@
 import os.path
 
 Import('env')
+Import('build_env')
+
+include_dir = env.Dir('include').srcnode()
+env.Append(CPPPATH=[include_dir])
+build_env.Append(CPPPATH=[include_dir])
 
 
 files = [
@@ -23,6 +28,5 @@ objs = []
 for f in files:
     objs.append(env.Object(f))
 
-env.Append(CPPPATH=[Dir('include').srcnode()])
 
 gtest = env.Library('gtest', objs)
diff --git a/src/SConscript b/src/SConscript
index 2bd0114..22f8bd8 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -30,5 +30,7 @@ for f in files:
     objs.append(env.Object(f))
 
 lib = env.Library('charles', files)
-prog = env.Program('charles', [lib, 'charles.cc'])
+prog = env.Program('charles', ['charles.cc'], LIBS=[lib, 'png'])
 env.Alias('charles', prog)
+
+env.Default('charles')
diff --git a/test/SConscript b/test/SConscript
index a795720..d876dbe 100644
--- a/test/SConscript
+++ b/test/SConscript
@@ -5,16 +5,12 @@
 Import('env')
 
 
-test_env = env.Clone()
-test_env.Append(CPPDEFINES='GTEST_USE_OWN_TR1_TUPLE')
-
-
 subdirs = [
     # TODO: Put subdirectories here.
 ]
 
 for d in subdirs:
-    env.SConscript(env.Dir(d).File('SConscript'), {'env': test_env})
+    env.SConscript(env.Dir(d).File('SConscript'), {'env': env})
 
 
 files = [
@@ -27,5 +23,5 @@ for f in files:
     objs.append(env.Object(f))
 
 
-prog = test_env.Program('test_charles', files, libs=[gtest, charles])
+prog = env.Program('test_charles', objs, LIBS=['gtest', 'charles'])
 env.Alias('test', prog)