Fix scons build and tests

octareenroon91 · Sep 30, 2015 · 56c533f · 56c533f
1 parent 5c37fa1
commit 56c533f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/rsrc/SConscript b/rsrc/SConscript
@@ -7,12 +7,12 @@ Import("env platform data_dir install_dir")
 
 # Data
 
-env.Install(data_dir, Dir("cursors"))
-env.Install(data_dir, Dir("dialogs"))
-env.Install(data_dir, Dir("fonts"))
-env.Install(data_dir, Dir("graphics"))
-env.Install(data_dir, Dir("sounds"))
-env.Install(data_dir, Dir("strings"))
+env.Install(path.join(data_dir, "cursors"), Glob("cursors/*.gif"))
+env.Install(path.join(data_dir, "dialogs"), Glob("dialogs/*.xml"))
+env.Install(path.join(data_dir, "fonts"), Glob("fonts/*.ttf"))
+env.Install(path.join(data_dir, "graphics"), Glob("graphics/*.png"))
+env.Install(path.join(data_dir, "sounds"), Glob("sounds/*.WAV"))
+env.Install(path.join(data_dir, "strings"), Glob("strings/*.txt"))
 
 env.Install(path.join(data_dir, "shaders"), Glob("#src/tools/mask.*"))
 

diff --git a/src/tools/SConscript b/src/tools/SConscript
@@ -13,6 +13,7 @@ tools = Split("""
 	tarball.cpp
 	undo.cpp
 	gzstream/gzstream.cpp
+	resmgr/restypes.cpp
 """)
 
 if str(platform) == "darwin":

diff --git a/test/SConscript b/test/SConscript
@@ -19,7 +19,7 @@ def run_tests(env,target,source):
       open(target[0].abspath,'w').write("PASSED\n")
 
 env.Install("#build/test/", test)
-env.Install("#build/test/", Dir("#test/files"))
-env.Install("#build/rsrc/", Dir("#rsrc/strings"))
+env.AlwaysBuild(env.Install("#build/test/", Dir("#test/files")))
+env.AlwaysBuild(env.Install("#build/rsrc/", Dir("#rsrc/strings")))
 env.Command("#build/test/junk/", '', 'mkdir "' + Dir("#build/test/junk").path + '"')
 env.Command("#build/test/passed", test, run_tests, chdir=True)