avoid circular dependency by moving modes/modes.h to modes.h

This commit is contained in:
Josh Holtrop 2010-11-24 16:38:12 -05:00
parent 7886c42288
commit 2544ff381a
3 changed files with 3 additions and 3 deletions

View File

@ -2,4 +2,4 @@ glob:.scons*
glob:*.o glob:*.o
glob:dwss glob:dwss
glob:LoadFile-gen.inc glob:LoadFile-gen.inc
^modes/modes.h$ ^modes.h$

View File

@ -23,7 +23,7 @@ sources = [Glob('*.c'), Glob('*.cc'), Glob('LoadFile/*.cc')]
env.LoadFile('LoadFile-gen.inc', load_files) env.LoadFile('LoadFile-gen.inc', load_files)
env.Depends('LoadFile-gen.inc', 'genLoadFile.pl') env.Depends('LoadFile-gen.inc', 'genLoadFile.pl')
env.Modes('modes/modes.h', Glob('modes/*.h')) env.Modes('modes.h', Glob('modes/*.h'))
dwss = env.Program('dwss', sources) dwss = env.Program('dwss', sources)

View File

@ -9,7 +9,7 @@
#include <GL/glu.h> #include <GL/glu.h>
#include "GnomeScreensaver.h" #include "GnomeScreensaver.h"
#include "modes/modes.h" #include "modes.h"
using namespace std; using namespace std;