From 6f565ce1110d7f53defe3895255a456fd8adcd4f Mon Sep 17 00:00:00 2001 From: Vegard Storheil Eriksen Date: Sun, 13 Jun 2010 16:36:03 +0200 Subject: Moved more stuff. --- SConstruct | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'SConstruct') 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']) -- cgit v1.2.3