summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2011-07-15 14:30:17 +0100
committerJosé Fonseca <jfonseca@vmware.com>2011-07-15 14:30:17 +0100
commit12e52eb5b8dcb3b866c8b6085ef021dae253663f (patch)
tree994e61b1953782f09d5ba5ed0c23df30d53c8f82
parentd4263e22f1a405652b80c7bd6ebf0be380b30c4d (diff)
Drop scons build support.
Broken on windows 64 bits, and obsoleted by CMake, which needs much less customization/tweaking to work as desired.
-rw-r--r--.gitignore2
-rw-r--r--doc/html/build.html1
-rw-r--r--doc/html/buildscons.html75
-rw-r--r--scons/crossmingw.py185
-rw-r--r--src/SConscript1
-rw-r--r--src/SConstruct236
-rw-r--r--src/glean/SConscript87
-rw-r--r--src/libs/SConscript1
-rw-r--r--src/libs/dsurf/SConscript11
-rw-r--r--src/libs/image/SConscript16
-rw-r--r--src/libs/lex/SConscript10
-rw-r--r--src/libs/rand/SConscript0
-rw-r--r--src/libs/stats/SConscript10
-rw-r--r--src/libs/timer/SConscript10
-rw-r--r--src/tiff/SConscript166
-rw-r--r--src/tools/SConscript1
-rw-r--r--src/tools/difftiff/SConscript16
-rw-r--r--src/tools/showtiff/SConscript16
-rw-r--r--src/tools/showvis/SConscript15
19 files changed, 0 insertions, 859 deletions
diff --git a/.gitignore b/.gitignore
index bbbbc02..0b143a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
.*.sw?
-.scon*
*.a
*.dep
*.exe
@@ -13,4 +12,3 @@
*.so
*.zip
build
-config.log
diff --git a/doc/html/build.html b/doc/html/build.html
index 28b3a81..b23fb5b 100644
--- a/doc/html/build.html
+++ b/doc/html/build.html
@@ -59,7 +59,6 @@ Once you've completed those tasks, choose one of the following:
<LI><A HREF="buildgnu.html">Building <I>glean</I> for GNU/Linux</A></LI>
<LI><A HREF="buildwin.html">Building <I>glean</I> for Windows</A></LI>
<LI><A HREF="buildcmake.html">Building <I>glean</I> for GNU/Linux or Windows using cmake</A></LI>
- <LI><A HREF="buildscons.html">Building <I>glean</I> for GNU/Linux or Windows using scons</A></LI>
</UL>
diff --git a/doc/html/buildscons.html b/doc/html/buildscons.html
deleted file mode 100644
index 5be8d05..0000000
--- a/doc/html/buildscons.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-
-<HEAD>
- <TITLE>Building glean using scons</TITLE>
- <META NAME="description" CONTENT="building glean using scons">
- <META NAME="author" CONTENT="Jose Fonseca">
- <LINK REV="made" HREF="mailto:jfonseca@vmware.com">
-</HEAD>
-
-<BODY bgcolor=#FFFFFF topmargin="10" bottommargin="10" leftmargin="10"
- rightmargin="10" marginheight="0" marginwidth="0">
-
-<H1>Building <I>glean</I> with scons</H1>
-
-<P>
-Now you can build glean on GNU/Linux or Windows using
-<A HREF="http://www.scons.org/">scons</A>. The advantages over GNU make are:
-<UL TYPE=DISC>
- <LI> no need to set build options &mdash; everything is autodetected;
- <LI> automatically uses an included tiff library if none can be found;
- <LI> support to cross build from GNU/Linux to Windows using MinGW cross
- compilers.
-</UL>
-
-<H2>Build <I>glean</I> on GNU/Linux or Windows</H2>
-
-<P>
-Simply type
-<PRE>
- scons -C src
-</PRE>
-
-<P>
-Everything should be autodetected for you.
-
-<P>
-You can change aspects of the build by passing options in the name=value. To
-list these options and see their default value do
-<PRE>
- scons -C src -h
-</PRE>
-
-
-<H2>Build <I>glean</I> for Windows on GNU/Linux</H2>
-
-<P>
-Type
-<PRE>
- scons -C src platform=windows machine=x86 toolchain=crossmingw
-</PRE>
-
-
-<HR>
-<SMALL>
- <UL TYPE=DISC>
- <LI> <A HREF="index.html"><I>glean</I> home</A>
- <LI> <A HREF="whatis.html">What is <I>glean</I>?</A>
- <LI> <A HREF="build.html">How do I build <I>glean</I>?</A>
- <LI> <A HREF="run.html">How do I run <I>glean</I>?</A>
- <LI> <A HREF="next.html">Where do we go from here?</A>
- <UL TYPE=CIRCLE>
- <LI> <A HREF="newtest.html">Adding new tests</A>
- <LI> <A HREF="newfeat.html">Adding new infrastructure features</A>
- <LI> <A HREF="overview.html">Overview of <I>glean</I> internals</A>
- <LI> <A HREF="repo.html">Creating a repository of results</A>
- <LI> <A HREF="port.html">Porting <I>glean</I></A>
- <LI> <A HREF="cleanup.html">Cleaning up loose ends</A>
- </UL>
- <LI> <A HREF="changes.html">What has changed recently?</A>
- </UL>
-</SMALL>
-
-</BODY>
-</HTML>
diff --git a/scons/crossmingw.py b/scons/crossmingw.py
deleted file mode 100644
index bf81f16..0000000
--- a/scons/crossmingw.py
+++ /dev/null
@@ -1,185 +0,0 @@
-"""SCons.Tool.gcc
-
-Tool-specific initialization for MinGW (http://www.mingw.org/)
-
-There normally shouldn't be any need to import this module directly.
-It will usually be imported through the generic SCons.Tool.Tool()
-selection method.
-
-See also http://www.scons.org/wiki/CrossCompilingMingw
-"""
-
-#
-# Copyright (c) 2001, 2002, 2003, 2004 The SCons Foundation
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-import os
-import os.path
-import string
-
-import SCons.Action
-import SCons.Builder
-import SCons.Tool
-import SCons.Util
-
-# This is what we search for to find mingw:
-prefixes = SCons.Util.Split("""
- mingw32-
- mingw32msvc-
- i386-mingw32-
- i486-mingw32-
- i586-mingw32-
- i686-mingw32-
- i386-mingw32msvc-
- i486-mingw32msvc-
- i586-mingw32msvc-
- i686-mingw32msvc-
-""")
-
-def find(env):
- for prefix in prefixes:
- # First search in the SCons path and then the OS path:
- if env.WhereIs(prefix + 'gcc') or SCons.Util.WhereIs(prefix + 'gcc'):
- return prefix
-
- return ''
-
-def shlib_generator(target, source, env, for_signature):
- cmd = SCons.Util.CLVar(['$SHLINK', '$SHLINKFLAGS'])
-
- dll = env.FindIxes(target, 'SHLIBPREFIX', 'SHLIBSUFFIX')
- if dll: cmd.extend(['-o', dll])
-
- cmd.extend(['$SOURCES', '$_LIBDIRFLAGS', '$_LIBFLAGS'])
-
- implib = env.FindIxes(target, 'LIBPREFIX', 'LIBSUFFIX')
- if implib: cmd.append('-Wl,--out-implib,'+implib.get_string(for_signature))
-
- def_target = env.FindIxes(target, 'WIN32DEFPREFIX', 'WIN32DEFSUFFIX')
- if def_target: cmd.append('-Wl,--output-def,'+def_target.get_string(for_signature))
-
- return [cmd]
-
-def shlib_emitter(target, source, env):
- dll = env.FindIxes(target, 'SHLIBPREFIX', 'SHLIBSUFFIX')
- no_import_lib = env.get('no_import_lib', 0)
-
- if not dll:
- raise SCons.Errors.UserError, "A shared library should have exactly one target with the suffix: %s" % env.subst("$SHLIBSUFFIX")
-
- if not no_import_lib and \
- not env.FindIxes(target, 'LIBPREFIX', 'LIBSUFFIX'):
-
- # Append an import library to the list of targets.
- target.append(env.ReplaceIxes(dll,
- 'SHLIBPREFIX', 'SHLIBSUFFIX',
- 'LIBPREFIX', 'LIBSUFFIX'))
-
- # Append a def file target if there isn't already a def file target
- # or a def file source. There is no option to disable def file
- # target emitting, because I can't figure out why someone would ever
- # want to turn it off.
- def_source = env.FindIxes(source, 'WIN32DEFPREFIX', 'WIN32DEFSUFFIX')
- def_target = env.FindIxes(target, 'WIN32DEFPREFIX', 'WIN32DEFSUFFIX')
- if not def_source and not def_target:
- target.append(env.ReplaceIxes(dll,
- 'SHLIBPREFIX', 'SHLIBSUFFIX',
- 'WIN32DEFPREFIX', 'WIN32DEFSUFFIX'))
-
- return (target, source)
-
-
-shlib_action = SCons.Action.Action(shlib_generator, generator=1)
-
-res_action = SCons.Action.Action('$RCCOM', '$RCCOMSTR')
-
-res_builder = SCons.Builder.Builder(action=res_action, suffix='.o',
- source_scanner=SCons.Tool.SourceFileScanner)
-SCons.Tool.SourceFileScanner.add_scanner('.rc', SCons.Defaults.CScan)
-
-def generate(env):
- mingw_prefix = find(env)
-
- if mingw_prefix:
- dir = os.path.dirname(env.WhereIs(mingw_prefix + 'gcc') or SCons.Util.WhereIs(mingw_prefix + 'gcc'))
-
- # The mingw bin directory must be added to the path:
- path = env['ENV'].get('PATH', [])
- if not path:
- path = []
- if SCons.Util.is_String(path):
- path = string.split(path, os.pathsep)
-
- env['ENV']['PATH'] = string.join([dir] + path, os.pathsep)
-
- # Most of mingw is the same as gcc and friends...
- gnu_tools = ['gcc', 'g++', 'gnulink', 'ar', 'gas']
- for tool in gnu_tools:
- SCons.Tool.Tool(tool)(env)
-
- #... but a few things differ:
- env['CC'] = mingw_prefix + 'gcc'
- env['SHCCFLAGS'] = SCons.Util.CLVar('$CCFLAGS')
- env['CXX'] = mingw_prefix + 'g++'
- env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
- env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -shared')
- env['SHLINKCOM'] = shlib_action
- env.Append(SHLIBEMITTER = [shlib_emitter])
- env['LINK'] = mingw_prefix + 'g++'
- env['AR'] = mingw_prefix + 'ar'
- env['RANLIB'] = mingw_prefix + 'ranlib'
- env['LINK'] = mingw_prefix + 'g++'
- env['AS'] = mingw_prefix + 'as'
- env['WIN32DEFPREFIX'] = ''
- env['WIN32DEFSUFFIX'] = '.def'
- env['SHOBJSUFFIX'] = '.o'
- env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1
-
- env['RC'] = mingw_prefix + 'windres'
- env['RCFLAGS'] = SCons.Util.CLVar('')
- env['RCCOM'] = '$RC $_CPPDEFFLAGS $_CPPINCFLAGS ${INCPREFIX}${SOURCE.dir} $RCFLAGS -i $SOURCE -o $TARGET'
- env['BUILDERS']['RES'] = res_builder
-
- # Some setting from the platform also have to be overridden:
- env['OBJPREFIX'] = ''
- env['OBJSUFFIX'] = '.o'
- env['SHOBJPREFIX'] = '$OBJPREFIX'
- env['SHOBJSUFFIX'] = '$OBJSUFFIX'
- env['PROGPREFIX'] = ''
- env['PROGSUFFIX'] = '.exe'
- env['LIBPREFIX'] = 'lib'
- env['LIBSUFFIX'] = '.a'
- env['SHLIBPREFIX'] = ''
- env['SHLIBSUFFIX'] = '.dll'
- env['LIBPREFIXES'] = [ 'lib', '' ]
- env['LIBSUFFIXES'] = [ '.a', '.lib' ]
-
- # MinGW port of gdb does not handle well dwarf debug info which is the
- # default in recent gcc versions
- env.AppendUnique(CFLAGS = ['-gstabs'])
-
- env.AppendUnique(LIBS = ['iberty'])
- env.AppendUnique(SHLINKFLAGS = ['-Wl,--enable-stdcall-fixup'])
- #env.AppendUnique(SHLINKFLAGS = ['-Wl,--kill-at'])
-
-def exists(env):
- return find(env)
diff --git a/src/SConscript b/src/SConscript
deleted file mode 100644
index f2b3d26..0000000
--- a/src/SConscript
+++ /dev/null
@@ -1 +0,0 @@
-SConscript(dirs = ['libs', 'glean', 'tools'])
diff --git a/src/SConstruct b/src/SConstruct
deleted file mode 100644
index 37be39a..0000000
--- a/src/SConstruct
+++ /dev/null
@@ -1,236 +0,0 @@
-import os
-import platform
-import sys
-
-_platform_map = {
- 'darwin': 'darwin',
- 'freebsd': 'freebsd',
- 'linux2': 'linux',
- 'win32': 'windows',
-}
-
-default_platform = _platform_map.get(sys.platform, 'unix')
-
-_machine_map = {
- 'x86': 'x86',
- 'i386': 'x86',
- 'i486': 'x86',
- 'i586': 'x86',
- 'i686': 'x86',
- 'ppc' : 'ppc',
- 'x86_64': 'x86_64',
-}
-if 'PROCESSOR_ARCHITECTURE' in os.environ:
- default_machine = os.environ['PROCESSOR_ARCHITECTURE']
-else:
- default_machine = platform.machine()
-default_machine = _machine_map.get(default_machine, 'generic')
-
-if default_platform == 'windows':
- default_prefix = os.path.join(os.environ.get('ProgramFiles', 'C:\\Program Files'), 'glean')
-else:
- default_prefix = '/usr/local'
-
-vars = Variables()
-vars.Add(BoolVariable('debug', 'debug build', 'yes'))
-vars.Add(EnumVariable('platform', 'target platform', default_platform,
- allowed_values=('linux', 'freebsd', 'unix', 'other', 'windows', 'darwin')))
-vars.Add(EnumVariable('machine', 'use machine-specific assembly code', default_machine,
- allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
-vars.Add(EnumVariable('toolchain', 'compiler toolchain', 'default',
- allowed_values=('default', 'crossmingw')))
-vars.Add(PathVariable('prefix', 'installation prefix', default_prefix, PathVariable.PathIsDirCreate))
-if platform.machine() == 'win32':
- vars.Add(EnumVariable('MSVS_VERSION', 'Microsoft Visual Studio version', None,
- allowed_values=('7.1', '8.0', '9.0')))
-
-env = Environment(variables=vars)
-Help(vars.GenerateHelpText(env))
-
-Export(['env'])
-
-env.Tool(env['toolchain'], ['../scons'])
-
-env['gcc'] = 'gcc' in os.path.basename(env['CC']).split('-')
-env['msvc'] = env['CC'] == 'cl'
-
-# C preprocessor options
-cppdefines = []
-if not env['debug']:
- cppdefines += ['NDEBUG']
-if env['platform'] == 'windows':
- cppdefines += [
- 'WIN32',
- '_CONSOLE',
- '_MBCS',
- ]
- if env['debug']:
- cppdefines += ['_DEBUG']
-env.Append(CPPDEFINES = cppdefines)
-
-# C compiler options
-cflags = [] # C
-cxxflags = [] # C++
-ccflags = [] # C & C++
-if env['gcc']:
- if env['debug']:
- ccflags += ['-O0', '-g3']
- else:
- ccflags += ['-O3', '-g0']
- if env['machine'] == 'x86':
- ccflags += ['-m32']
- if env['machine'] == 'x86_64':
- ccflags += ['-m64']
- # See also:
- # - http://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
- ccflags += [
- '-Wall',
- '-Wmissing-field-initializers',
- '-Wpointer-arith',
- '-fmessage-length=0', # be nice to Eclipse
- ]
- cflags += [
- '-Wdeclaration-after-statement',
- '-Wmissing-prototypes',
- ]
-if env['msvc']:
- if env['debug']:
- ccflags += [
- '/Od', # disable optimizations
- '/Oi', # enable intrinsic functions
- '/Oy-', # disable frame pointer omission
- '/GL-', # disable whole program optimization
- ]
- else:
- ccflags += [
- '/O2', # optimize for speed
- ]
- ccflags += [
- '/EHsc', # set exception handling model
- #'/W3', # warning level
- #'/Wp64', # enable 64 bit porting warnings
- ]
- # Automatic pdb generation
- # See http://scons.tigris.org/issues/show_bug.cgi?id=1656
- env.EnsureSConsVersion(0, 98, 0)
- env['PDB'] = '${TARGET.base}.pdb'
-env.Append(CCFLAGS = ccflags)
-env.Append(CFLAGS = cflags)
-env.Append(CXXFLAGS = cxxflags)
-
-if env['platform'] == 'windows' and env['msvc']:
- # Choose the appropriate MSVC CRT
- # http://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx
- if env['debug']:
- env.Append(CCFLAGS = ['/MTd'])
- env.Append(SHCCFLAGS = ['/LDd'])
- else:
- env.Append(CCFLAGS = ['/MT'])
- env.Append(SHCCFLAGS = ['/LD'])
-
-# Assembler options
-if env['gcc']:
- if env['machine'] == 'x86':
- env.Append(ASFLAGS = ['-m32'])
- if env['machine'] == 'x86_64':
- env.Append(ASFLAGS = ['-m64'])
-
-# Linker options
-linkflags = []
-if env['gcc']:
- if env['machine'] == 'x86':
- linkflags += ['-m32']
- if env['machine'] == 'x86_64':
- linkflags += ['-m64']
-if env['platform'] == 'windows' and env['msvc']:
- # See also:
- # - http://msdn2.microsoft.com/en-us/library/y0zzbyt4.aspx
- linkflags += [
- '/fixed:no',
- '/incremental:no',
- ]
-env.Append(LINKFLAGS = linkflags)
-
-if env['platform'] in ('freebsd', 'linux', 'unix'):
- env.Append(CPPDEFINES = [
- '__UNIX__',
- '__X11__',
- ])
- env.Prepend(LIBS = [
- 'GLU',
- 'GL',
- ])
-
-if env['platform'] == 'windows':
- env.Append(CPPDEFINES = [
- '__WIN__',
- '__MS__',
- ])
- env.Prepend(LIBS = [
- 'glu32',
- 'opengl32',
- 'gdi32',
- 'user32',
- 'kernel32',
- ])
-
-if env['platform'] == 'darwin':
- env.Append(CPPDEFINES = [
- '__UNIX__',
- '__AGL__',
- ])
- env.Prepend(FRAMEWORKS = [
- 'AGL',
- 'Carbon',
- 'GLUT',
- 'OpenGL',
- ])
-
-variant = env['platform']
-if env['machine'] != 'generic':
- variant += '-' + env['machine']
-if env['debug']:
- variant += '-debug'
-env['variant'] = variant
-
-# Put all SCons' persistent data in the build dir
-build_dir = os.path.join('..', 'build', variant)
-env.SConsignFile(os.path.join(build_dir, 'sign'))
-env['CONFIGUREDIR'] = os.path.join(build_dir, 'conf')
-env['CONFIGURELOG'] = os.path.join(build_dir, 'config.log')
-
-conf = Configure(env)
-if not conf.CheckCHeader('GL/glext.h'):
- conf.env.Prepend(CPPPATH = ['#glext'])
-if conf.CheckCHeader('GL/glut.h'):
- if env['platform'] == 'windows':
- conf.env.Prepend(LIBS = ['glut32'])
- else:
- conf.env.Prepend(LIBS = ['glut'])
- conf.env['glut'] = True
-else:
- conf.env['glut'] = False
-has_tiff = conf.CheckCHeader('tiff.h')
-env = conf.Finish()
-
-if has_tiff:
- conf.env.Prepend(LIBS = ['tiff'])
-else:
- SConscript(['tiff/SConscript'])
- Import(['tiff'])
- conf.env.Prepend(CPPPATH = ['#tiff'])
- conf.env.Prepend(LIBS = [tiff])
-
-env.Prepend(CPPPATH = [
- '#glh',
- '#libs/dsurf',
- '#libs/image',
- '#libs/lex',
- '#libs/rand',
- '#libs/stats',
- '#libs/timer',
-])
-
-env.VariantDir(build_dir, '.', duplicate=0)
-
-SConscript('SConscript', variant_dir=build_dir, duplicate=0)
diff --git a/src/glean/SConscript b/src/glean/SConscript
deleted file mode 100644
index 3a39966..0000000
--- a/src/glean/SConscript
+++ /dev/null
@@ -1,87 +0,0 @@
-import os.path
-
-Import(['*'])
-
-env = env.Clone()
-
-env.Prepend(LIBS = [
- dsurf,
- lex,
- image,
- stats,
- timer,
-])
-
-main = [
- 'codedid.cpp',
- 'dsurf.cpp',
- 'environ.cpp',
- 'geomrend.cpp',
- 'geomutil.cpp',
- 'glutils.cpp',
- 'main.cpp',
- 'misc.cpp',
- 'options.cpp',
- 'rc.cpp',
- 'test.cpp',
- 'winsys.cpp',
-]
-
-tests = [
- 'tapi2.cpp',
- 'tbasic.cpp',
- 'tbasicperf.cpp',
- 'tbinding.cpp',
- 'tblend.cpp',
- 'tbufferobject.cpp',
- 'tchgperf.cpp',
- 'tclipflat.cpp',
- 'tdepthstencil.cpp',
- 'tfbo.cpp',
- 'tfpexceptions.cpp',
- 'tfragprog1.cpp',
- 'tgetstr.cpp',
- 'tglsl1.cpp',
- 'tlogicop.cpp',
- 'tmaskedclear.cpp',
- 'tmultitest.cpp',
- 'toccluqry.cpp',
- 'torthpos.cpp',
- 'tpaths.cpp',
- 'tpbo.cpp',
- 'tpgos.cpp',
- 'tpixelformats.cpp',
- 'tpointatten.cpp',
- 'tpointsprite.cpp',
- 'treadpix.cpp',
- 'treadpixperf.cpp',
- 'trgbtris.cpp',
- 'tscissor.cpp',
- 'tshaderapi.cpp',
- 'tstencil2.cpp',
- 'tteapot.cpp',
- 'ttexcombine4.cpp',
- 'ttexcombine.cpp',
- 'ttexcube.cpp',
- 'ttexenv.cpp',
- 'ttexgen.cpp',
- 'ttexrect.cpp',
- 'ttexswizzle.cpp',
- 'ttexture_srgb.cpp',
- 'ttexunits.cpp',
- 'tvertattrib.cpp',
- 'tvertarraybgra.cpp',
- 'tvertprog1.cpp',
- 'tvtxperf.cpp',
-]
-
-glean = env.Program(
- target = 'glean',
- source = main + tests,
-)
-
-env.Default(glean)
-
-bin_dir = os.path.join(env['prefix'], 'bin')
-env.Install(bin_dir, glean)
-env.Alias('install', bin_dir)
diff --git a/src/libs/SConscript b/src/libs/SConscript
deleted file mode 100644
index 2b3fdc0..0000000
--- a/src/libs/SConscript
+++ /dev/null
@@ -1 +0,0 @@
-SConscript(dirs = ['rand', 'timer', 'stats', 'image', 'lex', 'dsurf'])
diff --git a/src/libs/dsurf/SConscript b/src/libs/dsurf/SConscript
deleted file mode 100644
index f34aace..0000000
--- a/src/libs/dsurf/SConscript
+++ /dev/null
@@ -1,11 +0,0 @@
-Import(['env'])
-
-dsurf = env.StaticLibrary(
- target = 'dsurf',
- source = [
- 'dsconfig.cpp',
- 'dsfilt.cpp',
- ],
-)
-
-Export(['dsurf'])
diff --git a/src/libs/image/SConscript b/src/libs/image/SConscript
deleted file mode 100644
index f3e1344..0000000
--- a/src/libs/image/SConscript
+++ /dev/null
@@ -1,16 +0,0 @@
-Import(['env'])
-
-image = env.StaticLibrary(
- target = 'image',
- source = [
- 'gl.cpp',
- 'misc.cpp',
- 'pack.cpp',
- 'rdtiff.cpp',
- 'reg.cpp',
- 'unpack.cpp',
- 'wrtiff.cpp',
- ],
-)
-
-Export(['image'])
diff --git a/src/libs/lex/SConscript b/src/libs/lex/SConscript
deleted file mode 100644
index ba4d967..0000000
--- a/src/libs/lex/SConscript
+++ /dev/null
@@ -1,10 +0,0 @@
-Import(['env'])
-
-lex = env.StaticLibrary(
- target = 'lex',
- source = [
- 'lex.cpp',
- ],
-)
-
-Export(['lex'])
diff --git a/src/libs/rand/SConscript b/src/libs/rand/SConscript
deleted file mode 100644
index e69de29..0000000
--- a/src/libs/rand/SConscript
+++ /dev/null
diff --git a/src/libs/stats/SConscript b/src/libs/stats/SConscript
deleted file mode 100644
index 694f56f..0000000
--- a/src/libs/stats/SConscript
+++ /dev/null
@@ -1,10 +0,0 @@
-Import(['env'])
-
-stats = env.StaticLibrary(
- target = 'stats',
- source = [
- 'basic.cpp',
- ],
-)
-
-Export(['stats'])
diff --git a/src/libs/timer/SConscript b/src/libs/timer/SConscript
deleted file mode 100644
index ab3bd5a..0000000
--- a/src/libs/timer/SConscript
+++ /dev/null
@@ -1,10 +0,0 @@
-Import(['env'])
-
-timer = env.StaticLibrary(
- target = 'timer',
- source = [
- 'timer.cpp',
- ],
-)
-
-Export(['timer'])
diff --git a/src/tiff/SConscript b/src/tiff/SConscript
deleted file mode 100644
index 276dbab..0000000
--- a/src/tiff/SConscript
+++ /dev/null
@@ -1,166 +0,0 @@
-# $Id: SConstruct,v 1.2 2006/03/23 14:54:00 dron Exp $
-
-# Tag Image File Format (TIFF) Software
-#
-# Copyright (C) 2005, Andrey Kiselev <dron@ak4719.spb.edu>
-#
-# Permission to use, copy, modify, distribute, and sell this software and
-# its documentation for any purpose is hereby granted without fee, provided
-# that (i) the above copyright notices and this permission notice appear in
-# all copies of the software and related documentation, and (ii) the names of
-# Sam Leffler and Silicon Graphics may not be used in any advertising or
-# publicity relating to the software without the specific, prior written
-# permission of Sam Leffler and Silicon Graphics.
-#
-# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-#
-# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
-# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-# OF THIS SOFTWARE.
-
-Import(['env'])
-
-env = env.Clone()
-
-sources = [
- 'tif_aux.c',
- 'tif_close.c',
- 'tif_codec.c',
- 'tif_color.c',
- 'tif_compress.c',
- 'tif_dir.c',
- 'tif_dirinfo.c',
- 'tif_dirread.c',
- 'tif_dirwrite.c',
- 'tif_dumpmode.c',
- 'tif_error.c',
- 'tif_extension.c',
- 'tif_fax3.c',
- 'tif_fax3sm.c',
- 'tif_flush.c',
- 'tif_getimage.c',
- 'tif_jpeg.c',
- 'tif_luv.c',
- 'tif_lzw.c',
- 'tif_next.c',
- 'tif_ojpeg.c',
- 'tif_open.c',
- 'tif_packbits.c',
- 'tif_pixarlog.c',
- 'tif_predict.c',
- 'tif_print.c',
- 'tif_read.c',
- 'tif_strip.c',
- 'tif_swab.c',
- 'tif_thunder.c',
- 'tif_tile.c',
- 'tif_version.c',
- 'tif_warning.c',
- 'tif_write.c',
- 'tif_zip.c',
-]
-
-if env['platform'] == 'windows':
- sources += ['tif_win32.c']
-
- env.Append(CPPDEFINES = [
- ('inline', '__inline'),
- ])
-elif env['platform'] == 'darwin':
- sources += ['tif_apple.c']
- env.Prepend(CPPPATH = ['/Developer/Headers/FlatCarbon'])
-else:
- sources += ['tif_unix.c']
-
-def Define(context, key, have):
- import SCons.Conftest
- SCons.Conftest._Have(context, key, have)
-
-def CheckCustomOption(context, name):
- context.Message('Checking is the ' + name + ' option set... ')
- ret = True
- Define(context, name + '_SUPPORT', ret)
- context.Result(ret)
- return ret
-
-def CheckFillorderOption(context):
- context.Message('Checking for the native cpu bit order... ')
- if True: # FIXME
- Define(context, 'HOST_FILLORDER', 'FILLORDER_LSB2MSB')
- context.Result('lsb2msb')
- else:
- Define(context, 'HOST_FILLORDER', 'FILLORDER_MSB2LSB')
- context.Result('msb2lsb')
- return 1
-
-def CheckIEEEFPOption(context):
- context.Message('Checking for the IEEE floating point format... ')
- Define(context, 'HAVE_IEEEFP', 1)
- context.Result(1)
- return 1
-
-def CheckOtherOption(context, name):
- context.Message('Checking is the ' + name + ' option set... ')
- ret = True
- Define(context, 'HAVE_' + name, ret)
- context.Result(ret)
- return ret
-
-custom_tests = {
- 'CheckCustomOption' : CheckCustomOption,
- 'CheckFillorderOption' : CheckFillorderOption,
- 'CheckIEEEFPOption' : CheckIEEEFPOption,
- 'CheckOtherOption' : CheckOtherOption
- }
-conf = Configure(env, custom_tests = custom_tests, config_h = 'tif_config.h')
-
-# Check for standard library
-conf.CheckLib('c')
-if False: # FIXME
- conf.CheckLib('m')
-
-# Check for system headers
-conf.CheckCHeader('assert.h')
-conf.CheckCHeader('fcntl.h')
-conf.CheckCHeader('limits.h')
-conf.CheckCHeader('malloc.h')
-conf.CheckCHeader('search.h')
-conf.CheckCHeader('sys/time.h')
-conf.CheckCHeader('unistd.h')
-conf.CheckCHeader('string.h')
-
-# Check for standard library functions
-conf.CheckFunc('floor')
-conf.CheckFunc('isascii')
-conf.CheckFunc('memmove')
-conf.CheckFunc('memset')
-conf.CheckFunc('mmap')
-conf.CheckFunc('pow')
-conf.CheckFunc('sqrt')
-conf.CheckFunc('strchr')
-conf.CheckFunc('strrchr')
-conf.CheckFunc('strstr')
-conf.CheckFunc('strtol')
-
-conf.CheckFillorderOption()
-conf.CheckIEEEFPOption()
-conf.CheckCustomOption('ccitt')
-conf.CheckCustomOption('packbits')
-conf.CheckCustomOption('lzw')
-conf.CheckCustomOption('thunder')
-conf.CheckCustomOption('next')
-conf.CheckCustomOption('logluv')
-conf.CheckOtherOption('strip_chopping')
-conf.CheckOtherOption('extrasample_as_alpha')
-conf.CheckOtherOption('check_ycbcr_subsampling')
-
-env = conf.Finish()
-
-tiff = env.StaticLibrary('tiff', sources)
-
-Export('tiff')
diff --git a/src/tools/SConscript b/src/tools/SConscript
deleted file mode 100644
index 4d5260c..0000000
--- a/src/tools/SConscript
+++ /dev/null
@@ -1 +0,0 @@
-SConscript(dirs = ['showtiff', 'difftiff', 'showvis'])
diff --git a/src/tools/difftiff/SConscript b/src/tools/difftiff/SConscript
deleted file mode 100644
index 56ca5a1..0000000
--- a/src/tools/difftiff/SConscript
+++ /dev/null
@@ -1,16 +0,0 @@
-import os.path
-
-Import(['*'])
-
-if env['glut']:
- env = env.Clone()
-
- env.Prepend(LIBS = [image])
-
- difftiff = env.Program('difftiff', ['main.cpp'])
-
- env.Default(difftiff)
-
- bin_dir = os.path.join(env['prefix'], 'bin')
- env.Install(bin_dir, difftiff)
- env.Alias('install', bin_dir)
diff --git a/src/tools/showtiff/SConscript b/src/tools/showtiff/SConscript
deleted file mode 100644
index 52a1a72..0000000
--- a/src/tools/showtiff/SConscript
+++ /dev/null
@@ -1,16 +0,0 @@
-import os.path
-
-Import(['*'])
-
-if env['glut']:
- env = env.Clone()
-
- env.Prepend(LIBS = [image])
-
- showtiff = env.Program('showtiff', ['main.cpp'])
-
- env.Default(showtiff)
-
- bin_dir = os.path.join(env['prefix'], 'bin')
- env.Install(bin_dir, showtiff)
- env.Alias('install', bin_dir)
diff --git a/src/tools/showvis/SConscript b/src/tools/showvis/SConscript
deleted file mode 100644
index 42f09d4..0000000
--- a/src/tools/showvis/SConscript
+++ /dev/null
@@ -1,15 +0,0 @@
-import os.path
-
-Import(['*'])
-
-env = env.Clone()
-
-env.Prepend(LIBS = [dsurf, lex])
-
-showvis = env.Program('showvis', ['main.cpp'])
-
-env.Default(showvis)
-
-bin_dir = os.path.join(env['prefix'], 'bin')
-env.Install(bin_dir, showvis)
-env.Alias('install', bin_dir)