openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix scons build and tests

Browse Source
This commit is contained in:
Celtic Minstrel
2015-09-30 18:57:52 -04:00
parent 5c37fa199e
commit 56c533f419
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rsrc/SConscript
View File

@@ -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.*"))

1
src/tools/SConscript
View File

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

4
test/SConscript
View File

@@ -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)