Changeset 61

Timestamp:

09/06/06 17:11:53 (2 years ago)

Author:

allenb

Message:

Merged the branch: scons_build_creation to head.

svn merge https://opensg.vrsource.org/svn/trunk@60 https://opensg.vrsource.org/svn/branches/scons_build_creation@60

This change now makes it so OpenSG 2.0 can only be built using the SCons build.

Files:

• trunk (modified) (view diffs)
• trunk/Doc (copied) (copied from branches/scons_build_creation/Doc) (view diffs)
• trunk/Doc/opensg.doxy (copied) (copied from branches/scons_build_creation/Doc/opensg.doxy) (view diffs)
• trunk/SConstruct (modified) (view diffs)
• trunk/Source/Base/Base/OSGBaseTypes.h (modified) (view diffs)
• trunk/Source/Base/Base/OSGConfig.h (modified) (view diffs)
• trunk/Source/Base/Base/OSGFactoryController.cpp (modified) (view diffs)
• trunk/Source/Base/Base/OSGTypeFactory.cpp (modified) (view diffs)
• trunk/Source/Base/Field/OSGTypeInst.cpp (modified) (view diffs)
• trunk/Source/Base/Network/Base/OSGConnectionFactory.cpp (modified) (view diffs)
• trunk/Source/Base/Threading/OSGBaseThread.cpp (modified) (view diffs)
• trunk/Source/Base/Threading/OSGBaseThread.h (modified) (view diffs)
• trunk/Source/Base/Threading/OSGBaseThread.inl (modified) (view diffs)
• trunk/Source/Base/Threading/OSGThreadManager.cpp (modified) (view diffs)
• trunk/Source/Base/build.info (modified) (view diffs)
• trunk/Source/SConscript (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGPartitionIdPool.cpp (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/build.info (copied) (copied from branches/scons_build_creation/Source/System/Action/RenderTraversal/build.info) (view diffs)
• trunk/Source/System/Action/RenderTraversal/google/dense_hash_map (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/google/dense_hash_set (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/google/sparse_hash_map (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/google/sparse_hash_set (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/google/sparsehash/densehashtable.h (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/google/sparsehash/sparsehashtable.h (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/google/sparsetable (modified) (view diffs)
• trunk/Source/System/FieldContainer/Base/OSGFieldBundleFactory.cpp (modified) (view diffs)
• trunk/Source/System/FieldContainer/Base/OSGFieldContainerFactory.cpp (modified) (view diffs)
• trunk/Source/System/FieldContainer/Base/OSGThread.cpp (modified) (view diffs)
• trunk/Source/System/FieldContainer/Base/OSGThread.h (modified) (view diffs)
• trunk/Source/System/FieldContainer/Base/OSGThread.inl (modified) (view diffs)
• trunk/Source/System/FieldContainer/Fields/OSGFieldBundleFields.cpp (modified) (view diffs)
• trunk/Source/System/FileIO/Base/OSGSceneFileHandler.cpp (modified) (view diffs)
• trunk/Source/System/FileIO/ScanParseSkel/OSGScanParseSkel.h (modified) (view diffs)
• trunk/Source/System/FileIO/ScanParseSkel/OSGScanParseSkel.lpp (deleted)
• trunk/Source/System/FileIO/ScanParseSkel/OSGScanParseSkel.y (deleted)
• trunk/Source/System/FileIO/ScanParseSkel/OSGScanParseSkelParser.cpp (copied) (copied from branches/scons_build_creation/Source/System/FileIO/ScanParseSkel/OSGScanParseSkelParser.cpp) (view diffs)
• trunk/Source/System/FileIO/ScanParseSkel/OSGScanParseSkelParser.hpp (copied) (copied from branches/scons_build_creation/Source/System/FileIO/ScanParseSkel/OSGScanParseSkelParser.hpp) (view diffs)
• trunk/Source/System/FileIO/ScanParseSkel/OSGScanParseSkelParser.lpp (copied) (copied from branches/scons_build_creation/Source/System/FileIO/ScanParseSkel/OSGScanParseSkelParser.lpp) (view diffs)
• trunk/Source/System/FileIO/ScanParseSkel/OSGScanParseSkelParser.yy (copied) (copied from branches/scons_build_creation/Source/System/FileIO/ScanParseSkel/OSGScanParseSkelParser.yy) (view diffs)
• trunk/Source/System/FileIO/ScanParseSkel/OSGScanParseSkelScanner.cpp (copied) (copied from branches/scons_build_creation/Source/System/FileIO/ScanParseSkel/OSGScanParseSkelScanner.cpp) (view diffs)
• trunk/Source/System/FileIO/ScanParseSkel/OSGScanParseSkelScanner.ll (copied) (copied from branches/scons_build_creation/Source/System/FileIO/ScanParseSkel/OSGScanParseSkelScanner.ll) (view diffs)
• trunk/Source/System/FileIO/build.info (modified) (view diffs)
• trunk/Source/System/GraphOp/build.info (copied) (copied from branches/scons_build_creation/Source/System/GraphOp/build.info) (view diffs)
• trunk/Source/System/Image/FileIO/build.info (modified) (view diffs)
• trunk/Source/System/Image/OSGImageFileHandler.cpp (modified) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Base/OSGDrawable.fcd (modified) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Base/OSGDrawable.h (modified) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Base/OSGDrawableBase.h (modified) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Base/OSGDrawableFields.h (modified) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Base/OSGMaterialDrawable.fcd (modified) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Base/OSGMaterialDrawable.h (modified) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Base/OSGMaterialDrawableBase.h (modified) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Base/OSGMaterialDrawableFields.h (modified) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Properties/OSGTypedGeoVectorProperty.cpp (modified) (view diffs)
• trunk/Source/System/NodeCores/Drawables/build.info (modified) (view diffs)
• trunk/Source/System/NodeCores/Groups/Light/Shadow/build.info (copied) (copied from branches/scons_build_creation/Source/System/NodeCores/Groups/Light/Shadow/build.info) (view diffs)
• trunk/Source/System/NodeCores/Groups/build.info (modified) (view diffs)
• trunk/Source/System/RenderingBackend/OSGPassMaskPool.cpp (modified) (view diffs)
• trunk/Source/System/State/build.info (modified) (view diffs)
• trunk/Source/System/Statistics/Foregrounds/build.info (copied) (copied from branches/scons_build_creation/Source/System/Statistics/Foregrounds/build.info) (view diffs)
• trunk/Source/System/Text/build.info (modified) (view diffs)
• trunk/Source/System/Window/Utilities/build.info (copied) (copied from branches/scons_build_creation/Source/System/Window/Utilities/build.info) (view diffs)
• trunk/Source/System/Window/build.info (modified) (view diffs)
• trunk/Source/System/build.info (modified) (view diffs)
• trunk/Source/WindowSystem/EGL/build.info (copied) (copied from branches/scons_build_creation/Source/WindowSystem/EGL/build.info) (view diffs)
• trunk/Source/WindowSystem/GLUT/OSGGLUTWindow.cpp (modified) (view diffs)
• trunk/Source/WindowSystem/GLUT/build.info (copied) (copied from branches/scons_build_creation/Source/WindowSystem/GLUT/build.info) (view diffs)
• trunk/Source/WindowSystem/WIN32/build.info (copied) (copied from branches/scons_build_creation/Source/WindowSystem/WIN32/build.info) (view diffs)
• trunk/Source/WindowSystem/X/build.info (copied) (copied from branches/scons_build_creation/Source/WindowSystem/X/build.info) (view diffs)
• trunk/Tools (modified) (view diffs)
• trunk/Tools/scons-build (copied) (copied from branches/scons_build_creation/Tools/scons-build) (view diffs)
• trunk/Tools/scons-build/LibraryUtils.py (copied) (copied from branches/scons_build_creation/Tools/scons-build/LibraryUtils.py) (view diffs)
• trunk/VERSION (modified) (view diffs)
• trunk/osg-config.in (copied) (copied from branches/scons_build_creation/osg-config.in) (view diffs)