--- ../demeter.4.0/src/SConscript 2006-03-11 05:33:07.000000000 +0100 +++ src/SConscript 2007-04-02 21:10:06.000000000 +0200 @@ -7,6 +7,9 @@ libs = ['opengl32.lib','glu32.lib','glew32d.lib'] else: libs = ['opengl32.lib','glu32.lib','glew32.lib'] +else: + libs = [] + if useOSG == 1: sources += ['DemeterDrawable.cpp'] if microsoftCompiler: @@ -16,6 +19,7 @@ libs += ['OpenThreadsWin32','osg'] else: libs = ['OpenThreads'] + if useSDLImage == 1: sources += ['SDLTextureLoader.cpp'] if useGDAL == 1: --- ../demeter.4.0/SConstruct 2006-03-11 05:33:07.000000000 +0100 +++ SConstruct 2007-04-02 21:07:28.000000000 +0200 @@ -36,7 +36,7 @@ conf = Configure(env) subdirs = ['src/SConscript'] if (samples): - subdirs += ['samples/SampleRawApplication/SConscript','samples/SampleOSGApplication/SConscript'] + subdirs += ['samples/SampleRawApplication/SConscript'] useSDLImage = 0 useGDAL = 0 useOSG = 0 @@ -63,6 +63,9 @@ print '\t[OK] Demeter will be built with support for it.' useOSG = 1 +if samples and useOSG: + subdirs += ['samples/SampleOSGApplication/SConscript'] + if not conf.CheckLib('SDL_image'): print '\t[FAIL] SDL_image is not present on this system. It is' print '\t[FAIL] not strictly required in order to use Demeter,'