summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorVegard Storheil Eriksen <zyp@jvnv.net>2010-06-13 16:36:03 +0200
committerVegard Storheil Eriksen <zyp@jvnv.net>2010-06-13 16:36:03 +0200
commit6f565ce1110d7f53defe3895255a456fd8adcd4f (patch)
tree18071de2231295f4861cb4c603724fdb6febf291 /SConstruct
parentb4472061c4c23b59a6d4c52e34eb38e68d766807 (diff)
Moved more stuff.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct11
1 files changed, 7 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index 7054033..d50e840 100644
--- a/SConstruct
+++ b/SConstruct
@@ -14,9 +14,8 @@ if env['PLATFORM'] == 'darwin':
env.Append(LINKFLAGS = '')
env.Append(CPPPATH = ['.', '/opt/local/include', '/opt/local/include/freetype2'])
env.Append(LIBS = ['ftgl'])
- env.Append(LIBPATH = ['.', '/opt/local/lib'])
+ env.Append(LIBPATH = ['/opt/local/lib'])
env.Append(FRAMEWORKS = ['SDL', 'SDL_image', 'Cocoa', 'OpenGL', 'AppKit'])
- engine.append('engine/SDLMain.m')
else:
env.Append(LIBS = ['GL', 'GLU', 'SDL', 'SDL_image'])
env.ParseConfig('sdl-config --cflags --libs')
@@ -29,11 +28,15 @@ if GetOption('profiling'):
env.Append(CPPFLAGS = ['-pg'])
env.Append(LINKFLAGS = ['-pg'])
-env.Library('wriggle', Glob('wriggle/*.cpp'))
+Export('env')
+
+env.SConscript('wriggle/SConscript')
env.Append(LIBS = ['wriggle'])
+env.Append(LIBPATH = ['wriggle'])
-env.Library('engine', engine)
+env.Library('engine/engine', engine)
env.Append(LIBS = ['engine'])
+env.Append(LIBPATH = ['engine'])
env.Program('foo', ['main.cpp'])