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

Merge branch 'develop' into feature/yaml-parser-refactoring

Browse source
This commit is contained in:
Eryn Wells 2014-07-25 21:12:45 -07:00
commit 0d9ac3474a
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/SConscript
View file

@ -36,5 +36,6 @@ for f in files:
lib = env.Library('charles', objs)
prog = env.Program('charles', ['charles.cc'], LIBS=[lib, 'png', 'yaml'])
env.Alias('charles', prog)
env.Default('charles')
env.Default('charles')

1
src/object.h
View file

@ -10,6 +10,7 @@
#define __OBJECT_H__
#include <iostream>
#include <memory>
#include <vector>
#include "basics.h"