From 12c651f4ede3f43a2db09bd6684dd3bad30c3d6e Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Fri, 5 Sep 2008 15:54:23 +0200 Subject: [PATCH] fix name of 'doc' target, remove the OPENGL flag for now --- SConstruct | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index 2b3e2cfd0..9c56cece3 100644 --- a/SConstruct +++ b/SConstruct @@ -79,7 +79,7 @@ def setupBasicEnvironment(): env.Append(CPPDEFINES = '_GNU_SOURCE') appendCppDefine(env,'DEBUG','DEBUG', 'NDEBUG') - appendCppDefine(env,'OPENGL','USE_OPENGL') +# appendCppDefine(env,'OPENGL','USE_OPENGL') appendVal(env,'ARCHFLAGS', 'CCFLAGS') # for both C and C++ appendVal(env,'OPTIMIZE', 'CCFLAGS', val=' -O3') appendVal(env,'DEBUG', 'CCFLAGS', val=' -ggdb') @@ -128,7 +128,7 @@ def defineCmdlineOptions(): allowed_values=('ALPHA', 'BETA', 'RELEASE')) ,BoolOption('DEBUG', 'Build with debugging information and no optimizations', False) ,BoolOption('OPTIMIZE', 'Build with strong optimization (-O3)', False) - ,BoolOption('OPENGL', 'Include support for OpenGL preview rendering', False) +# ,BoolOption('OPENGL', 'Include support for OpenGL preview rendering', False) # ,EnumOption('DIST_TARGET', 'Build target architecture', 'auto', # allowed_values=('auto', 'i386', 'i686', 'x86_64' ), ignorecase=2) ,PathOption('DESTDIR', 'Installation dir prefix', '/usr/local') @@ -337,8 +337,8 @@ def definePostBuildTargets(env, artifacts): env.Clean ('build', [ '$SRCDIR/pre.gch' ]) doxydoc = artifacts['doxydoc'] = env.Doxygen('doc/devel/Doxyfile') - env.Alias ('doxydoc', doxydoc) - env.Clean ('doxydoc', doxydoc + ['doc/devel/,doxylog','doc/devel/warnings.txt']) + env.Alias ('doc', doxydoc) + env.Clean ('doc', doxydoc + ['doc/devel/,doxylog','doc/devel/warnings.txt']) def defineInstallTargets(env, artifacts):