--- a/ccdemos/SConscript Wed Apr 09 17:55:29 2008 +0200
+++ b/ccdemos/SConscript Thu Apr 10 23:20:36 2008 +0200
@@ -1,11 +1,9 @@
Import('env lib')
-env.Append(CPPPATH = ['.','#include'], LIBPATH='#build/lib', LIBS='pyrit')
+env.Append(CPPPATH = ['.','#include'], LIBPATH='#build/lib')
+env.Prepend(LIBS=['pyrit','png'])
-import os
-SDL_CCFLAGS = os.popen('sdl-config --cflags').read()
-SDL_LDFLAGS = os.popen('sdl-config --libs').read()
sdlenv = env.Clone()
-sdlenv.Append(LINKFLAGS=SDL_LDFLAGS, CCFLAGS=SDL_CCFLAGS)
+sdlenv.ParseConfig('sh sdl-config --cflags --libs')
l = []
image_obj = env.Object('image.c', CC="$CXX")
@@ -13,7 +11,7 @@
l.append( sdlenv.Program(['realtime.cc']) )
l.append( sdlenv.Program(['realtime_bunny.cc']) )
l.append( sdlenv.Program(['realtime_dragon.cc']) )
-l.append( sdlenv.Program(['spheres_shadow.cc']+image_obj, LIBS="$LIBS:png") )
-l.append( sdlenv.Program(['textures.cc']+image_obj, LIBS="$LIBS:png") )
+l.append( sdlenv.Program(['spheres_shadow.cc']+image_obj) )
+l.append( sdlenv.Program(['textures.cc']+image_obj) )
env.Alias('cc-demos', l)