eryn/charles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing the build system again

Browse source
This commit is contained in:
Eryn Wells 2013-09-08 14:53:11 -07:00
parent f81e403b16
commit ebcb67a0cc
3 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
SConstruct
View file

@ -76,16 +76,12 @@ charles_lib = env.SConscript(os.path.join(src_dir.path, 'SConscript'),
exports='env', exports='env',
variant_dir=os.path.join('build', src_dir.path), variant_dir=os.path.join('build', src_dir.path),
duplicate=0) duplicate=0)
charles = env.Program(os.path.join('build', 'charles'), charles_lib)
# Build test # Build test
test_dir = Dir('#test') test_dir = Dir('#test')
test_lib = env.SConscript(os.path.join(test_dir.path, 'SConscript'), env.SConscript(os.path.join(test_dir.path, 'SConscript'),
exports='env', exports=['env', 'charles_lib'],
variant_dir=os.path.join('build', test_dir.path), variant_dir=os.path.join('build', test_dir.path),
duplicate=0) duplicate=0)
test_charles = env.Program(os.path.join('build', 'test_charles'), [charles_lib, test_lib])
env.Alias('charles', charles) env.Default('charles')
env.Alias('test', test_charles)
env.Default(charles)

4
src/SConscript
View file

@ -7,7 +7,6 @@ Import('env')
files = Split(""" files = Split("""
basics.c basics.c
camera.c camera.c
charles.c
object.c object.c
scene.c scene.c
texture.c texture.c
@ -15,4 +14,7 @@ files = Split("""
""") """)
lib = env.Library('charles', files) lib = env.Library('charles', files)
prog = env.Program('charles', [lib, 'charles.c'])
env.Alias('charles', prog)
Return('lib') Return('lib')

5
test/SConscript
View file

@ -6,6 +6,7 @@
# Eryn Wells <eryn@erynwells.me> # Eryn Wells <eryn@erynwells.me>
Import('env') Import('env')
Import('charles_lib')
files = Split(""" files = Split("""
test_basics.c test_basics.c
@ -14,5 +15,5 @@ files = Split("""
test_env = env.Clone() test_env = env.Clone()
test_env.Append(LIBS=['check']) test_env.Append(LIBS=['check'])
lib = test_env.Library('test_charles', files, libs=['check']) prog = test_env.Program('test_charles', [charles_lib, files])
Return('lib') env.Alias('test', prog)