Fixed URL

Changed the svn:externals to link to OpenThreads-2.2
Release OpenSceneGraph-2.0.0
2008-04-03 15:45:34 +00:00 · 2008-04-03 15:43:36 +00:00 · 2007-06-15 17:05:58 +00:00
1231 changed files with 21963 additions and 101983 deletions
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,6 +1,6 @@
-OpenSceneGraph Library 2.4.0
+OpenSceneGraph Library 1.9.9

-307 Contributors:
+264 Contributors:

 Firstname Surname
 -----------------
@@ -8,149 +8,120 @@ Robert Osfield
 Don Burns
 Marco Jez
 Mike Weiblen
-Paul Martz
 Eric Wing
 Brede Johansen
 Geoff Michel
-Stephan Huber
 Farshid Lashkari
+Paul Martz
 Bob Kuehne
+Stephan Huber
 Ulrich Hertlein
-Martin Lavery
 Eric Sokolowsky
-Mathias Fr<46>hlich
 Tree 
-David Callu
+Mike Wittman
 Luigi Calori
 Trajce Nikolov
-Mike Wittman
-Jean-Sebastien Guay
 Pavel Moloshtan
+Martin Lavery
 Tom Jolley
-Andy Skinner
-Roger James
 Norman Vine
-Colin McDonald
 Alberto Farre
-Andr<EFBFBD> Garneau
 Ruben Lopez
 Randall Hopper
-Wojciech Lewandowski
+Roger James
 Olaf Flebbe
 Gideon May
 Don Tidrow
 Romano Jos<6F> Magacho da Silva
 Michael Gronager
-Daniel Sj<53>lie
+Colin McDonald
 Chris Hanson
+Daniel Sj<53>lie
 Per Fahlberg
-Jeremy Moles
-J.P. Delport
-David Spilling
-Art Tevs
-Sherman Wilcox
+Mathias Fr<46>hlich
 Joran Jessurun
-Jason Beverage
-Paul Melis
-Jason Daly
+Anr<EFBFBD> Garneau
 Frederic Marmond
 David Fries
 Boris Bralo
 Yefei He
 Sondra Iverson
-Serge Lages
 Rune Schmidt Jensen
+Neil Salter
+Jason Daly
+Jason Beverage
+David Spilling
+David Callu
+Ben Discoe
+Sasa Bistrovic
 Rainer Oder
 Mike Connell
-Melchior Franz
-Joakim Simonsson
-Carlo Camporesi
-Ben Discoe
-Andreas Ekstrand
-Adrian Egli
-Sasa Bistrovic
 Martin Naylor
 Martin Aumueller
 Markus Trenkwalder
-Loic Dachary
-Joseph Steel
-John Shue
-Jan Peciva
-Jan Ciger
+Joakim Simonsson
+Jeremy Moles
 Gordon Tomlinson
-Bryan Thrall
-Brad Colbert
+Andreas Ekstrand
 Vivek Rajan
+Stephane Simon
 Sean Spicer
 Ravi Mathur
-Nikolaus Hanekamp
-Neil Salter
-Mihai Radu
 Michael Platings
-Michael Hartman
-Laurens Voerman
+Loic Dachary
+Joseph Steel
 David Guthrie
 Corbin Holtz
-Brad Christiansen
 Toshiyuki Takahei
 Thom DeCarlo
 Terry Welsh
-Stephane Lamoliatte
 Simon Julier
 Sebastien Grignard
 Romano Magacho
-Philip Lowman
 Paul de Repentigny
-Luc Frauciel
+Nikolaus Hanekamp
+Michael Hartman
 Leandro Motta Barros
-John Kelso
-Glenn Waldron
-Daniel Larimer
-Colin Dunlop
-Cedric Pinson
+Laurens Voerman
+Carlo Camporesi
 Bruce Clay
-Alberto Luaces
+Brad Colbert
+Brad Christiansen
 Alberto Barbati
 Vladimir Shabanov
 Uwe Woessner
-Tony Horrobin
-Tim Moore
-Thibault Genessay
 Sohey Yamamoto
-Roland Smeenk
-Richard Schmidt
-Rafa Gaitan
+Serge Lages
 Phil Atkin
-Peter Hrenka
-Neil Hughes
-Mattias Linde
-Mattias Helsing
+Paul Melis
 Mathieu Marache
-Maria Ten
 Ken Sewell
 Julian Ortiz
+John Shue
+John Kelso
 Jeremy Bell
 James French
 Gabor Dorka
 Donn Mielcarek
 Domenico Mangieri
+Daniel Larimer
 Charles Cole
-Blake Williams
-Antoine Hue
-Anders Backman
+Bryan Thrall
+Andre Garneau
 Ali Botorabi
 Zach Deedler
 Yuzhong Shen
 Tugkan Calapoglu
+Tony Horrobin
 Tim Daoust
 Terrex 
-Sylvain Marie
 Steve Lunsford
-Stephane Simon
 Stephan Eilemann
 Stanislav Blinov
+Roland Smeenk
 Riccardo Corsi
-Ralf Kern
+Philip Lowman
+Peter Hrenka
 Perry Miller
 Nathan Monteleone
 Michael Henheffer
@@ -160,26 +131,30 @@ Mathew May
 Martijn Kragtwijk
 Kevin Moiule
 Keith Steffen
+Jos<EFBFBD> Delport
 Joseph Winston
 John Aughey
 Johan Nouvel
+Jean-Sebastien Guay
+Jan Ciger
 Igor Kravtchenko
-Gustavo Wagner
-Gino van den Bergen
 Gerrick Bivins
 George Tarantilis
 Garret Potts
 Fabio Mierlo
 Edgar Ellis
-Donald Cipperly
 David Ergo
 Daniel Trstenjak
-Csaba Halasz
+Blake Williams
+Antoine Hue
+Andy Skinner
 Andrew Sampson
 Andrew Lorino
 Andreas Goebel
+Anders Backman
 Zbigniew Sroczynski
 Yuri Vilmanis
+Wojciech Lewandowski
 Warren Macchi
 Wang Lam
 Walter J. Altice
@@ -191,39 +166,31 @@ Vasily Radostev
 Vaclav Bilek
 Tyge 
 Troy Yee
-Tomas Hnilica
 Tino Schwarze
 Thom Carlo
 Tery Welsh
-Tatsuhiro Nishioka
 Tanguy Fautr<74>
-Sid Byce
-Shuxing Xiao
+Sylvan Marie
+Sylvain Marie
+Sherman Wilcox
 Shane Arnott
 Sebastien Kuntz
-Sebastian Messerschimdt
-Rudolf Wiedemann
 Ronny Krueger
 Robert Swain
 Rick Pingry
-Rene Molenaar
 Reinhard Sainitzer
 Rein Kadijk
+Rafa Giatan
+Radu Mihai
 Qing Shen
 Philipp Siemoleit
-Philipp M<>chler
-Paul Obermeier
 Paul Fredrikson
-Parag Chaudhur
-Panagiotis Papadakos
 Orhun Birsoy
-Ole-Morten Duesund
 Nicolas Brodu
 Nathan Cournia
-Morn<EFBFBD> Pistorius
-Mirko Viviani
+Morné Pistorius
 Mikkel Gjøl
-Mike Garrity
+Mihai Radu
 Michael Polak
 Michael Morrison
 Michael Logan
@@ -232,46 +199,44 @@ Mauricio Hofmam
 Matthew May
 Matt Green
 Matt Burke
+Mathias Froelich
 Mathia Walker
 Mason Menninger
 Martin Spott
 Martin Amueller
-Mario Valle
-Mario Guimaraes
 Marin Lavery
+Maria Ten
 Louis Hamilton
 Lewis Harmon
 Kristopher Bixler
 Karsten Weiss
-Karl Heijdenberg
 Josh Portway
 John Tan
 John Grant
 John Donovan
 John Davis
 Joan Abadie
-Jean-Christophe Lombardo
+Joakim Simmonsson
 Jay Zuckerman
 Jason Howlett
 Jason Ballenger
+Jan Peciva
 J.E. Hoffmann
 Henrique Bucher
-He Sicong
-Hautio Jari
-Guillaume Millet
+Gustavo Wagner
 Graeme Harkness
+Glenn Waldrom
 Gian Lorenzetto
 George Papagiannakis
 Gary Quinn
-Galen Faidley
-Frederic Bouvier
+Frauciel Luc
 Frashid Lashkari
 Frank Warmerdam
 Frank Lindeman
 Frank Lichtenheld
 Ferdinand Cornelissen
 Fabien Dachicourt
-Emmanuel Roche
+Eric Sokolwsky
 Edmond Gheury
 Ed Ralston
 Duvan Cope
@@ -279,35 +244,27 @@ Duncan Cavens
 Drew Whitehouse
 Douglas A. Pouk
 Doug McCorkle
+Donny Cipperly
 Dean Iverson
 David Jung
 David Gurhrie
-Daniel Stien
-Dan Minor
-Cyril Brulebois
 Clay Fowler
 Chuck Sembroski
 Chuck Seberion
-Christian Kaser
 Chris McGlone
 Carlos Garcea
-Bruno Herbelin
 Brian Keener
-Brandon Hamm
 Brad Anderegg
 Bora Utka
 Blasius Czink
-Benoit Laniel
-Ben van Basten
 Bart Gallet
 Axel Volley
 Andrew Reyonolds
 Andreas Jochens
-Almalric Alexandre
 Allen Bierbaum
-Alexandre Amalric
 Alberto Jaspe
 Alan Purvis
 Alan Ott
 Alan Harris
+Adrian Egli
 Adam Richard
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,25 +15,14 @@ ENDIF(WIN32)
 PROJECT(OpenSceneGraph)

 SET(OPENSCENEGRAPH_MAJOR_VERSION 2)
-SET(OPENSCENEGRAPH_MINOR_VERSION 4)
+SET(OPENSCENEGRAPH_MINOR_VERSION 0)
 SET(OPENSCENEGRAPH_PATCH_VERSION 0)
-SET(OPENSCENEGRAPH_SOVERSION 35)
+SET(OPENSCENEGRAPH_SOVERSION 11)

 SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})

 SET(OSG_PLUGINS osgPlugins-${OPENSCENEGRAPH_VERSION})

-SET(OSG_PLUGIN_PREFIX "")
-
-IF (CYGWIN)
-    SET(OSG_PLUGIN_PREFIX "cygwin_")
-ENDIF(CYGWIN)
-
-IF(MINGW)
-    SET(OSG_PLUGIN_PREFIX "mingw_")
-ENDIF(MINGW)
-
-
 # We want to build SONAMES shared librariess
 SET(OPENSCENEGRAPH_SONAMES TRUE)
 SET(OPENTHREADS_SONAMES TRUE)
@@ -98,72 +87,14 @@ INCLUDE_DIRECTORIES(
 #ADD_DEFINITIONS(-D)
 # Platform specific definitions

-IF(NOT DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT)
-
-    SET(DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT OFF)
-
-    IF   (CMAKE_SYSTEM MATCHES "AIX.*")
-        SET(DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT ON)
-    ENDIF(CMAKE_SYSTEM MATCHES "AIX.*")
-
-    IF   (APPLE)
-        SET(DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT ON)
-    ENDIF(APPLE)
-    
-ENDIF(NOT DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT)
-
-OPTION(OSG_GLU_TESS_CALLBACK_TRIPLEDOT "Set to ON to build build with (...) version of GLU tesselator callback" ${DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT})
-
-IF   (OSG_GLU_TESS_CALLBACK_TRIPLEDOT)
-    ADD_DEFINITIONS(-DGLU_TESS_CALLBACK_TRIPLEDOT)
-ENDIF(OSG_GLU_TESS_CALLBACK_TRIPLEDOT)
-
-
 IF(WIN32)
-
-    # This option is to enable the /MP switch for Visual Studio 2005 and above compilers
-    OPTION(WIN32_USE_MP "Set to ON to build OpenSceneGraph with the /MP option (Visual Studio 2005 and above)." OFF)
-    MARK_AS_ADVANCED(WIN32_USE_MP)
-    IF(WIN32_USE_MP)        
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-    ENDIF(WIN32_USE_MP)        
-
    ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS)
-    ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
    #needed for net plugin
-    SET (OSG_SOCKET_LIBS wsock32)
+    SET (OSG_SOCKET_LIBS wsock32.lib)
    # Both Cygwin and Msys need -DNOMINMAX ???
    IF(UNIX)
        ADD_DEFINITIONS(-DNOMINMAX)
    ENDIF(UNIX)
-########################################################################################################
-# the foolowing options are MSVC specific,
-# the first OSG_MSVC_VERSIONED_DLL activate a custom build-time layout that should allow to run examples and application 
-# fron bin folder without requiring installation step.
-# it also prepend "osg${OPENSCENEGRAPH_SOVERSION}-" to only .dll files, leaving .lib files untouched in lib
-# it also use a hack to get rid of Debug and Release folder in MSVC projects 
-# all the .dll and .pdb are in bin and all the .lib and .exp are in lib
-# 
-# the second option disable incremental linking in debug build , that is enabled by default by CMake
-##########################################################################################################
-
-    IF(MSVC)
-        IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7)
-            MESSAGE("Warning:  disabling versioned options 2.4.6 exibits inconsintencies in .pdb naming, at least under MSVC, suggested upgrading at least to 2.4.7")
-            SET(OSG_MSVC_VERSIONED_DLL OFF)
-            SET(OSG_MSVC_DEBUG_INCREMENTAL_LINK ON)
-        ELSE(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7)
-            OPTION(OSG_MSVC_VERSIONED_DLL "Set to ON to build OpenSceneGraph with versioned dll names" ON)
-            MARK_AS_ADVANCED(OSG_MSVC_VERSIONED_DLL)
-            OPTION(OSG_MSVC_DEBUG_INCREMENTAL_LINK "Set to OFF to build OpenSceneGraph without incremental linking in debug (release is off by default)" ON)
-            MARK_AS_ADVANCED(OSG_MSVC_DEBUG_INCREMENTAL_LINK)
-            IF(NOT OSG_MSVC_DEBUG_INCREMENTAL_LINK)
-                SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
-                SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
-                SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
-            ENDIF(NOT OSG_MSVC_DEBUG_INCREMENTAL_LINK)
-        ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7)
-    ENDIF(MSVC)
 ENDIF(WIN32)

 ########################################################################################################
@@ -185,29 +116,18 @@ ENDIF(WIN32)
 #luigi#ENDIF(UNIX)
 ########################################################################################################

-OPTION(OSG_USE_FLOAT_MATRIX "Set to ON to build OpenSceneGraph with float Matrix instead of double." OFF)
+OPTION(OSG_USE_FLOAT_MATRIX "Set to ON to build OpenSceneGraph with float matrix instead of double." OFF)
 MARK_AS_ADVANCED(OSG_USE_FLOAT_MATRIX)
 IF(OSG_USE_FLOAT_MATRIX)        
    ADD_DEFINITIONS(-DOSG_USE_FLOAT_MATRIX)
 ENDIF(OSG_USE_FLOAT_MATRIX)        

-OPTION(OSG_USE_FLOAT_PLANE "Set to ON to build OpenSceneGraph with float Plane instead of double." OFF)
+OPTION(OSG_USE_FLOAT_PLANE "Set to ON to build OpenSceneGraph with float matrix instead of double." OFF)
 MARK_AS_ADVANCED(OSG_USE_FLOAT_PLANE)
 IF(OSG_USE_FLOAT_PLANE)        
    ADD_DEFINITIONS(-DOSG_USE_FLOAT_PLANE)
 ENDIF(OSG_USE_FLOAT_PLANE)        

-OPTION(OSG_USE_FLOAT_BOUNDINGSPHERE "Set to ON to build OpenSceneGraph with float BoundingSphere instead of double." ON)
-MARK_AS_ADVANCED(OSG_USE_FLOAT_BOUNDINGSPHERE)
-IF(NOT OSG_USE_FLOAT_BOUNDINGSPHERE)        
-    ADD_DEFINITIONS(-DOSG_USE_DOUBLE_BOUNDINGSPHERE)
-ENDIF(NOT OSG_USE_FLOAT_BOUNDINGSPHERE)        
-
-OPTION(OSG_USE_FLOAT_BOUNDINGBOX "Set to ON to build OpenSceneGraph with float BoundingBox instead of double." ON)
-MARK_AS_ADVANCED(OSG_USE_FLOAT_BOUNDINGBOX)
-IF(NOT OSG_USE_FLOAT_BOUNDINGBOX)      
-    ADD_DEFINITIONS(-DOSG_USE_DOUBLE_BOUNDINGBOX)
-ENDIF(NOT OSG_USE_FLOAT_BOUNDINGBOX)        

 ################################################################################
 # 3rd Party Dependency Stuff
@@ -220,7 +140,6 @@ FIND_PACKAGE(FreeType)
 FIND_PACKAGE(FLTK)
 FIND_PACKAGE(GLUT)
 FIND_PACKAGE(SDL)
-FIND_PACKAGE(FOX)
 FIND_PACKAGE(Inventor)
 FIND_PACKAGE(Jasper)
 FIND_PACKAGE(COLLADA)
@@ -228,34 +147,15 @@ FIND_PACKAGE(Xine)
 FIND_PACKAGE(OpenVRML)
 FIND_PACKAGE(Performer)
 FIND_PACKAGE(ZLIB)
-FIND_PACKAGE(GDAL)
-FIND_PACKAGE(CURL)
+
+# SET(DESIRED_QT_VERSION 3)
+# FIND_PACKAGE(Qt)
+FIND_PACKAGE(Qt3)
+FIND_PACKAGE(Qt4)

 SET(wxWidgets_USE_LIBS base core gl net)
 FIND_PACKAGE(wxWidgets)

-# To select a specific version of QT define DESIRED_QT_VERSION
-# via cmake -DDESIRED_QT_VERSION=4
-IF  (DESIRED_QT_VERSION)
-
-    IF  (DESIRED_QT_VERSION MATCHES 4)
-      FIND_PACKAGE(Qt4)
-    ELSE(DESIRED_QT_VERSION MATCHES 4)
-      FIND_PACKAGE(Qt3)
-    ENDIF(DESIRED_QT_VERSION MATCHES 4)
-    
-ELSE(DESIRED_QT_VERSION)
-
-    FIND_PACKAGE(Qt4)
-    
-    IF  (NOT QT4_FOUND)
-        FIND_PACKAGE(Qt3)
-    ENDIF(NOT QT4_FOUND)
-    
-ENDIF(DESIRED_QT_VERSION)
-
-
-
 # Platform specific:
 # (We can approach this one of two ways. We can try to FIND everything
 # and simply check if we found the packages before actually building
@@ -311,18 +211,12 @@ ENDIF(NOT DEFINED LIB_POSTFIX)
 #SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin/${CMAKE_SYSTEM_NAME})
 SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin)
 MAKE_DIRECTORY(${OUTPUT_BINDIR})
-IF(MSVC AND NOT MSVC_IDE)
-    MAKE_DIRECTORY(${OUTPUT_BINDIR}/${OSG_PLUGINS})
-ENDIF(MSVC AND NOT MSVC_IDE)
-
 SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_BINDIR})

 #SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/lib/${CMAKE_SYSTEM_NAME})
 SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/lib)
 MAKE_DIRECTORY(${OUTPUT_LIBDIR})
-IF(NOT MSVC)
-    MAKE_DIRECTORY(${OUTPUT_LIBDIR}/${OSG_PLUGINS})
-ENDIF(NOT MSVC)
+MAKE_DIRECTORY(${OUTPUT_LIBDIR}/${OSG_PLUGINS})
 SET(LIBRARY_OUTPUT_PATH ${OUTPUT_LIBDIR})


@@ -395,15 +289,13 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
    # errors instead of warnings for certain issues, including superfluous
    # semicolons and commas, and the use of long long. -fpermissive seems
    # to be the workaround. 
-    SET(OSG_AGGRESSIVE_WARNING_FLAGS "-Wall -Wparentheses -Wformat=2 -Wno-long-long -Wno-import -pedantic -Wreturn-type -Wmissing-braces -Wunknown-pragmas -Wunused -fpermissive")
+    SET(OSG_AGGRESSIVE_WARNING_FLAGS "-Wall -Wparentheses -Wformat=2 -Wno-long-long -Wno-import -pedantic -Wnewline-eof -Wreturn-type -Wmissing-braces -Wunknown-pragmas -Wunused -fpermissive")
 ELSE(CMAKE_COMPILER_IS_GNUCXX)
    IF(MSVC)
        # FIXME: What are good aggressive warning flags for Visual Studio?
        # And do we need to further subcase this for different versions of VS?
        # CMake variables: MSVC60, MSVC70, MSVC71, MSVC80, CMAKE_COMPILER_2005
        SET(OSG_AGGRESSIVE_WARNING_FLAGS "/Wall /W4")
-        
-
    ELSE(MSVC)
        # CMake lacks an elseif, so other non-gcc, non-VS compilers need
        # to be listed below. If unhandled, OSG_AGGRESSIVE_WARNING_FLAGS should 
@@ -467,36 +359,15 @@ IF(APPLE)
    
 ENDIF(APPLE)

-OPTION(BUILD_REF_DOCS "Build OpenSceneGraph reference documentation using doxygen (use: make DoxygenDoc)" OFF)
-
-IF(BUILD_REF_DOCS)
-    SET(BUILD_DOCUMENTATION YES)
-    OPTION(BUILD_REF_DOCS_SEARCHENGINE "Enable doxygen's search engine (requires that documentation to be installed on a php enabled web server)" OFF)
-    OPTION(BUILD_REF_DOCS_TAGFILE "Generate a tag file named osg.tag on the documentation web server" OFF)
-ENDIF(BUILD_REF_DOCS)

 # For Doxygen
 #FIXME: I haven't figured out what to do with OSG's multiple doxyfiles 
 # and footer.
 INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL)
-OPTION(BUILD_DOCUMENTATION "Build osg documentation" OFF)
+
 # To build the documention, you will have to enable it
 # and then do the equivalent of "make DoxygenDoc".
 IF(BUILD_DOCUMENTATION)
-    SET(BUILD_DOCUMENTATION YES)
-
-    IF(BUILD_REF_DOCS_SEARCHENGINE)
-        SET(SEARCHENGINE YES)
-    ELSE(BUILD_REF_DOCS_SEARCHENGINE)
-        SET(SEARCHENGINE NO)
-    ENDIF(BUILD_REF_DOCS_SEARCHENGINE)
-    
-    IF(BUILD_REF_DOCS_TAGFILE)
-        SET(GENERATE_TAGFILE "doc/OpenSceneGraphReferenceDocs/osg.tag")
-    ELSE(BUILD_REF_DOCS_TAGFILE)
-        SET(GENERATE_TAGFILE "")
-    ENDIF(BUILD_REF_DOCS_TAGFILE)
-    
    IF(DOT)
        SET(HAVE_DOT YES)
    ELSE(DOT)
@@ -514,7 +385,7 @@ IF(BUILD_DOCUMENTATION)
    # It runs the final generated Doxyfile against it.
    # The DOT_PATH is substituted into the Doxyfile.
    ADD_CUSTOM_TARGET(DoxygenDoc ${DOXYGEN}
-        ${PROJECT_BINARY_DIR}/doc/doxyfile
+        ${PROJECT_BINARY_DIR}/docs/doxyfile
    )
 ENDIF(BUILD_DOCUMENTATION)

--- a/CMakeModules/Find3rdPartyDependencies.cmake
+++ b/CMakeModules/Find3rdPartyDependencies.cmake
@@ -52,14 +52,13 @@ ENDMACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY_NAMES SEARCHPATHLIST DEBUGS

 MACRO(SEARCH_3RDPARTY OSG_3RDPARTY_BIN)
        FIND_DEPENDENCY(TIFF tiff.h libtiff ${OSG_3RDPARTY_BIN} "D")
-        FIND_DEPENDENCY(FREETYPE ft2build.h "freetype;freetype234;freetype234MT;freetype235" ${OSG_3RDPARTY_BIN} "_D")
+        FIND_DEPENDENCY(FREETYPE ft2build.h "freetype;freetype219;freetype234MT" ${OSG_3RDPARTY_BIN} "_D")
        IF(FREETYPE_FOUND)
            #forcing subsequent FindFreeType stuff to not search for other variables.... kind of a hack 
            SET(FREETYPE_INCLUDE_DIR_ft2build ${FREETYPE_INCLUDE_DIR} CACHE PATH "")
            SET(FREETYPE_INCLUDE_DIR_freetype2 ${FREETYPE_INCLUDE_DIR} CACHE PATH "")
            MARK_AS_ADVANCED(FREETYPE_INCLUDE_DIR_ft2build FREETYPE_INCLUDE_DIR_freetype2)
        ENDIF(FREETYPE_FOUND)
-        FIND_DEPENDENCY(CURL curl/curl.h "libcurl;curllib" ${OSG_3RDPARTY_BIN} "D")
        FIND_DEPENDENCY(JPEG jpeglib.h libjpeg ${OSG_3RDPARTY_BIN} "D")
        #FIND_DEPENDENCY(GDAL gdal.h "gdal;gdal_i" ${OSG_3RDPARTY_BIN})
        FIND_DEPENDENCY(GLUT GL/glut.h glut32 ${OSG_3RDPARTY_BIN} "D")
--- a/CMakeModules/FindFOX.cmake
+++ b/CMakeModules/FindFOX.cmake
@@ -1,74 +0,0 @@
-# Locate gdal
-# This module defines
-# FOX_LIBRARY
-# FOX_FOUND, if false, do not try to link to gdal 
-# FOX_INCLUDE_DIR, where to find the headers
-#
-# $FOX_DIR is an environment variable that would
-# correspond to the ./configure --prefix=$FOX_DIR
-#
-# Created by Robert Osfield. 
-
-FIND_PATH(FOX_INCLUDE_DIR fx.h
-    $ENV{FOX_DIR}/include/fox-1.6
-    $ENV{FOX_DIR}/fox-1.6
-    $ENV{OSGDIR}/include/fox-1.6
-    $ENV{OSGDIR}/fox-1.6
-    $ENV{OSG_ROOT}/include/fox-1.6
-    ~/Library/Frameworks/fox-1.6
-    /Library/Frameworks/fox-1.6
-    /usr/local/include/fox-1.6
-    /usr/include/fox-1.6
-    /sw/include/fox-1.6 # Fink
-    /opt/local/include/fox-1.6 # DarwinPorts
-    /opt/csw/include/fox-1.6 # Blastwave
-    /opt/include/fox-1.6
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include/fox-1.6
-    /usr/freeware/include/fox-1.6
-    $ENV{FOX_DIR}/include
-    $ENV{FOX_DIR}
-    $ENV{OSGDIR}/include
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/include
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/include
-    /usr/include
-    /sw/include # Fink
-    /opt/local/include # DarwinPorts
-    /opt/csw/include # Blastwave
-    /opt/include
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
-    /usr/freeware/include
-)
-
-MACRO(FIND_FOX_LIBRARY MYLIBRARY MYLIBRARYNAME)
-
-    FIND_LIBRARY(${MYLIBRARY}
-        NAMES ${MYLIBRARYNAME}
-        PATHS
-        $ENV{FOX_DIR}/lib
-        $ENV{FOX_DIR}
-        $ENV{OSGDIR}/lib
-        $ENV{OSGDIR}
-        $ENV{OSG_ROOT}/lib
-        ~/Library/Frameworks
-        /Library/Frameworks
-        /usr/local/lib
-        /usr/lib
-        /sw/lib
-        /opt/local/lib
-        /opt/csw/lib
-        /opt/lib
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-        /usr/freeware/lib64
-    )
-
-ENDMACRO(FIND_FOX_LIBRARY LIBRARY LIBRARYNAME)
-
-FIND_FOX_LIBRARY(FOX_LIBRARY FOX-1.6)
-
-SET(FOX_FOUND "NO")
-IF(FOX_LIBRARY AND FOX_INCLUDE_DIR)
-    SET(FOX_FOUND "YES")
-ENDIF(FOX_LIBRARY AND FOX_INCLUDE_DIR)
--- a/CMakeModules/FindFreeType.cmake
+++ b/CMakeModules/FindFreeType.cmake
@@ -25,93 +25,55 @@
 # I'm going to attempt to cut out the middleman and hope 
 # everything still works.
 FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
-  PATHS
-  $ENV{FREETYPE_DIR}
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include    
-)
-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
-  PATHS
-  /usr/local
-  /usr
-  /usr/local/X11R6
-  /usr/local/X11
-  /usr/X11R6
-  /usr/X11
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-  /usr/freeware
-  PATH_SUFFIXES include
+    $ENV{FREETYPE_DIR}
+    /usr/local/include
+    /usr/include
+    /usr/local/X11R6
+    /usr/X11R6/include
+    /sw/include
+    /opt/local/include
+    /opt/csw/include
+    /opt/include
+    /usr/freeware/include/freetype2
 )

 FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
-  $ENV{FREETYPE_DIR}/include/freetype2
-  NO_DEFAULT_PATH
-)
-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include/freetype2
-)
-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
-  /usr/local/include/freetype2
-  /usr/include/freetype2
-  /usr/local/X11R6/include/freetype2
-  /usr/local/X11/include/freetype2
-  /usr/X11R6/include/freetype2
-  /usr/X11/include/freetype2
-  /sw/include/freetype2
-  /opt/local/include/freetype2
-  /opt/csw/include/freetype2
-  /opt/include/freetype2
-  /usr/freeware/include/freetype2
+    $ENV{FREETYPE_DIR}/include/freetype2
+    /usr/local/include/freetype2
+    /usr/include/freetype2
+    /usr/local/X11R6/include/freetype2
+    /usr/X11R6/include/freetype2
+    /sw/include/freetype2
+    /opt/local/include/freetype2
+    /opt/csw/include/freetype2
+    /opt/include/freetype2
+    /usr/freeware/include/freetype2
 )

 FIND_LIBRARY(FREETYPE_LIBRARY 
-  NAMES freetype libfreetype freetype219
-  PATHS
-  $ENV{FREETYPE_DIR}
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES lib64 lib 
-)
-FIND_LIBRARY(FREETYPE_LIBRARY 
-  NAMES freetype libfreetype freetype219
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES lib64 lib 
-)
-FIND_LIBRARY(FREETYPE_LIBRARY 
-  NAMES freetype libfreetype freetype219
-  PATHS
-  /usr/local
-  /usr
-  /usr/local/X11R6
-  /usr/local/X11
-  /usr/X11R6
-  /usr/X11
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-  /usr/freeware
-  PATH_SUFFIXES lib64 lib
+    NAMES freetype libfreetype freetype219
+    PATHS
+    $ENV{FREETYPE_DIR}/lib
+    $ENV{FREETYPE_DIR}/lib
+    /usr/local/lib
+    /usr/lib
+    /usr/local/X11R6/lib
+    /usr/X11R6/lib
+    /sw/lib
+    /opt/local/lib
+    /opt/csw/lib
+    /opt/lib
+    /usr/freeware/lib64
 )

 IF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
-  SET(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
+    SET(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
 ENDIF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)


 SET(FREETYPE_FOUND "NO")
 IF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS)
-  SET(FREETYPE_FOUND "YES")
+    SET(FREETYPE_FOUND "YES")
 ENDIF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS)


--- a/CMakeModules/FindGDAL.cmake
+++ b/CMakeModules/FindGDAL.cmake
@@ -1,93 +0,0 @@
-# Locate gdal
-# This module defines
-# GDAL_LIBRARY
-# GDAL_FOUND, if false, do not try to link to gdal 
-# GDAL_INCLUDE_DIR, where to find the headers
-#
-# $GDALDIR is an environment variable that would
-# correspond to the ./configure --prefix=$GDAL_DIR
-# used in building gdal.
-#
-# Created by Eric Wing. I'm not a gdal user, but OpenSceneGraph uses it 
-# for osgTerrain so I whipped this module together for completeness.
-# I actually don't know the conventions or where files are typically
-# placed in distros.
-# Any real gdal users are encouraged to correct this (but please don't
-# break the OS X framework stuff when doing so which is what usually seems 
-# to happen).
-
-# This makes the presumption that you are include gdal.h like
-# #include "gdal.h"
-
-FIND_PATH(GDAL_INCLUDE_DIR gdal.h
-  $ENV{GDAL_DIR}
-  NO_DEFAULT_PATH
-    PATH_SUFFIXES include
-)
-
-FIND_PATH(GDAL_INCLUDE_DIR gdal.h
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES include
-)
-
-FIND_PATH(GDAL_INCLUDE_DIR gdal.h
-  PATHS
-  ~/Library/Frameworks/gdal.framework/Headers
-  /Library/Frameworks/gdal.framework/Headers
-  /usr/local/include/gdal
-  /usr/local/include/GDAL
-  /usr/local/include
-  /usr/include/gdal
-  /usr/include/GDAL
-  /usr/include
-  /sw/include/gdal 
-  /sw/include/GDAL 
-  /sw/include # Fink
-  /opt/local/include/gdal
-  /opt/local/include/GDAL
-  /opt/local/include # DarwinPorts
-  /opt/csw/include/gdal
-  /opt/csw/include/GDAL
-  /opt/csw/include # Blastwave
-  /opt/include/gdal
-  /opt/include/GDAL
-  /opt/include
-)
-
-FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
-  PATHS
-  $ENV{GDAL_DIR}
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES lib64 lib
-)
-FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
-FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
-  PATHS
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local
-    /usr
-    /sw
-    /opt/local
-    /opt/csw
-    /opt
-    /usr/freeware
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;GDAL_ROOT]/lib
-  PATH_SUFFIXES lib64 lib
-)
-
-SET(GDAL_FOUND "NO")
-IF(GDAL_LIBRARY AND GDAL_INCLUDE_DIR)
-  SET(GDAL_FOUND "YES")
-ENDIF(GDAL_LIBRARY AND GDAL_INCLUDE_DIR)
-
-
-
--- a/CMakeModules/FindGIFLIB.cmake
+++ b/CMakeModules/FindGIFLIB.cmake
@@ -1,74 +1,56 @@
+# Locate gdal
 # This module defines
 # GIFLIB_LIBRARY
-# GIFLIB_FOUND, if false, do not try to link 
+# GIFLIB_FOUND, if false, do not try to link to gdal 
 # GIFLIB_INCLUDE_DIR, where to find the headers
 #
 # $GIFLIB_DIR is an environment variable that would
 # correspond to the ./configure --prefix=$GIFLIB_DIR
+# used in building gdal.
 #
 # Created by Eric Wing. 

 FIND_PATH(GIFLIB_INCLUDE_DIR gif_lib.h
-  PATHS
-  $ENV{GIFLIB_DIR}
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
-
-FIND_PATH(GIFLIB_INCLUDE_DIR gif_lib.h
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
-
-FIND_PATH(GIFLIB_INCLUDE_DIR gif_lib.h
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /usr/local/include
-  /usr/include
-  /sw/include # Fink
-  /opt/local/include # DarwinPorts
-  /opt/csw/include # Blastwave
-  /opt/include
-  [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
-  /usr/freeware/include
+    $ENV{GIFLIB_DIR}/include
+    $ENV{GIFLIB_DIR}
+    $ENV{OSGDIR}/include
+    $ENV{OSGDIR}
+    $ENV{OSG_ROOT}/include
+    ~/Library/Frameworks
+    /Library/Frameworks
+    /usr/local/include
+    /usr/include
+    /sw/include # Fink
+    /opt/local/include # DarwinPorts
+    /opt/csw/include # Blastwave
+    /opt/include
+    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
+    /usr/freeware/include
 )

 FIND_LIBRARY(GIFLIB_LIBRARY 
-  NAMES gif ungif libgif libungif
-  PATHS
-  $ENV{GIFLIB_DIR}
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(GIFLIB_LIBRARY 
-  NAMES gif ungif libgif libungif
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(GIFLIB_LIBRARY 
-  NAMES gif ungif libgif libungif
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /usr/local
-  /usr
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-  [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
-  /usr/freeware
-  PATH_SUFFIXES lib64 lib
+    NAMES gif ungif libgif libungif
+    PATHS
+    $ENV{GIFLIB_DIR}/lib
+    $ENV{GIFLIB_DIR}
+    $ENV{OSGDIR}/lib
+    $ENV{OSGDIR}
+    $ENV{OSG_ROOT}/lib
+    ~/Library/Frameworks
+    /Library/Frameworks
+    /usr/local/lib
+    /usr/lib
+    /sw/lib
+    /opt/local/lib
+    /opt/csw/lib
+    /opt/lib
+    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+    /usr/freeware/lib64
 )

 SET(GIFLIB_FOUND "NO")
 IF(GIFLIB_LIBRARY AND GIFLIB_INCLUDE_DIR)
-  SET(GIFLIB_FOUND "YES")
+    SET(GIFLIB_FOUND "YES")
 ENDIF(GIFLIB_LIBRARY AND GIFLIB_INCLUDE_DIR)


--- a/CMakeModules/FindInventor.cmake
+++ b/CMakeModules/FindInventor.cmake
@@ -1,9 +1,8 @@
 # - Locate Inventor
 # This module defines:
 #  INVENTOR_FOUND, if false, do not try to link against Inventor.
-#  INVENTOR_INCLUDE_DIR, where to find headers.
 #  INVENTOR_LIBRARY, the library to link against.
-#  INVENTOR_LIBRARY_DEBUG, the debug library to link against.
+#  INVENTOR_INCLUDE_DIR, where to find headers.

 FIND_PATH(INVENTOR_INCLUDE_DIR Inventor/So.h
    /usr/local/include
@@ -12,11 +11,10 @@ FIND_PATH(INVENTOR_INCLUDE_DIR Inventor/So.h
    /opt/local/include
    /opt/csw/include
    /opt/include
-    $ENV{COINDIR}/include
 )

 FIND_LIBRARY(INVENTOR_LIBRARY
-    NAMES coin2 Coin
+    NAMES Coin
    PATHS
    /usr/local/lib
    /usr/lib
@@ -24,7 +22,6 @@ FIND_LIBRARY(INVENTOR_LIBRARY
    /opt/local/lib
    /opt/csw/lib
    /opt/lib
-    $ENV{COINDIR}/lib
 )
 IF(NOT INVENTOR_LIBRARY)
    # If we can't find libCoin try libInventor
@@ -40,23 +37,6 @@ IF(NOT INVENTOR_LIBRARY)
    )
 ENDIF(NOT INVENTOR_LIBRARY)

-FIND_LIBRARY(INVENTOR_LIBRARY_DEBUG
-    NAMES coin2d
-    PATHS
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    $ENV{COINDIR}/lib
-)
-IF(NOT INVENTOR_LIBRARY_DEBUG)
-    IF(INVENTOR_LIBRARY)
-        SET(INVENTOR_LIBRARY_DEBUG ${INVENTOR_LIBRARY})
-    ENDIF(INVENTOR_LIBRARY)
-ENDIF(NOT INVENTOR_LIBRARY_DEBUG)
-
 SET(INVENTOR_FOUND "NO")
 IF(INVENTOR_INCLUDE_DIR AND INVENTOR_LIBRARY)
    SET(INVENTOR_FOUND "YES")
--- a/CMakeModules/FindOSG.cmake
+++ b/CMakeModules/FindOSG.cmake
@@ -1,65 +0,0 @@
-# Locate gdal
-# This module defines
-# OSG_LIBRARY
-# OSG_FOUND, if false, do not try to link to gdal 
-# OSG_INCLUDE_DIR, where to find the headers
-#
-# $OSG_DIR is an environment variable that would
-# correspond to the ./configure --prefix=$OSG_DIR
-#
-# Created by Robert Osfield. 
-
-FIND_PATH(OSG_INCLUDE_DIR osg/Node
-    $ENV{OSG_DIR}/include
-    $ENV{OSG_DIR}
-    $ENV{OSGDIR}/include
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/include
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/include
-    /usr/include
-    /sw/include # Fink
-    /opt/local/include # DarwinPorts
-    /opt/csw/include # Blastwave
-    /opt/include
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
-    /usr/freeware/include
-)
-
-MACRO(FIND_OSG_LIBRARY MYLIBRARY MYLIBRARYNAME)
-
-    FIND_LIBRARY(${MYLIBRARY}
-        NAMES ${MYLIBRARYNAME}
-        PATHS
-        $ENV{OSG_DIR}/lib
-        $ENV{OSG_DIR}
-        $ENV{OSGDIR}/lib
-        $ENV{OSGDIR}
-        $ENV{OSG_ROOT}/lib
-        ~/Library/Frameworks
-        /Library/Frameworks
-        /usr/local/lib
-        /usr/lib
-        /sw/lib
-        /opt/local/lib
-        /opt/csw/lib
-        /opt/lib
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-        /usr/freeware/lib64
-    )
-
-ENDMACRO(FIND_OSG_LIBRARY LIBRARY LIBRARYNAME)
-
-FIND_OSG_LIBRARY(OSG_LIBRARY osg)
-FIND_OSG_LIBRARY(OSGUTIL_LIBRARY osgUtil)
-FIND_OSG_LIBRARY(OSGDB_LIBRARY osgDB)
-FIND_OSG_LIBRARY(OSGTEXT_LIBRARY osgText)
-FIND_OSG_LIBRARY(OSGTERRAIN_LIBRARY osgTerrain)
-FIND_OSG_LIBRARY(OSGFX_LIBRARY osgFX)
-FIND_OSG_LIBRARY(OSGVIEWER_LIBRARY osgViewer)
-
-SET(OSG_FOUND "NO")
-IF(OSG_LIBRARY AND OSG_INCLUDE_DIR)
-    SET(OSG_FOUND "YES")
-ENDIF(OSG_LIBRARY AND OSG_INCLUDE_DIR)
--- a/CMakeModules/FindOpenThreads.cmake
+++ b/CMakeModules/FindOpenThreads.cmake
@@ -43,36 +43,36 @@
 # may change.

 FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
-    PATHS
    $ENV{OPENTHREADS_INCLUDE_DIR}
    $ENV{OPENTHREADS_DIR}/include
    $ENV{OPENTHREADS_DIR}
    $ENV{OSG_INCLUDE_DIR}
    $ENV{OSG_DIR}/include
    $ENV{OSG_DIR}
-    $ENV{OSGDIR}/include
-    $ENV{OSGDIR}
    NO_DEFAULT_PATH
 )

-FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES include
-)
+IF(NOT OPENTHREADS_INCLUDE_DIR)
+    FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
+        PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+        PATH_SUFFIXES include
+    )
+ENDIF(NOT OPENTHREADS_INCLUDE_DIR)

-FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/include
-    /usr/include
-    /sw/include # Fink
-    /opt/local/include # DarwinPorts
-    /opt/csw/include # Blastwave
-    /opt/include
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/include
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
-)
+IF(NOT OPENTHREADS_INCLUDE_DIR)
+    FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
+        ~/Library/Frameworks
+        /Library/Frameworks
+        /usr/local/include
+        /usr/include
+        /sw/include # Fink
+        /opt/local/include # DarwinPorts
+        /opt/csw/include # Blastwave
+        /opt/include
+        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/include
+        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
+    )
+ENDIF(NOT OPENTHREADS_INCLUDE_DIR)


 FIND_LIBRARY(OPENTHREADS_LIBRARY 
@@ -86,39 +86,39 @@ FIND_LIBRARY(OPENTHREADS_LIBRARY
    $ENV{OSG_DIR}/lib64
    $ENV{OSG_DIR}/lib
    $ENV{OSG_DIR}
-    $ENV{OSGDIR}/lib64
-    $ENV{OSGDIR}/lib
-    $ENV{OSGDIR}
    NO_DEFAULT_PATH
 )

-FIND_LIBRARY(OPENTHREADS_LIBRARY 
-    NAMES OpenThreads OpenThreadsWin32 
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+IF(NOT OPENTHREADS_LIBRARY)
+    FIND_LIBRARY(OPENTHREADS_LIBRARY 
+        NAMES OpenThreads OpenThreadsWin32 
+        PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+        PATH_SUFFIXES lib64 lib
+    )
+ENDIF(NOT OPENTHREADS_LIBRARY)

-FIND_LIBRARY(OPENTHREADS_LIBRARY 
-    NAMES OpenThreads OpenThreadsWin32 
-    PATHS
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/lib64
-    /usr/local/lib
-    /usr/lib64
-    /usr/lib
-    /sw/lib64
-    /sw/lib
-    /opt/local/lib64
-    /opt/local/lib
-    /opt/csw/lib64
-    /opt/csw/lib
-    /opt/lib64
-    /opt/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-)
+IF(NOT OPENTHREADS_LIBRARY)
+    FIND_LIBRARY(OPENTHREADS_LIBRARY 
+        NAMES OpenThreads OpenThreadsWin32 
+        PATHS
+        ~/Library/Frameworks
+        /Library/Frameworks
+        /usr/local/lib64
+        /usr/local/lib
+        /usr/lib64
+        /usr/lib
+        /sw/lib64
+        /sw/lib
+        /opt/local/lib64
+        /opt/local/lib
+        /opt/csw/lib64
+        /opt/csw/lib
+        /opt/lib64
+        /opt/lib
+        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
+        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+    )
+ENDIF(NOT OPENTHREADS_LIBRARY)


 FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG 
@@ -133,37 +133,40 @@ FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
    $ENV{OSG_DIR}/lib64
    $ENV{OSG_DIR}/lib
    $ENV{OSG_DIR}
-    $ENV{OSGDIR}/lib64
-    $ENV{OSGDIR}/lib
-    $ENV{OSGDIR}
+    ${CMAKE_PREFIX_PATH}/lib64
+    ${CMAKE_PREFIX_PATH}/lib
+    ${CMAKE_PREFIX_PATH}
    NO_DEFAULT_PATH
 )

-FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG 
-    NAMES OpenThreadsd OpenThreadsWin32d
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+IF(NOT OPENTHREADS_LIBRARY_DEBUG)
+    FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG 
+        NAMES OpenThreadsd OpenThreadsWin32d
+        PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+        PATH_SUFFIXES lib64 lib
+    )
+ENDIF(NOT OPENTHREADS_LIBRARY_DEBUG)

-FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG 
-    NAMES OpenThreadsd OpenThreadsWin32d
-    PATHS
-    /usr/local/lib64
-    /usr/local/lib
-    /usr/lib64
-    /usr/lib
-    /sw/lib64
-    /sw/lib
-    /opt/local/lib64
-    /opt/local/lib
-    /opt/csw/lib64
-    /opt/csw/lib
-    /opt/lib64
-    /opt/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-)
+IF(NOT OPENTHREADS_LIBRARY_DEBUG)
+    FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG 
+        NAMES OpenThreadsd OpenThreadsWin32d
+        PATHS
+        /usr/local/lib64
+        /usr/local/lib
+        /usr/lib64
+        /usr/lib
+        /sw/lib64
+        /sw/lib
+        /opt/local/lib64
+        /opt/local/lib
+        /opt/csw/lib64
+        /opt/csw/lib
+        /opt/lib64
+        /opt/lib
+        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
+        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+    )
+ENDIF(NOT OPENTHREADS_LIBRARY_DEBUG)


 IF(OPENTHREADS_LIBRARY)
--- a/CMakeModules/FindOpenVRML.cmake
+++ b/CMakeModules/FindOpenVRML.cmake
@@ -8,7 +8,6 @@
 # correspond to the ./configure --prefix=$OPENVRML_DIR
 #
 # Created by Robert Osfield. 
-# Modified for the debug library by Jean-S<>bastien Guay.

 FIND_PATH(OPENVRML_INCLUDE_DIR openvrml/openvrml/common.h
    $ENV{OPENVRML_DIR}/include
@@ -48,26 +47,6 @@ FIND_LIBRARY(OPENVRML_LIBRARY
    /usr/freeware/lib64
 )

-FIND_LIBRARY(OPENVRML_LIBRARY_DEBUG 
-    NAMES openvrmld
-    PATHS
-    $ENV{OPENVRML_DIR}/lib
-    $ENV{OPENVRML_DIR}
-    $ENV{OSGDIR}/lib
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/lib
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-    /usr/freeware/lib64
-)
-
 SET(OPENVRML_FOUND "NO")
 IF(OPENVRML_LIBRARY AND OPENVRML_INCLUDE_DIR)
    SET(OPENVRML_FOUND "YES")
--- a/CMakeModules/FindPerformer.cmake
+++ b/CMakeModules/FindPerformer.cmake
@@ -10,8 +10,6 @@
 # Created by Robert Osfield. 

 FIND_PATH(PERFORMER_INCLUDE_DIR Performer/pfdu.h
-    $ENV{PFROOT}/include
-    $ENV{PFROOT}
    $ENV{PERFORMER_DIR}/include
    $ENV{PERFORMER_DIR}
    $ENV{OSGDIR}/include
@@ -29,51 +27,25 @@ FIND_PATH(PERFORMER_INCLUDE_DIR Performer/pfdu.h
    /usr/freeware/include
 )

-IF(MSVC)
-    FIND_LIBRARY(PERFORMER_LIBRARY 
-        NAMES libpf
-        PATHS
-        $ENV{PFROOT}/lib
-        $ENV{PFROOT}
-        $ENV{PERFORMER_DIR}/lib
-        $ENV{PERFORMER_DIR}
-        $ENV{OSGDIR}/lib
-        $ENV{OSGDIR}
-        $ENV{OSG_ROOT}/lib
-        ~/Library/Frameworks
-        /Library/Frameworks
-        /usr/local/lib
-        /usr/lib
-        /sw/lib
-        /opt/local/lib
-        /opt/csw/lib
-        /opt/lib
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-        /usr/freeware/lib64
-    )
-ELSE(MSVC)
-    FIND_LIBRARY(PERFORMER_LIBRARY 
-        NAMES pf
-        PATHS
-        $ENV{PFROOT}/lib
-        $ENV{PFROOT}
-        $ENV{PERFORMER_DIR}/lib
-        $ENV{PERFORMER_DIR}
-        $ENV{OSGDIR}/lib
-        $ENV{OSGDIR}
-        $ENV{OSG_ROOT}/lib
-        ~/Library/Frameworks
-        /Library/Frameworks
-        /usr/local/lib
-        /usr/lib
-        /sw/lib
-        /opt/local/lib
-        /opt/csw/lib
-        /opt/lib
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-        /usr/freeware/lib64
-    )
-ENDIF(MSVC)
+FIND_LIBRARY(PERFORMER_LIBRARY 
+    NAMES pf
+    PATHS
+    $ENV{PERFORMER_DIR}/lib
+    $ENV{PERFORMER_DIR}
+    $ENV{OSGDIR}/lib
+    $ENV{OSGDIR}
+    $ENV{OSG_ROOT}/lib
+    ~/Library/Frameworks
+    /Library/Frameworks
+    /usr/local/lib
+    /usr/lib
+    /sw/lib
+    /opt/local/lib
+    /opt/csw/lib
+    /opt/lib
+    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+    /usr/freeware/lib64
+)

 SET(PERFORMER_FOUND "NO")
 IF(PERFORMER_LIBRARY AND PERFORMER_INCLUDE_DIR)
--- a/CMakeModules/FindQuickTime.cmake
+++ b/CMakeModules/FindQuickTime.cmake
@@ -6,6 +6,7 @@
 #
 # $QUICKTIME_DIR is an environment variable that would
 # correspond to the ./configure --prefix=$QUICKTIME_DIR
+# used in building gdal.
 #
 # Created by Eric Wing. 

@@ -13,37 +14,19 @@
 # so I am going to case the two.

 IF(APPLE)
-  FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime/QuickTime.h)
-  FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime)
+    FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime/QuickTime.h)
+    FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime)
 ELSE(APPLE)
-  FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h
-    $ENV{QUICKTIME_DIR}/include
-    $ENV{QUICKTIME_DIR}
-    NO_DEFAULT_PATH
-  )
-  FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES include
-  )
-  FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h)
-
-  FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime
-    $ENV{QUICKTIME_DIR}/lib
-    $ENV{QUICKTIME_DIR}
-    NO_DEFAULT_PATH
-  )
-  FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-  )
-  FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime)
+    FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h
+        $ENV{QUICKTIME_DIR}/include
+        $ENV{QUICKTIME_DIR}
+    )
+    FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime)
 ENDIF(APPLE)

 SET(QUICKTIME_FOUND "NO")
 IF(QUICKTIME_LIBRARY AND QUICKTIME_INCLUDE_DIR)
-  SET(QUICKTIME_FOUND "YES")
+    SET(QUICKTIME_FOUND "YES")
 ENDIF(QUICKTIME_LIBRARY AND QUICKTIME_INCLUDE_DIR)


--- a/CMakeModules/ModuleInstall.cmake
+++ b/CMakeModules/ModuleInstall.cmake
@@ -21,9 +21,6 @@ SOURCE_GROUP(
    FILES ${LIB_PUBLIC_HEADERS}
 )

-IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
-	HANDLE_MSVC_DLL()
-ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL)

 INSTALL(
    TARGETS ${LIB_NAME}
--- a/CMakeModules/OsgMacroUtils.cmake
+++ b/CMakeModules/OsgMacroUtils.cmake
@@ -22,20 +22,7 @@ ENDMACRO(LINK_WITH_VARIABLES TRGTNAME)

 MACRO(LINK_INTERNAL TRGTNAME)
    FOREACH(LINKLIB ${ARGN})
-        IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
-            #when using versioned names, the .dll name differ from .lib name, there is a problem with that:
-            #CMake 2.4.7, at least seem to use PREFIX instead of IMPORT_PREFIX  for computing linkage info to use into projects,
-            # so we full path name to specify linkage, this prevent automatic inferencing of dependencies, so we add explicit depemdencies
-            #to library targets used
-        IF(NOT MSVC_IDE)
-            TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${OUTPUT_LIBDIR}/${LINKLIB}.lib" debug "${OUTPUT_LIBDIR}/${LINKLIB}${CMAKE_DEBUG_POSTFIX}.lib")
-        ELSE(NOT MSVC_IDE)
-            TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${OUTPUT_LIBDIR}/${LINKLIB}" debug "${OUTPUT_LIBDIR}/${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
-        ENDIF(NOT MSVC_IDE)
-            ADD_DEPENDENCIES(${TRGTNAME} ${LINKLIB})
-        ELSE(MSVC AND OSG_MSVC_VERSIONED_DLL)
-            TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${LINKLIB}" debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
-        ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL)
+        TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${LINKLIB}" debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
    ENDFOREACH(LINKLIB)
 ENDMACRO(LINK_INTERNAL TRGTNAME)

@@ -95,21 +82,16 @@ MACRO(SETUP_LINK_LIBRARIES)
      ENDIF(TO_INSERT)
    ENDFOREACH(LINKLIB)

-#    FOREACH(LINKLIB ${TARGET_LIBRARIES})
-#            TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} optimized ${LINKLIB} debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
-#    ENDFOREACH(LINKLIB)
-        LINK_INTERNAL(${TARGET_TARGETNAME} ${TARGET_LIBRARIES})
+    FOREACH(LINKLIB ${TARGET_LIBRARIES})
+            TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} optimized ${LINKLIB} debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
+    ENDFOREACH(LINKLIB)
+
    FOREACH(LINKLIB ${TARGET_EXTERNAL_LIBRARIES})
            TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} ${LINKLIB})
    ENDFOREACH(LINKLIB)
        IF(TARGET_LIBRARIES_VARS)
            LINK_WITH_VARIABLES(${TARGET_TARGETNAME} ${TARGET_LIBRARIES_VARS})
        ENDIF(TARGET_LIBRARIES_VARS)
-    IF(MSVC  AND OSG_MSVC_VERSIONED_DLL)
-        #when using full path name to specify linkage, it seems that already linked libs must be specified
-            LINK_EXTERNAL(${TARGET_TARGETNAME} ${OPENGL_LIBRARIES}) 
-    ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL)
-
 ENDMACRO(SETUP_LINK_LIBRARIES)

 ############################################################################################
@@ -139,32 +121,9 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)
        ADD_LIBRARY(${TARGET_TARGETNAME} STATIC ${TARGET_SRC} ${TARGET_H})
    ENDIF(DYNAMIC_OPENSCENEGRAPH)
    
-    #not sure if needed, but for plugins only Msvc need the d suffix
+    #not sure if needed, but for plugins only msvc need the d suffix
    IF(NOT MSVC)
        SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX "")
-    ELSE(NOT MSVC)
-        IF(OSG_MSVC_VERSIONED_DLL) 
-                       
-                #this is a hack... the build place is set to lib/<debug or release> by LIBARARY_OUTPUT_PATH equal to OUTPUT_LIBDIR
-                #the .lib will be crated in ../ so going straight in lib by the IMPORT_PREFIX property
-                #because we want dll placed in OUTPUT_BINDIR ie the bin folder sibling of lib, we can use ../../bin to go there,
-                #it is hardcoded, we should compute OUTPUT_BINDIR position relative to OUTPUT_LIBDIR ... to be implemented
-                #changing bin to something else breaks this hack
-                #the dll are placed in bin/${OSG_PLUGINS} 
-                
-                IF(NOT MSVC_IDE)
-                    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../bin/${OSG_PLUGINS}/")                     
-                ELSE(NOT MSVC_IDE)
-                    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../../bin/${OSG_PLUGINS}/" IMPORT_PREFIX "../")
-                ENDIF(NOT MSVC_IDE)
-
-        ELSE(OSG_MSVC_VERSIONED_DLL)
-            
-            #in standard mode (unversioned) the .lib and .dll are placed in lib/<debug or release>/${OSG_PLUGINS}.
-            #here the PREFIX property has been used, the same result would be accomplidhe by prepending ${OSG_PLUGINS}/ to OUTPUT_NAME target property
-            
-            SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "${OSG_PLUGINS}/")
-        ENDIF(OSG_MSVC_VERSIONED_DLL)
    ENDIF(NOT MSVC)
    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
 
@@ -172,7 +131,7 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)

 #the installation path are differentiated for win32 that install in bib versus other architecture that install in lib${LIB_POSTFIX}/${OSG_PLUGINS}
    IF(WIN32)
-        INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib/${OSG_PLUGINS} LIBRARY DESTINATION bin/${OSG_PLUGINS} )
+        INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION bin )
    ELSE(WIN32)
        INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} LIBRARY DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} )
    ENDIF(WIN32)
@@ -228,11 +187,9 @@ MACRO(SETUP_EXE IS_COMMANDLINE_APP)
        
    ENDIF(${IS_COMMANDLINE_APP})
    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
-    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
+    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME})
-    IF(MSVC_IDE AND OSG_MSVC_VERSIONED_DLL)
-            SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../")    
-    ENDIF(MSVC_IDE AND OSG_MSVC_VERSIONED_DLL)
+    
    SETUP_LINK_LIBRARIES()    

 ENDMACRO(SETUP_EXE)
@@ -283,45 +240,3 @@ MACRO(SETUP_COMMANDLINE_EXAMPLE EXAMPLE_NAME)
    SETUP_EXAMPLE(${EXAMPLE_NAME} 1)

 ENDMACRO(SETUP_COMMANDLINE_EXAMPLE)
-
-# Takes two optional arguments -- osg prefix and osg version
-MACRO(HANDLE_MSVC_DLL)
-	#this is a hack... the build place is set to lib/<debug or release> by LIBARARY_OUTPUT_PATH equal to OUTPUT_LIBDIR
-	#the .lib will be crated in ../ so going straight in lib by the IMPORT_PREFIX property
-	#because we want dll placed in OUTPUT_BINDIR ie the bin folder sibling of lib, we can use ../../bin to go there,
-	#it is hardcoded, we should compute OUTPUT_BINDIR position relative to OUTPUT_LIBDIR ... to be implemented
-	#changing bin to something else breaks this hack
-	#the dll are versioned by prefixing the name with osg${OPENSCENEGRAPH_SOVERSION}-
-
-        # LIB_PREFIX: use "osg" by default, else whatever we've been given.
-        IF(${ARGC} GREATER 0)
-                SET(LIB_PREFIX ${ARGV0})
-        ELSE(${ARGC} GREATER 0)
-                SET(LIB_PREFIX osg)
-        ENDIF(${ARGC} GREATER 0)
-
-        # LIB_SOVERSION: use OSG's soversion by default, else whatever we've been given
-        IF(${ARGC} GREATER 1)
-                SET(LIB_SOVERSION ${ARGV1})
-        ELSE(${ARGC} GREATER 1)
-                SET(LIB_SOVERSION ${OPENSCENEGRAPH_SOVERSION})
-        ENDIF(${ARGC} GREATER 1)
-    
-        IF(NOT MSVC_IDE) 
-            SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../bin/${LIB_PREFIX}${LIB_SOVERSION}-")
-            SET(NEW_LIB_NAME "${OUTPUT_BINDIR}/${LIB_PREFIX}${LIB_SOVERSION}-${LIB_NAME}")
-            ADD_CUSTOM_COMMAND(
-                TARGET ${LIB_NAME}
-                POST_BUILD
-                COMMAND ${CMAKE_COMMAND} -E copy "${NEW_LIB_NAME}.lib"  "${OUTPUT_LIBDIR}/${LIB_NAME}.lib"
-                COMMAND ${CMAKE_COMMAND} -E copy "${NEW_LIB_NAME}.exp"  "${OUTPUT_LIBDIR}/${LIB_NAME}.exp"
-                COMMAND ${CMAKE_COMMAND} -E remove "${NEW_LIB_NAME}.lib"
-                COMMAND ${CMAKE_COMMAND} -E remove "${NEW_LIB_NAME}.exp"
-                )
-        ELSE(NOT MSVC_IDE)
-            SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../../bin/${LIB_PREFIX}${LIB_SOVERSION}-" IMPORT_PREFIX "../")
-        ENDIF(NOT MSVC_IDE)
-
-#     SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../../bin/osg${OPENSCENEGRAPH_SOVERSION}-")
-#     SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES IMPORT_PREFIX "../")
-ENDMACRO(HANDLE_MSVC_DLL)
--- a/CMakeModules/clean_directories
+++ b/CMakeModules/clean_directories
@@ -1,6 +0,0 @@
-find . -name Makefile | xargs rm -rf 
-find . -name cmake_install.cmake  | xargs rm -rf 
-find . -name CMakeFiles | xargs rm -rf 
-rm -rf CMakeCache.txt cmake_uninstall.cmake install_manifest.txt
-rm -rf lib bin
-
--- a/5700
+++ b/5700
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,118 +1,6 @@
 OSG News
 ========

-= !OpenSceneGraph 2.4 release adds geometry shaders, multiple render targets, support for terrabyte scale terrain databases, writing to !OpenFlight and much more. =
-
-PERTHSHIRE, Scotland - 25th April 2008 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 2.4, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 2.4 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modeling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. !OpenSceneGraph 2.4 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems.
-
-=== Open-source development delivers industry-leading features and performance ===
-The !OpenSceneGraph 2.4 release is the culmination of 9 years of work by the lead developers and the open-source community that has grown up around the project. The real-time graphics industry and academia embraced it from the very beginning, deploying it in real-world applications, and actively participating in its development, testing and refinement. The end result is a high-quality library with a feature set relevant to application developers' needs. 
-
-=== Updates include: ===
-
- * Support for OpenGL Geometry shaders
- * Support for OpenGL Multiple Render Targets extension to Frame Buffer Objects
- * Support for OpenGL Occlussion Query extension
- * New !OpenFlight writer
- * New libcurl based plugin for reading http hosted databases
- * Quicktime based reading of live video streams under Windows and OSX
- * Better load balancing in database pager
- * Improvements to osgTerrain for support of terrabyte scale whole earth terrain databases
- * Additions to the Shapefile loader with .dbf attribute file, .proj projection file support and loading data as doubles
- * Enhanced intersection functionality including double support for line intersections
- * Parallel build support under Visual Studio
- * Support for reading Producer .cfg viewer configuration files
- * A wide range of build and bug fixes
-  
-=== Downloads and Licensing ===
-!OpenSceneGraph is open-source so full source code is provided, and can be copied, modified and used free of charge for commercial and non-commercial use. Access to the source allows end users greater flexibility in how they develop, debug and deploy their applications.  They gain productivity and freedom by being able to leverage the tool chain in accordance with their own release cycles. Downloads of binaries and source can be found in the [http://www.openscenegraph.org/projects/osg/wiki/Downloads Downloads] section of the openscenegraph.org website.
-
-!OpenSceneGraph is released under the [http://www.openscenegraph.org/projects/osg/wiki/Legal OpenSceneGraph Public License], which is based on the Lesser GNU Public License (LGPL), permitting the software to be used free of charge across the full spectrum of commercial and open-source applications.  Furthermore, it allows both static and dynamic linking of the !OpenSceneGraph libraries without restricting the licensing of the user's software. 
-
-=== !OpenSceneGraph Books now available ===
-
-The !OpenSceneGraph Quick Start Guide is now available in Chinese as well as English, and alongside the Reference Manual books can be found at [http://www.osgbooks.com OsgBooks].
-
-=== Professional support and services ===
-!OpenSceneGraph project is backed up with professional services by [http://openscenegraph.com OpenSceneGraph Professional Services], based in Scotland, and [http://www.skew-matrix.com Skew-Matrix] and [http://www.blue-newt.com Blue-Newt Software] both based in the USA, and a range of [wiki:Community/Contractors Contractors] from around the world.  Services available include:
-
- * Confidential Professional Support
- * Bespoke development
- * Consultancy 
- * Training    
-
-=== Community support and contributions ===
-The diverse and growing community of over 1800 developers is centred around the public osg-users mailing list, where members discuss how best to use !OpenSceneGraph, provide mutual support, and coordinate development of new features and bug fixes. Members of this community come from many different countries with backgrounds ranging from some of the world's largest aerospace companies, game companies, and visual simulation specialists to university researchers, students and hobbyists. 
-
-The !OpenSceneGraph project owes a great deal to the community for its development and support, in particular we wish to thank the [http://www.openscenegraph.org/projects/osg/wiki/Support/Contributors/TwoPointFour 306 individuals] from around the world that have directly contributed to the development and refinement of the !OpenSceneGraph code base. 
-
----
-
-About !OpenSceneGraph:[[BR]]
-!OpenSceneGraph Project was founded in September 1999 by Don Burns and Robert Osfield.
-Further information, screenshots, downloads, documentation, and support links can be found on the !OpenSceneGraph project website http://www.openscenegraph.org.
-
-About !OpenSceneGraph Professional Services:[[BR]]
-!OpenSceneGraph Professional Services, founded by project lead Robert Osfield in April 2001, is based in Callander, Perhshire, Scotland, and provides professional services on top of !OpenSceneGraph. Further information about the services it provides can be found at http://www.openscenegraph.com.
-
----------------------------------------------------------------------------------------
-
-= OpenSceneGraph 2.2 release adds support for advanced displays, soft and parallel split shadow maps and easier builds =
-
-PERTHSHIRE, Scotland - 4th October 2007  - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 2.2, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 2.2 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modeling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. !OpenSceneGraph 2.2 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and !FreeBSD operating systems.
-
-=== Open-source development delivers industry-leading features and performance ===
-The !OpenSceneGraph 2.2 release is the culmination of 8 years of work by the lead developers and the open-source community that has grown up around the project. The real-time graphics industry and academia embraced it from the very beginning, deploying it in real-world applications, and actively participating in its development, testing and refinement. The end result is a high-quality library with a feature set relevant to application developers' needs. 
-
-=== Updates include: ===
-
- * Improved build support under Windows including versioning of dll's to avoid problems with mixing !OpenSceneGraph versions on a single system.
- * Support for Texture2DArray and integer texture OpenGL extensions.
- * Support for spherical displays.
- * Support for checkerboard stereo displays.
- * Soft Shadows and Parallel Split Shadow Maps now supported.
- * Viewer configuration file support
- * Writer support for Inventor, OBJ 3D formats
- * Writer support for HDR imagery
- * Viewer Configuration file support
- * Unification of threading models and viewer event handlers so that all now work for both Viewer and !CompositeViewer classes.
- * GDAL plugin for support for a wide range of geospatial imagery and digital elevation maps formats.
- * A wide range of build and bug fixes.
-  
-=== Downloads and Licensing ===
-!OpenSceneGraph is open-source so full source code is provided, and can be copied, modified and used free of charge for commercial and non-commercial use. Access to the source allows end users greater flexibility in how they develop, debug and deploy their applications.  They gain productivity and freedom by being able to leverage the tool chain in accordance with their own release cycles. Downloads of binaries and source can be found in the [http://www.openscenegraph.org/projects/osg/wiki/Downloads Downloads] section of the openscenegraph.org website. [Downloads Downloads]
-
-!OpenSceneGraph is released under the [http://www.openscenegraph.org/projects/osg/wiki/Legal OpenSceneGraph Public License], which is based on the Lesser GNU Public License (LGPL), permitting the software to be used free of charge across the full spectrum of commercial and open-source applications.  Furthermore, it allows both static and dynamic linking of the !OpenSceneGraph libraries without restricting the licensing of the user's software. 
-
-=== !OpenSceneGraph Books now available ===
-
-The !OpenSceneGraph Quick Start Guide is now available in Chinese as well as English, and alongside the Reference Manual books can be found at [http://www.osgbooks.com OsgBooks].
-
-=== Professional support and services ===
-!OpenSceneGraph project is backed up with professional services by [http://openscenegraph.com OpenSceneGraph Professional Services], based in Scotland, and [http://www.skew-matrix.com Skew-Matrix] and [http://www.blue-newt.com Blue-Newt Software] both based in the USA.
-
- * Confidential Professional Support
- * Bespoke development
- * Consultancy 
- * Training    
-
-=== Community support and contributions ===
-The diverse and growing community of over 1700 developers is centered around the public osg-users mailing list, where members discuss how best to use !OpenSceneGraph, provide mutual support, and coordinate development of new features and bug fixes. Members of this community come from many different countries with backgrounds ranging from some of the world's largest aerospace companies, game companies, and visual simulation specialists to university researchers, students and hobbyists. 
-
-The !OpenSceneGraph project owes a great deal to the community for its development and support, in particular we wish to thank the [http://www.openscenegraph.org/projects/osg/wiki/Support/Contributors/TwoPointTwo 282 individuals] from around the world that have directly contributed to the development and refinement of the !OpenSceneGraph code base. 
-
----
-
-About !OpenSceneGraph:[[BR]]
-!OpenSceneGraph Project was founded in September 1999 by Don Burns and Robert Osfield.
-Further information, screenshots, downloads, documentation, and support links can be found on the !OpenSceneGraph project website http://www.openscenegraph.org.
-
-About !OpenSceneGraph Professional Services:[[BR]]
-!OpenSceneGraph Professional Services, founded by project lead Robert Osfield in April 2001, is based in Callander, Perhshire, Scotland, and provides professional services on top of !OpenSceneGraph. Further information about the services it provides can be found at http://www.openscenegraph.com.
-
-
--------------------------------------------------------------------------------
-

 !!![=OpenSceneGraph=] 2.0 release improves ease-of-use and scalability, introducing new osgViewer, osgShadow and osgManipulator libraries, new build system, improved multi-core, multi-GPU support.

@@ -169,8 +57,6 @@ The [=OpenSceneGraph=] project owes a great deal to the community for its develo
 Robert Osfield\\
 Project Lead and Proprietor [=OpenSceneGraph=] Professional Services

--------------------------------------------------------------------------------
-

 !!![=OpenSceneGraph=] 1.2 release introduces Windows 64bit and AIX support, COLLADA support, processor affinity and texture atlas builder.

--- a/PlatformSpecifics/Windows/VisualStudio_Syntax_Highlighting.txt
+++ b/PlatformSpecifics/Windows/VisualStudio_Syntax_Highlighting.txt
@@ -1,21 +0,0 @@
-Mapping extensionless header files to C++ in Visual Studio
-=============================================================================
-
-Previous versions of the OSG included registry files which enabled syntax 
-highlighting for OSG's extensionless headers in Visual Studio. These are not 
-needed anymore, because starting with Visual Studio 2002 (7.0), there is a 
-setting that will map extensionless files to a certain language in the 
-options. This also works for the Express Editions.
-
-1. Go to Tools-Options.
-2. Open the Text Editor section, and click on File Extension.
-3. At the bottom of the window, check the Map Extensionless Files To 
-   checkbox, and select Microsoft Visual C++ in the list to the right.
-
-Note that if you use this feature for other languages, you will have to 
-change it when needed. If that is too cumbersome you may want to generate 
-the registry files and do it that way instead. Please see the 
-.reg files in previous versions of OSG in the VisualStudio directory for 
-a guide on how to do that (hint: check the location of the registry key
-to make sure the added values end up in the right place for your version
-of Visual Studio).
--- a/README.txt
+++ b/README.txt
@@ -6,16 +6,11 @@ OpenSceneGraph website:

    http://www.openscenegraph.org
  
-For the impatient, read the simplified build notes below. For support 
-subscribe to our public mailing list:
-
-    http://www.openscenegraph.org/projects/osg/wiki/MailingLists
-
-
+For the impatient, read the simplified build notes below.

 Robert Osfield.
 Project Lead.
-25th April 2008.
+15th June 2007.

 --

@@ -29,10 +24,7 @@ checks for installed dependenciesand then generates the appropriate
 build system.

 If you don't already have CMake installed on your system you can grab 
-it from http://www.cmake.org, use version 2.4.6 or later.  Details on the 
-OpenSceneGraph's CMake build can be found at:
-
-    http://www.openscenegraph.org/projects/osg/wiki/Build/CMake
+it from http://www.cmake.org, use version 2.4.6 or later.

 Under unices (i.e. Linux, IRIX, Solaris, Free-BSD, HP-Ux, AIX, OSX) 
 use the cmake or ccmake command-line utils, or use the included tiny 
@@ -40,10 +32,10 @@ configure script that'll run cmake for you.  The configure script
 simply runs 'cmake . -DCMAKE_BUILD_TYPE=Release' to ensure that you 
 get the best performance from your final libraries/applications.
 
-    cd OpenSceneGraph
-    ./configure
-    make
-    sudo make install
+  cd OpenSceneGraph
+  ./configure
+  make
+  sudo make install
  
 Alternatively, you can create an out-of-source build directory and run 
 cmake or ccmake from there. The advantage to this approach is that the 
@@ -52,23 +44,22 @@ source directory, and also makes it possible to have multiple
 independent build targets by creating multiple build directories. In a 
 directory alongside the OpenSceneGraph use:

-    mkdir build
-    cd build
-    cmake ../OpenSceneGraph -DCMAKE_BUILD_TYPE=Release
-    make
-    sudo make install
+  mkdir build
+  cd build
+  cmake ../OpenSceneGraph -DCMAKE_BUILD_TYPE=Release
+  make
+  sudo make install

 Under Windows use the GUI tool CMakeSetup to build your VisualStudio 
 files. The following page on our wiki dedicated to the CMake build 
 system should help guide you through the process:

-    http://www.openscenegraph.org/projects/osg/wiki/Support/PlatformSpecifics/VisualStudio
+   http://www.openscenegraph.com/index.php?page=Build.CMake

 Under OSX you can either use the CMake build system above, or use the 
 Xcode projects that you will find in the OpenSceneGraph/Xcode 
 directory.

 For further details on compilation, installation and platform-specific 
-information read "Getting Started" guide:
-
-    http://www.openscenegraph.org/projects/osg/wiki/Support/GettingStarted
+information read "Getting Started" at http://www.openscenegraph.org, 
+under "Documentation".
--- a/VisualStudio/LANGEXT.DAT
+++ b/VisualStudio/LANGEXT.DAT
@@ -0,0 +1,201 @@
+langext.dat - Map explicit filename to a language
+[C/C++]
+algorithm bitset cassert cctype cerrno cfloat ciso646 climits clocale cmath complex
+csetjmp csignal cstdarg cstddef cstdio cstdlib cstring ctime cwchar cwctype
+deque exception fstream functional iomanip ios iosfwd iostream istream iterator
+limits list locale map memory new numeric ostream queue
+set sstream stack stdexcept streambuf string strstream typeinfo utility valarray vector
+xcomplex xios xiosbase xlocale xlocinfo xlocmon xlocnum xloctime xmemory xstddef xstring xtree xutility
+AccelOperator
+AlphaFunc
+AnimationPath
+AnimationPathManipulator
+ApplicationUsage
+ArgumentParser
+Array
+Billboard
+BlendFunc
+BlinkSequence
+BoundingBox
+BoundingSphere
+BoundsChecking
+buffered_value
+Camera
+CameraManipulator
+CenteredPlacer
+ClearNode
+ClipNode
+ClipPlane
+CollectOccludersVisitor
+ColorMask
+ColorMatrix
+ConvexPlanarOccluder
+ConvexPlanarPolygon
+CopyOp
+Counter
+CubeMapGenerator
+CullFace
+CullingSet
+CullStack
+CullVisitor
+DelaunayTriangulator
+Depth
+DisplayListVisitor
+DisplayRequirementsVisitor
+DisplaySettings
+DOFTransform
+DotOsgWrapper
+Drawable
+DrawPixels
+DriveManipulator
+DynamicLibrary
+Emitter
+Endian
+EventAdapter
+Export
+fast_back_stack
+Field
+FieldReader
+FieldReaderIterator
+FileNameUtils
+FileUtils
+FlightManipulator
+FluidFrictionOperator
+Fog
+Font
+ForceOperator
+FrameStamp
+FrontFace
+Geode
+Geometry
+GeoSet
+GL
+GLExtensions
+GLU
+Group
+GUIActionAdapter
+GUIEventAdapter
+GUIEventHandler
+GUIEventHandlerVisitor
+HalfWayMapGenerator
+HighlightMapGenerator
+Image
+Impostor
+ImpostorSprite
+Input
+InsertImpostorsVisitor
+Interpolator
+IntersectVisitor
+KeyboardMouseCallback
+KeySwitchCameraManipulator
+Light
+LightModel
+LightPoint
+LightPointNode
+LightSource
+LinearInterpolator
+LineSegment
+LineStipple
+LineWidth
+LOD
+Material
+Math
+Matrix
+MatrixTransform
+ModularEmitter
+ModularProgram
+MultiSegmentPlacer
+Node
+NodeCallback
+NodeVisitor
+Notify
+Object
+OccluderNode
+Operator
+Optimizer
+OsgCameraGroup
+OsgSceneHandler
+Output
+ParameterOutput
+Particle
+ParticleProcessor
+ParticleSystem
+ParticleSystemUpdater
+PickVisitor
+Placer
+Plane
+Point
+PointPlacer
+PolygonMode
+PolygonOffset
+PolygonStipple
+Polytope
+PositionAttitudeTransform
+PrimitiveSet
+Program
+Projection
+Quat
+RadialShooter
+RandomRateCounter
+range
+ReaderWriter
+ReadFile
+ref_ptr
+Referenced
+ReflectionMapGenerator
+Registry
+RenderBin
+StateGraph
+RenderLeaf
+RenderStage
+PositionalStateContianer
+SceneView
+Sector
+SectorPlacer
+SegmentPlacer
+Sequence
+SetSceneViewVisitor
+ShadeModel
+ShadowVolumeOccluder
+Shape
+ShapeDrawable
+Shooter
+SmoothingVisitor
+State
+StateAttribute
+StateSet
+StateSetManipulator
+Statistics
+Stencil
+String
+Switch
+Tessellator
+TexEnv
+TexEnvCombine
+TexGen
+TexMat
+Text
+Texture
+Texture1D
+Texture2D
+Texture3D
+TextureCubeMap
+TextureRectangle
+Timer
+TrackballManipulator
+Transform
+TransformCallback
+TriangleFunctor
+TriStripVisitor
+UnitTestFramework
+UpdateVisitor
+VariableRateCounter
+Vec2
+Vec3
+Vec4
+Version
+VertexProgram
+Viewer
+ViewerEventHandler
+Viewport
+WriteFile
--- a/VisualStudio/MUST_READ_ME.txt
+++ b/VisualStudio/MUST_READ_ME.txt
@@ -0,0 +1,93 @@
+Detailed build documentation can be found on the OpenSceneGraph website at:
+
+  http://openscenegraph.org/osgwiki/pmwiki.php/PlatformSpecifics/VisualStudio
+
+IMPORTANT NOTE: Whilst the OSG will compile cleanly with the basic VC++6.0
+and its own STL implementation, the OSG will crash regularily due to bugs
+in VC++6.0's STL. VC++6.0's STL is horribly broken and therefore is *NOT*
+supported. Do not attempt to use the OSG in conjunction with native VC++6.0
+STL implemention.
+
+The supported combinations are:
+
+    1.Visual Studio8.x .NET
+    2.Visual Studio7.x .NET
+
+Deprecated are:
+
+    3.Visual Studio6.0 + Dinkumware's STL bug fix patches
+    4.Visual Studio6.0 + STLport
+
+For details on how to patch VisualStudio6.0 see the above website link.
+Note, osgIntrospection, src/osgWrapper plugins and the
+osgintrospection example cannot be compiled under VisualStudio plugin.
+You will also need to run the fixup-vc6-dsps.pl script to clean up the
+project files that won't otherwise compile to do new elements required
+for support of Window 64 bit build under VS 7.x and 8.x.
+
+Several of the plugins and examples require external dependancies.  Full details on where to obtain
+these can be found in doc/dependancies.html.
+
+
+--
+
+For syntax highlighting in VisualStudio which the standard C++ style headers
+found in the OSG :
+
+VisualStudio6.0
+
+    Substiture the LANDEXT.DAT file found in this directory with the one found
+    *\Common\MSDev98\Bin
+
+VisualStudio7.x & 8.x/.NET
+
+    Install the syntaxhighlight.reg (just double click it). This will update
+    Extensionless file for Visual Studio.  Don't worry, it will keep the
+    current extensionless files (STL ones) intact.
+
+--
+
+How to use the Visual Studio projects:
+
+To build the OpenSceneGraph code in Visual Studio, you normally must use the VisualStudio.sln solution file provided.  The individual projects won't build as-is, because they depend on each other and only the VisualStudio.sln file provides those dependencies.
+
+To create a program based on an example, probably the easiest way is to do this:
+
+1. Copy the VisualStudio.sln project to a new file in the same directory
+2. Copy the project you want to base your new project on to a new directory in the same level of the directory tree
+3. Open the new .sln file you copied in step 1
+4. Remove unneeded projects from it, but keep the core libraries (osg, osgDB, etc.).  Shift-clicking to select a bunch of projects at once makes this easier to do
+5. Add the new project to that solution
+6. Set the dependencies for your new project.  This is most easily done by opening the Solution Properties dialog, going to Project Dependencies, and checking off the libraries your project depends on
+
+--
+
+Building 64 bit binaries
+
+64 bit OpenSceneGraph and OpenThreads binaries can be built in Visual Studio 8, but several extra steps are required due to limits of the Visual Studio 6 project files:
+
+1. For each of the OpenSceneGraph, and OpenThreads .dsw files, :
+  a. Open the .dsw or .sln file and convert all projects to VS 8 format.
+  b. Open the Configuration Manager window under the Build menu, bring up the New Solution Platform window by selecting <New...> in the Active solution platform drop-down menu.  Select x64 as the new platform and copy settings from Win32 (you need to have the x64 compiler installed to see the x64 platform option).  Ensure the Create new project platforms checkbox is selected.  Click OK, then close the Configuration Manager window.
+  c. Do a "Save All" to save the project files.
+
+2. Visual Studio unfortunately chooses its own Output Directory setting for the x64 configurations in step 1.b., and this must be reset to the Win32 setting.
+
+  IF PERL _IS_ INSTALLED (native or Cygwin), do the following:
+  a. Close all Visual Studio solutions.
+  b. Open a command shell and cd to the OpenSceneGraph/VisualStudio directory.
+  c. Run the command "perl reset-64bit-outdirs.pl".
+  d. Reopen the solutions.
+
+  IF PERL _IS NOT_ INSTALLED, do the following to accomplish the same thing manually:
+  a. In the OpenThreads solution, open the properties window for the OpenThreads project.
+     i. Select multiple configurations, Debug and Release.  Under the General page, overwrite the Output Directory path of the x64 platform with the corresponding Win32 path.  For static builds, do the same thing for the Debug Static and Release Static configurations.
+  b. In the OpenSceneGraph solution:
+     i. Select all the "Application" and "Example" projects in the Solution Explorer window and repeat step 2.a.i.  Note there are no static configurations.
+     ii. Select all the "Core" projects _except "Core osgIntrospection"_ and repeat step 2.a.i.
+     iii. Select "Core osgIntrospection" and repeat step 2.a.i.  Note there are no static configurations.
+     iv. Select all the "osgPlugin" projects and repeat step 2.a.i.
+     v. Select all the "osgWrapper" projects and repeat step 2.a.i.  Note there are no static configurations.
+  c. Do a "Save All" to save the project files.
+
+3. Select the desired x64 configuration, and build away!
--- a/PlatformSpecifics/Windows/collect_mangled_names.bat
+++ b/PlatformSpecifics/Windows/collect_mangled_names.bat
--- a/PlatformSpecifics/Windows/collect_mangled_names.js
+++ b/PlatformSpecifics/Windows/collect_mangled_names.js
--- a/VisualStudio/create_static_workspace.js
+++ b/VisualStudio/create_static_workspace.js
@@ -0,0 +1,33 @@
+/* create_static_workspace - Copyright (C) 2006 Joran Jessurun 
+ *
+ * This library is open source and may be redistributed and/or modified under  
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * OpenSceneGraph Public License for more details.
+ *
+ * Made by Joran Jessurun (A.J.Jessurun@tue.nl)
+ */ 
+var fso=WScript.createObject("Scripting.FileSystemObject");
+var ForReading=1;
+var ForWriting=2;
+
+WScript.echo("Creating OpenSceneGraphStatic.dsw from OpenSceneGraph.dsw");
+
+var source=fso.openTextFile("OpenSceneGraph.dsw",ForReading);
+var destin=fso.openTextFile("OpenSceneGraphStatic.dsw",ForWriting,true);
+var state=0; // 0=copy, 1=skip
+while(!source.atEndOfStream) {
+  line=source.readLine();
+  if(/Begin Project Dependency/.test(line)) state=1;
+  if(state==0) destin.writeLine(line);
+  if(/End Project Dependency/.test(line)) state=0;  
+}
+source.close();
+destin.close();
+
+WScript.echo("Done");
--- a/VisualStudio/highlight70.reg
+++ b/VisualStudio/highlight70.reg
@@ -0,0 +1,339 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\7.0\Languages\Extensionless Files\{B2F072B0-ABC1-11D0-9D62-00C04FD9DFD9}]
+"AccelOperator"=""
+"AlphaFunc"=""
+"AngularAccelOperator"=""
+"AnimationPath"=""
+"AnimationPathManipulator"=""
+"AnisotropicLighting"=""
+"ApplicationUsage"=""
+"Archive"=""
+"ArgumentParser"=""
+"Array"=""
+"Attributes"=""
+"AutoTransform"=""
+"Billboard"=""
+"BlendColor"=""
+"BlendEquation"=""
+"BlendFunc"=""
+"BlinkSequence"=""
+"BoundingBox"=""
+"BoundingSphere"=""
+"BoundsChecking"=""
+"buffered_value"=""
+"BufferObject"=""
+"BumpMapping"=""
+"Camera"=""
+"CameraView"=""
+"Cartoon"=""
+"CenteredPlacer"=""
+"ClearNode"=""
+"ClipNode"=""
+"ClipPlane"=""
+"ClusterCullingCallback"=""
+"CollectOccludersVisitor"=""
+"ColorMask"=""
+"ColorMatrix"=""
+"ColorRange"=""
+"Comparator"=""
+"CompositeViewer"=""
+"ConnectedParticleSystem"=""
+"ConstantRateCounter"=""
+"ConstructorInfo"=""
+"Converter"=""
+"ConverterProxy"=""
+"ConvexPlanarOccluder"=""
+"ConvexPlanarPolygon"=""
+"CoordinateSystemNode"=""
+"CopyOp"=""
+"Counter"=""
+"CubeMapGenerator"=""
+"CullFace"=""
+"CullingSet"=""
+"CullSettings"=""
+"CullStack"=""
+"CullVisitor"=""
+"CustomAttribute"=""
+"CustomAttributeProvider"=""
+"DatabasePager"=""
+"DelaunayTriangulator"=""
+"Depth"=""
+"DisplayRequirementsVisitor"=""
+"DisplaySettings"=""
+"DOFTransform"=""
+"DotOsgWrapper"=""
+"Drawable"=""
+"DrawPixels"=""
+"DriveManipulator"=""
+"DynamicLibrary"=""
+"Effect"=""
+"Emitter"=""
+"Endian"=""
+"EventAdapter"=""
+"EventVisitor"=""
+"Exceptions"=""
+"ExplosionDebrisEffect"=""
+"ExplosionEffect"=""
+"Export"=""
+"fast_back_stack"=""
+"Field"=""
+"FieldReader"=""
+"FieldReaderIterator"=""
+"FileNameUtils"=""
+"FileUtils"=""
+"FireEffect"=""
+"FlightManipulator"=""
+"FluidFrictionOperator"=""
+"FluidProgram"=""
+"Fog"=""
+"Font"=""
+"ForceOperator"=""
+"FragmentProgram"=""
+"FrameBufferObject"=""
+"FrameStamp"=""
+"FrontFace"=""
+"Geode"=""
+"GeographicLocation"=""
+"Geometry"=""
+"GL"=""
+"GL2Extensions"=""
+"GLExtensions"=""
+"GLObjectsVisitor"=""
+"GLU"=""
+"GraphicsContext"=""
+"GraphicsContextImplementation"=""
+"GraphicsThread"=""
+"GraphicsWindow"=""
+"GraphicsWindowWin32"=""
+"Group"=""
+"GUIActionAdapter"=""
+"GUIEventAdapter"=""
+"GUIEventHandler"=""
+"GUIEventHandlerVisitor"=""
+"HalfWayMapGenerator"=""
+"HelpHandler"=""
+"HeightFieldNode"=""
+"HeightFieldRenderer"=""
+"HighlightMapGenerator"=""
+"Image"=""
+"ImageOptions"=""
+"ImageStream"=""
+"Impostor"=""
+"ImpostorSprite"=""
+"Input"=""
+"InsertImpostorsVisitor"=""
+"InstanceCreator"=""
+"Interpolator"=""
+"IntersectVisitor"=""
+"io_utils"=""
+"KeyboardMouseCallback"=""
+"KeySwitchMatrixManipulator"=""
+"Light"=""
+"LightModel"=""
+"LightPoint"=""
+"LightPointNode"=""
+"LightPointSystem"=""
+"LightSource"=""
+"LinearInterpolator"=""
+"LineSegment"=""
+"LineStipple"=""
+"LineWidth"=""
+"LOD"=""
+"LogicOp"=""
+"Material"=""
+"Math"=""
+"Matrix"=""
+"Matrixd"=""
+"Matrixf"=""
+"MatrixManipulator"=""
+"MatrixTransform"=""
+"MethodInfo"=""
+"ModularEmitter"=""
+"ModularProgram"=""
+"Multisample"=""
+"MultiSegmentPlacer"=""
+"MultiSwitch"=""
+"MultiTextureControl"=""
+"Node"=""
+"NodeCallback"=""
+"NodeTrackerCallback"=""
+"NodeTrackerManipulator"=""
+"NodeVisitor"=""
+"Notify"=""
+"Object"=""
+"OccluderNode"=""
+"Operator"=""
+"Optimizer"=""
+"OsgCameraGroup"=""
+"OsgSceneHandler"=""
+"Output"=""
+"OverlayNode"=""
+"PagedLOD"=""
+"ParameterInfo"=""
+"ParameterOutput"=""
+"Particle"=""
+"ParticleEffect"=""
+"ParticleProcessor"=""
+"ParticleSystem"=""
+"ParticleSystemUpdater"=""
+"Placer"=""
+"Plane"=""
+"Point"=""
+"PointPlacer"=""
+"PointSprite"=""
+"PolygonMode"=""
+"PolygonOffset"=""
+"PolygonStipple"=""
+"Polytope"=""
+"PositionalStateContainer"=""
+"PositionAttitudeTransform"=""
+"PrimitiveSet"=""
+"Program"=""
+"Program"=""
+"Projection"=""
+"PropertyInfo"=""
+"ProxyNode"=""
+"Quat"=""
+"RadialShooter"=""
+"RandomRateCounter"=""
+"range"=""
+"ReaderWriter"=""
+"ReadFile"=""
+"ReentrantMutex"=""
+"ref_ptr"=""
+"Referenced"=""
+"Reflection"=""
+"ReflectionMacros"=""
+"ReflectionMapGenerator"=""
+"Reflector"=""
+"Registry"=""
+"RenderBin"=""
+"RenderLeaf"=""
+"RenderStage"=""
+"ScalarBar"=""
+"ScalarsToColors"=""
+"Scene"=""
+"SceneView"=""
+"Scissor"=""
+"Scribe"=""
+"Sector"=""
+"SectorPlacer"=""
+"SegmentPlacer"=""
+"Sequence"=""
+"SetSceneViewVisitor"=""
+"ShadeModel"=""
+"Shader"=""
+"ShadowVolumeOccluder"=""
+"Shape"=""
+"ShapeDrawable"=""
+"SharedStateManager"=""
+"Shooter"=""
+"SimpleViewer"=""
+"Simplifier"=""
+"SmokeEffect"=""
+"SmokeTrailEffect"=""
+"SmoothingVisitor"=""
+"SpecularHighlights"=""
+"SphereSegment"=""
+"State"=""
+"StateAttribute"=""
+"StateGraph"=""
+"StateSet"=""
+"StateSetManipulator"=""
+"StaticMethodInfo"=""
+"Statistics"=""
+"StatsHandler"=""
+"Stencil"=""
+"String"=""
+"Switch"=""
+"TangentSpaceGenerator"=""
+"Technique"=""
+"TerrainManipulator"=""
+"Tessellator"=""
+"TexEnv"=""
+"TexEnvCombine"=""
+"TexEnvFilter"=""
+"TexGen"=""
+"TexGenNode"=""
+"TexMat"=""
+"Text"=""
+"Texture"=""
+"Texture1D"=""
+"Texture2D"=""
+"Texture3D"=""
+"TextureCubeMap"=""
+"TextureRectangle"=""
+"Timer"=""
+"TrackballManipulator"=""
+"Transform"=""
+"TransformAttributeFunctor"=""
+"TransformCallback"=""
+"TriangleFunctor"=""
+"TriangleIndexFunctor"=""
+"TriStripVisitor"=""
+"Type"=""
+"TypedConstructorInfo"=""
+"TypedMethodInfo"=""
+"TypeNameAliasProxy"=""
+"UFOManipulator"=""
+"Uniform"=""
+"UnitTestFramework"=""
+"UpdateVisitor"=""
+"Utility"=""
+"Validator"=""
+"Value"=""
+"VariableRateCounter"=""
+"variant_cast"=""
+"Vec2"=""
+"Vec2b"=""
+"Vec2d"=""
+"Vec2f"=""
+"Vec2s"=""
+"Vec3"=""
+"Vec3b"=""
+"Vec3d"=""
+"Vec3f"=""
+"Vec3s"=""
+"Vec4"=""
+"Vec4b"=""
+"Vec4d"=""
+"Vec4f"=""
+"Vec4s"=""
+"Vec4ub"=""
+"Version"=""
+"VertexProgram"=""
+"View"=""
+"Viewer"=""
+"ViewerEventHandler"=""
+"Viewport"=""
+"VisibilityGroup"=""
+"WriteFile"=""
+
+"Block"=""
+"BlockingQueue"=""
+"Camera"=""
+"CameraConfig"=""
+"CameraGroup"=""
+"Events"=""
+"Export"=""
+"InputArea"=""
+"Keyboard"=""
+"KeyboardMouse"=""
+"Math"=""
+"Referenced"=""
+"RefOpenThreads"=""
+"RenderSurface"=""
+"Timer"=""
+"Trackball"=""
+"Types"=""
+"Version"=""
+"Window3D"=""
+"VisualChooser"=""
+
+"Barrier"=""
+"Condition"=""
+"Exports"=""
+"Mutex"=""
+"ScopedLock"=""
+"Thread"=""
--- a/VisualStudio/highlight71.reg
+++ b/VisualStudio/highlight71.reg
@@ -0,0 +1,339 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\7.1\Languages\Extensionless Files\{B2F072B0-ABC1-11D0-9D62-00C04FD9DFD9}]
+"AccelOperator"=""
+"AlphaFunc"=""
+"AngularAccelOperator"=""
+"AnimationPath"=""
+"AnimationPathManipulator"=""
+"AnisotropicLighting"=""
+"ApplicationUsage"=""
+"Archive"=""
+"ArgumentParser"=""
+"Array"=""
+"Attributes"=""
+"AutoTransform"=""
+"Billboard"=""
+"BlendColor"=""
+"BlendEquation"=""
+"BlendFunc"=""
+"BlinkSequence"=""
+"BoundingBox"=""
+"BoundingSphere"=""
+"BoundsChecking"=""
+"buffered_value"=""
+"BufferObject"=""
+"BumpMapping"=""
+"Camera"=""
+"CameraView"=""
+"Cartoon"=""
+"CenteredPlacer"=""
+"ClearNode"=""
+"ClipNode"=""
+"ClipPlane"=""
+"ClusterCullingCallback"=""
+"CollectOccludersVisitor"=""
+"ColorMask"=""
+"ColorMatrix"=""
+"ColorRange"=""
+"Comparator"=""
+"CompositeViewer"=""
+"ConnectedParticleSystem"=""
+"ConstantRateCounter"=""
+"ConstructorInfo"=""
+"Converter"=""
+"ConverterProxy"=""
+"ConvexPlanarOccluder"=""
+"ConvexPlanarPolygon"=""
+"CoordinateSystemNode"=""
+"CopyOp"=""
+"Counter"=""
+"CubeMapGenerator"=""
+"CullFace"=""
+"CullingSet"=""
+"CullSettings"=""
+"CullStack"=""
+"CullVisitor"=""
+"CustomAttribute"=""
+"CustomAttributeProvider"=""
+"DatabasePager"=""
+"DelaunayTriangulator"=""
+"Depth"=""
+"DisplayRequirementsVisitor"=""
+"DisplaySettings"=""
+"DOFTransform"=""
+"DotOsgWrapper"=""
+"Drawable"=""
+"DrawPixels"=""
+"DriveManipulator"=""
+"DynamicLibrary"=""
+"Effect"=""
+"Emitter"=""
+"Endian"=""
+"EventAdapter"=""
+"EventVisitor"=""
+"Exceptions"=""
+"ExplosionDebrisEffect"=""
+"ExplosionEffect"=""
+"Export"=""
+"fast_back_stack"=""
+"Field"=""
+"FieldReader"=""
+"FieldReaderIterator"=""
+"FileNameUtils"=""
+"FileUtils"=""
+"FireEffect"=""
+"FlightManipulator"=""
+"FluidFrictionOperator"=""
+"FluidProgram"=""
+"Fog"=""
+"Font"=""
+"ForceOperator"=""
+"FragmentProgram"=""
+"FrameBufferObject"=""
+"FrameStamp"=""
+"FrontFace"=""
+"Geode"=""
+"GeographicLocation"=""
+"Geometry"=""
+"GL"=""
+"GL2Extensions"=""
+"GLExtensions"=""
+"GLObjectsVisitor"=""
+"GLU"=""
+"GraphicsContext"=""
+"GraphicsContextImplementation"=""
+"GraphicsThread"=""
+"GraphicsWindow"=""
+"GraphicsWindowWin32"=""
+"Group"=""
+"GUIActionAdapter"=""
+"GUIEventAdapter"=""
+"GUIEventHandler"=""
+"GUIEventHandlerVisitor"=""
+"HalfWayMapGenerator"=""
+"HelpHandler"=""
+"HeightFieldNode"=""
+"HeightFieldRenderer"=""
+"HighlightMapGenerator"=""
+"Image"=""
+"ImageOptions"=""
+"ImageStream"=""
+"Impostor"=""
+"ImpostorSprite"=""
+"Input"=""
+"InsertImpostorsVisitor"=""
+"InstanceCreator"=""
+"Interpolator"=""
+"IntersectVisitor"=""
+"io_utils"=""
+"KeyboardMouseCallback"=""
+"KeySwitchMatrixManipulator"=""
+"Light"=""
+"LightModel"=""
+"LightPoint"=""
+"LightPointNode"=""
+"LightPointSystem"=""
+"LightSource"=""
+"LinearInterpolator"=""
+"LineSegment"=""
+"LineStipple"=""
+"LineWidth"=""
+"LOD"=""
+"LogicOp"=""
+"Material"=""
+"Math"=""
+"Matrix"=""
+"Matrixd"=""
+"Matrixf"=""
+"MatrixManipulator"=""
+"MatrixTransform"=""
+"MethodInfo"=""
+"ModularEmitter"=""
+"ModularProgram"=""
+"Multisample"=""
+"MultiSegmentPlacer"=""
+"MultiSwitch"=""
+"MultiTextureControl"=""
+"Node"=""
+"NodeCallback"=""
+"NodeTrackerCallback"=""
+"NodeTrackerManipulator"=""
+"NodeVisitor"=""
+"Notify"=""
+"Object"=""
+"OccluderNode"=""
+"Operator"=""
+"Optimizer"=""
+"OsgCameraGroup"=""
+"OsgSceneHandler"=""
+"Output"=""
+"OverlayNode"=""
+"PagedLOD"=""
+"ParameterInfo"=""
+"ParameterOutput"=""
+"Particle"=""
+"ParticleEffect"=""
+"ParticleProcessor"=""
+"ParticleSystem"=""
+"ParticleSystemUpdater"=""
+"Placer"=""
+"Plane"=""
+"Point"=""
+"PointPlacer"=""
+"PointSprite"=""
+"PolygonMode"=""
+"PolygonOffset"=""
+"PolygonStipple"=""
+"Polytope"=""
+"PositionalStateContainer"=""
+"PositionAttitudeTransform"=""
+"PrimitiveSet"=""
+"Program"=""
+"Program"=""
+"Projection"=""
+"PropertyInfo"=""
+"ProxyNode"=""
+"Quat"=""
+"RadialShooter"=""
+"RandomRateCounter"=""
+"range"=""
+"ReaderWriter"=""
+"ReadFile"=""
+"ReentrantMutex"=""
+"ref_ptr"=""
+"Referenced"=""
+"Reflection"=""
+"ReflectionMacros"=""
+"ReflectionMapGenerator"=""
+"Reflector"=""
+"Registry"=""
+"RenderBin"=""
+"RenderLeaf"=""
+"RenderStage"=""
+"ScalarBar"=""
+"ScalarsToColors"=""
+"Scene"=""
+"SceneView"=""
+"Scissor"=""
+"Scribe"=""
+"Sector"=""
+"SectorPlacer"=""
+"SegmentPlacer"=""
+"Sequence"=""
+"SetSceneViewVisitor"=""
+"ShadeModel"=""
+"Shader"=""
+"ShadowVolumeOccluder"=""
+"Shape"=""
+"ShapeDrawable"=""
+"SharedStateManager"=""
+"Shooter"=""
+"SimpleViewer"=""
+"Simplifier"=""
+"SmokeEffect"=""
+"SmokeTrailEffect"=""
+"SmoothingVisitor"=""
+"SpecularHighlights"=""
+"SphereSegment"=""
+"State"=""
+"StateAttribute"=""
+"StateGraph"=""
+"StateSet"=""
+"StateSetManipulator"=""
+"StaticMethodInfo"=""
+"Statistics"=""
+"StatsHandler"=""
+"Stencil"=""
+"String"=""
+"Switch"=""
+"TangentSpaceGenerator"=""
+"Technique"=""
+"TerrainManipulator"=""
+"Tessellator"=""
+"TexEnv"=""
+"TexEnvCombine"=""
+"TexEnvFilter"=""
+"TexGen"=""
+"TexGenNode"=""
+"TexMat"=""
+"Text"=""
+"Texture"=""
+"Texture1D"=""
+"Texture2D"=""
+"Texture3D"=""
+"TextureCubeMap"=""
+"TextureRectangle"=""
+"Timer"=""
+"TrackballManipulator"=""
+"Transform"=""
+"TransformAttributeFunctor"=""
+"TransformCallback"=""
+"TriangleFunctor"=""
+"TriangleIndexFunctor"=""
+"TriStripVisitor"=""
+"Type"=""
+"TypedConstructorInfo"=""
+"TypedMethodInfo"=""
+"TypeNameAliasProxy"=""
+"UFOManipulator"=""
+"Uniform"=""
+"UnitTestFramework"=""
+"UpdateVisitor"=""
+"Utility"=""
+"Validator"=""
+"Value"=""
+"VariableRateCounter"=""
+"variant_cast"=""
+"Vec2"=""
+"Vec2b"=""
+"Vec2d"=""
+"Vec2f"=""
+"Vec2s"=""
+"Vec3"=""
+"Vec3b"=""
+"Vec3d"=""
+"Vec3f"=""
+"Vec3s"=""
+"Vec4"=""
+"Vec4b"=""
+"Vec4d"=""
+"Vec4f"=""
+"Vec4s"=""
+"Vec4ub"=""
+"Version"=""
+"VertexProgram"=""
+"View"=""
+"Viewer"=""
+"ViewerEventHandler"=""
+"Viewport"=""
+"VisibilityGroup"=""
+"WriteFile"=""
+
+"Block"=""
+"BlockingQueue"=""
+"Camera"=""
+"CameraConfig"=""
+"CameraGroup"=""
+"Events"=""
+"Export"=""
+"InputArea"=""
+"Keyboard"=""
+"KeyboardMouse"=""
+"Math"=""
+"Referenced"=""
+"RefOpenThreads"=""
+"RenderSurface"=""
+"Timer"=""
+"Trackball"=""
+"Types"=""
+"Version"=""
+"Window3D"=""
+"VisualChooser"=""
+
+"Barrier"=""
+"Condition"=""
+"Exports"=""
+"Mutex"=""
+"ScopedLock"=""
+"Thread"=""
--- a/VisualStudio/highlight80.reg
+++ b/VisualStudio/highlight80.reg
@@ -0,0 +1,339 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\8.0\Languages\Extensionless Files\{B2F072B0-ABC1-11D0-9D62-00C04FD9DFD9}]
+"AccelOperator"=""
+"AlphaFunc"=""
+"AngularAccelOperator"=""
+"AnimationPath"=""
+"AnimationPathManipulator"=""
+"AnisotropicLighting"=""
+"ApplicationUsage"=""
+"Archive"=""
+"ArgumentParser"=""
+"Array"=""
+"Attributes"=""
+"AutoTransform"=""
+"Billboard"=""
+"BlendColor"=""
+"BlendEquation"=""
+"BlendFunc"=""
+"BlinkSequence"=""
+"BoundingBox"=""
+"BoundingSphere"=""
+"BoundsChecking"=""
+"buffered_value"=""
+"BufferObject"=""
+"BumpMapping"=""
+"Camera"=""
+"CameraView"=""
+"Cartoon"=""
+"CenteredPlacer"=""
+"ClearNode"=""
+"ClipNode"=""
+"ClipPlane"=""
+"ClusterCullingCallback"=""
+"CollectOccludersVisitor"=""
+"ColorMask"=""
+"ColorMatrix"=""
+"ColorRange"=""
+"Comparator"=""
+"CompositeViewer"=""
+"ConnectedParticleSystem"=""
+"ConstantRateCounter"=""
+"ConstructorInfo"=""
+"Converter"=""
+"ConverterProxy"=""
+"ConvexPlanarOccluder"=""
+"ConvexPlanarPolygon"=""
+"CoordinateSystemNode"=""
+"CopyOp"=""
+"Counter"=""
+"CubeMapGenerator"=""
+"CullFace"=""
+"CullingSet"=""
+"CullSettings"=""
+"CullStack"=""
+"CullVisitor"=""
+"CustomAttribute"=""
+"CustomAttributeProvider"=""
+"DatabasePager"=""
+"DelaunayTriangulator"=""
+"Depth"=""
+"DisplayRequirementsVisitor"=""
+"DisplaySettings"=""
+"DOFTransform"=""
+"DotOsgWrapper"=""
+"Drawable"=""
+"DrawPixels"=""
+"DriveManipulator"=""
+"DynamicLibrary"=""
+"Effect"=""
+"Emitter"=""
+"Endian"=""
+"EventAdapter"=""
+"EventVisitor"=""
+"Exceptions"=""
+"ExplosionDebrisEffect"=""
+"ExplosionEffect"=""
+"Export"=""
+"fast_back_stack"=""
+"Field"=""
+"FieldReader"=""
+"FieldReaderIterator"=""
+"FileNameUtils"=""
+"FileUtils"=""
+"FireEffect"=""
+"FlightManipulator"=""
+"FluidFrictionOperator"=""
+"FluidProgram"=""
+"Fog"=""
+"Font"=""
+"ForceOperator"=""
+"FragmentProgram"=""
+"FrameBufferObject"=""
+"FrameStamp"=""
+"FrontFace"=""
+"Geode"=""
+"GeographicLocation"=""
+"Geometry"=""
+"GL"=""
+"GL2Extensions"=""
+"GLExtensions"=""
+"GLObjectsVisitor"=""
+"GLU"=""
+"GraphicsContext"=""
+"GraphicsContextImplementation"=""
+"GraphicsThread"=""
+"GraphicsWindow"=""
+"GraphicsWindowWin32"=""
+"Group"=""
+"GUIActionAdapter"=""
+"GUIEventAdapter"=""
+"GUIEventHandler"=""
+"GUIEventHandlerVisitor"=""
+"HalfWayMapGenerator"=""
+"HelpHandler"=""
+"HeightFieldNode"=""
+"HeightFieldRenderer"=""
+"HighlightMapGenerator"=""
+"Image"=""
+"ImageOptions"=""
+"ImageStream"=""
+"Impostor"=""
+"ImpostorSprite"=""
+"Input"=""
+"InsertImpostorsVisitor"=""
+"InstanceCreator"=""
+"Interpolator"=""
+"IntersectVisitor"=""
+"io_utils"=""
+"KeyboardMouseCallback"=""
+"KeySwitchMatrixManipulator"=""
+"Light"=""
+"LightModel"=""
+"LightPoint"=""
+"LightPointNode"=""
+"LightPointSystem"=""
+"LightSource"=""
+"LinearInterpolator"=""
+"LineSegment"=""
+"LineStipple"=""
+"LineWidth"=""
+"LOD"=""
+"LogicOp"=""
+"Material"=""
+"Math"=""
+"Matrix"=""
+"Matrixd"=""
+"Matrixf"=""
+"MatrixManipulator"=""
+"MatrixTransform"=""
+"MethodInfo"=""
+"ModularEmitter"=""
+"ModularProgram"=""
+"Multisample"=""
+"MultiSegmentPlacer"=""
+"MultiSwitch"=""
+"MultiTextureControl"=""
+"Node"=""
+"NodeCallback"=""
+"NodeTrackerCallback"=""
+"NodeTrackerManipulator"=""
+"NodeVisitor"=""
+"Notify"=""
+"Object"=""
+"OccluderNode"=""
+"Operator"=""
+"Optimizer"=""
+"OsgCameraGroup"=""
+"OsgSceneHandler"=""
+"Output"=""
+"OverlayNode"=""
+"PagedLOD"=""
+"ParameterInfo"=""
+"ParameterOutput"=""
+"Particle"=""
+"ParticleEffect"=""
+"ParticleProcessor"=""
+"ParticleSystem"=""
+"ParticleSystemUpdater"=""
+"Placer"=""
+"Plane"=""
+"Point"=""
+"PointPlacer"=""
+"PointSprite"=""
+"PolygonMode"=""
+"PolygonOffset"=""
+"PolygonStipple"=""
+"Polytope"=""
+"PositionalStateContainer"=""
+"PositionAttitudeTransform"=""
+"PrimitiveSet"=""
+"Program"=""
+"Program"=""
+"Projection"=""
+"PropertyInfo"=""
+"ProxyNode"=""
+"Quat"=""
+"RadialShooter"=""
+"RandomRateCounter"=""
+"range"=""
+"ReaderWriter"=""
+"ReadFile"=""
+"ReentrantMutex"=""
+"ref_ptr"=""
+"Referenced"=""
+"Reflection"=""
+"ReflectionMacros"=""
+"ReflectionMapGenerator"=""
+"Reflector"=""
+"Registry"=""
+"RenderBin"=""
+"RenderLeaf"=""
+"RenderStage"=""
+"ScalarBar"=""
+"ScalarsToColors"=""
+"Scene"=""
+"SceneView"=""
+"Scissor"=""
+"Scribe"=""
+"Sector"=""
+"SectorPlacer"=""
+"SegmentPlacer"=""
+"Sequence"=""
+"SetSceneViewVisitor"=""
+"ShadeModel"=""
+"Shader"=""
+"ShadowVolumeOccluder"=""
+"Shape"=""
+"ShapeDrawable"=""
+"SharedStateManager"=""
+"Shooter"=""
+"SimpleViewer"=""
+"Simplifier"=""
+"SmokeEffect"=""
+"SmokeTrailEffect"=""
+"SmoothingVisitor"=""
+"SpecularHighlights"=""
+"SphereSegment"=""
+"State"=""
+"StateAttribute"=""
+"StateGraph"=""
+"StateSet"=""
+"StateSetManipulator"=""
+"StaticMethodInfo"=""
+"Statistics"=""
+"StatsHandler"=""
+"Stencil"=""
+"String"=""
+"Switch"=""
+"TangentSpaceGenerator"=""
+"Technique"=""
+"TerrainManipulator"=""
+"Tessellator"=""
+"TexEnv"=""
+"TexEnvCombine"=""
+"TexEnvFilter"=""
+"TexGen"=""
+"TexGenNode"=""
+"TexMat"=""
+"Text"=""
+"Texture"=""
+"Texture1D"=""
+"Texture2D"=""
+"Texture3D"=""
+"TextureCubeMap"=""
+"TextureRectangle"=""
+"Timer"=""
+"TrackballManipulator"=""
+"Transform"=""
+"TransformAttributeFunctor"=""
+"TransformCallback"=""
+"TriangleFunctor"=""
+"TriangleIndexFunctor"=""
+"TriStripVisitor"=""
+"Type"=""
+"TypedConstructorInfo"=""
+"TypedMethodInfo"=""
+"TypeNameAliasProxy"=""
+"UFOManipulator"=""
+"Uniform"=""
+"UnitTestFramework"=""
+"UpdateVisitor"=""
+"Utility"=""
+"Validator"=""
+"Value"=""
+"VariableRateCounter"=""
+"variant_cast"=""
+"Vec2"=""
+"Vec2b"=""
+"Vec2d"=""
+"Vec2f"=""
+"Vec2s"=""
+"Vec3"=""
+"Vec3b"=""
+"Vec3d"=""
+"Vec3f"=""
+"Vec3s"=""
+"Vec4"=""
+"Vec4b"=""
+"Vec4d"=""
+"Vec4f"=""
+"Vec4s"=""
+"Vec4ub"=""
+"Version"=""
+"VertexProgram"=""
+"View"=""
+"Viewer"=""
+"ViewerEventHandler"=""
+"Viewport"=""
+"VisibilityGroup"=""
+"WriteFile"=""
+
+"Block"=""
+"BlockingQueue"=""
+"Camera"=""
+"CameraConfig"=""
+"CameraGroup"=""
+"Events"=""
+"Export"=""
+"InputArea"=""
+"Keyboard"=""
+"KeyboardMouse"=""
+"Math"=""
+"Referenced"=""
+"RefOpenThreads"=""
+"RenderSurface"=""
+"Timer"=""
+"Trackball"=""
+"Types"=""
+"Version"=""
+"Window3D"=""
+"VisualChooser"=""
+
+"Barrier"=""
+"Condition"=""
+"Exports"=""
+"Mutex"=""
+"ScopedLock"=""
+"Thread"=""
--- a/PlatformSpecifics/Windows/icons/osg.ico
+++ b/PlatformSpecifics/Windows/icons/osg.ico
--- a/PlatformSpecifics/Windows/icons/osg_icon.rc
+++ b/PlatformSpecifics/Windows/icons/osg_icon.rc
--- a/PlatformSpecifics/Windows/icons/src/file.txt
+++ b/PlatformSpecifics/Windows/icons/src/file.txt
--- a/PlatformSpecifics/Windows/icons/src/make.bat
+++ b/PlatformSpecifics/Windows/icons/src/make.bat
--- a/PlatformSpecifics/Windows/icons/src/osg.xcf
+++ b/PlatformSpecifics/Windows/icons/src/osg.xcf
--- a/PlatformSpecifics/Windows/icons/src/osg16-32.png
+++ b/PlatformSpecifics/Windows/icons/src/osg16-32.png
--- a/PlatformSpecifics/Windows/icons/src/osg16-4.png
+++ b/PlatformSpecifics/Windows/icons/src/osg16-4.png
--- a/PlatformSpecifics/Windows/icons/src/osg16-8.png
+++ b/PlatformSpecifics/Windows/icons/src/osg16-8.png
--- a/PlatformSpecifics/Windows/icons/src/osg16.xcf
+++ b/PlatformSpecifics/Windows/icons/src/osg16.xcf
--- a/PlatformSpecifics/Windows/icons/src/osg32-32.png
+++ b/PlatformSpecifics/Windows/icons/src/osg32-32.png
--- a/PlatformSpecifics/Windows/icons/src/osg32-4.png
+++ b/PlatformSpecifics/Windows/icons/src/osg32-4.png
--- a/PlatformSpecifics/Windows/icons/src/osg32-8.png
+++ b/PlatformSpecifics/Windows/icons/src/osg32-8.png
--- a/PlatformSpecifics/Windows/icons/src/osg32.xcf
+++ b/PlatformSpecifics/Windows/icons/src/osg32.xcf
--- a/PlatformSpecifics/Windows/icons/src/osg48-32.png
+++ b/PlatformSpecifics/Windows/icons/src/osg48-32.png
--- a/PlatformSpecifics/Windows/icons/src/osg48-4.png
+++ b/PlatformSpecifics/Windows/icons/src/osg48-4.png
--- a/PlatformSpecifics/Windows/icons/src/osg48-8.png
+++ b/PlatformSpecifics/Windows/icons/src/osg48-8.png
--- a/PlatformSpecifics/Windows/icons/src/osg48.xcf
+++ b/PlatformSpecifics/Windows/icons/src/osg48.xcf
--- a/PlatformSpecifics/Windows/osgShell.bat
+++ b/PlatformSpecifics/Windows/osgShell.bat
--- a/Xcode/Misc/ArrangeDMG.sh
+++ b/Xcode/Misc/ArrangeDMG.sh
@@ -8,7 +8,7 @@
 # script. This just copies all the already built binaries 
 # into a structure that is near-ready for distribution.
 # 
-# Usage: You should run this from the directory above the OSG-projects
+# Usage: You should run this from the directory above the 3-projects
 # ("AnyDirectory" in the picture below)
 # bash OpenSceneGraph/Xcode/Misc/ArrangeDMG.sh
 #
@@ -40,14 +40,12 @@
 # CpMac is deprecated now that cp works properly in Tiger
 #COPY="/Developer/Tools/CpMac -r"
 COPY="/bin/cp -R"
-SVN="svn"
 #COPY="mv -f"

 #BUILDACTION="clean build"
-#CONFIGURATION="Development"
 CONFIGURATION="Deployment"

-#GDAL_LOCATION="/Library/Frameworks"
+GDAL_LOCATION="/Library/Frameworks"

 # Clean up from previous builds?
 echo "Deleteing PackageDir to begin anew"
@@ -67,20 +65,17 @@ mkdir -p PackageDir/XcodeTemplates

 mkdir -p PackageDir/Resources

-mkdir -p PackageDir/.background
-

 # Everything should be built now. Move all the things to be distrubuted 
 # to the PackageDir with the appropriate layout.

 echo "Copying Frameworks..."

-#$COPY OpenThreads/Xcode/OpenThreads/build/$CONFIGURATION/OpenThreads.framework PackageDir/Frameworks
-#$COPY OpenSceneGraph/Xcode/OpenSceneGraph/build/$CONFIGURATION/osg*.framework PackageDir/Frameworks/
-$COPY OpenSceneGraph/Xcode/OpenSceneGraph/build/$CONFIGURATION/*.framework PackageDir/Frameworks/
+$COPY OpenThreads/Xcode/OpenThreads/build/$CONFIGURATION/OpenThreads.framework PackageDir/Frameworks
+$COPY OpenSceneGraph/Xcode/OpenSceneGraph/build/$CONFIGURATION/osg*.framework PackageDir/Frameworks/

 # Copy the gdal framework 
-#$COPY $GDAL_LOCATION/gdal.framework PackageDir/Frameworks
+$COPY $GDAL_LOCATION/gdal.framework PackageDir/Frameworks

 echo "Copying PlugIns..."
 $COPY OpenSceneGraph/Xcode/OpenSceneGraph/build/$CONFIGURATION/*.so PackageDir/PlugIns/
@@ -91,18 +86,14 @@ $COPY OpenSceneGraph/Xcode/OpenSceneGraph/build/$CONFIGURATION/*.app PackageDir/
 echo "Copying Xcode templates..."
 $COPY OpenSceneGraph/Xcode/XcodeTemplates PackageDir
 # If we are in CVS, all the CVS junk got copied in so we need to remove it
-#find -d PackageDir/XcodeTemplates -name CVS -exec rm -rf {} \;
-find -d PackageDir/XcodeTemplates -name .svn -exec rm -rf {} \;
+find -d PackageDir/XcodeTemplates -name CVS -exec rm -rf {} \;


 echo "Copying License and ReadMe files..."
-#$COPY OpenThreads/COPYING.txt PackageDir/LICENSE_OpenThreads.txt
+$COPY OpenThreads/COPYING.txt PackageDir/LICENSE_OpenThreads.txt
 $COPY OpenSceneGraph/LICENSE.txt PackageDir/LICENSE_OSG.txt
 $COPY OpenSceneGraph/Xcode/OSX_OSG_README.rtf PackageDir

-# Copy the background image and .DS_Store for 'fancy' DMG
-$COPY OpenSceneGraph/Xcode/Packaging/Resources/instlogo.pdf PackageDir/.background
-$COPY OpenSceneGraph/Xcode/Misc/DSStoreForDMG PackageDir/.DS_Store


 # Sorry, I think this is bourne only
@@ -117,40 +108,21 @@ echo "Setting up symbolic links for the .app's..."
 		)
 	done
 )
-
-echo "Testing for OpenSceneGraph-Data..."
+#echo ""


-# If OpenSceneGraph-Data/ resides next to OpenSceneGraph/, then use it
-if [ -d OpenSceneGraph-Data ]; then
-	echo "Found OpenSceneGraph-Data and will copy into PackageDir/Resources."
-	# Determine if it is a subversion copy or not; we don't want the repo info
-	if [ -d OpenSceneGraph-Data/.svn ]; then
-		$SVN export --force OpenSceneGraph-Data PackageDir/Resources	
-	else
-		$COPY OpenSceneGraph-Data PackageDir/Resources
-	fi
+# Not sure how to find the OSG data, so it has to be done manually
+# Would Spotlight help?
+echo "Next, you must (manually) copy all the OSG-data to PackageDir/Resources and the LICENCE_GDAL.rtf to PackageDir."

-	echo "Creating DMG using:"
-	echo "hdiutil create -ov -fs HFS+ -volname OpenSceneGraph -srcfolder PackageDir OpenSceneGraph.dmg"
-	/usr/bin/hdiutil create -ov -fs HFS+ -volname OpenSceneGraph -srcfolder PackageDir OpenSceneGraph.dmg
+echo "Looking up location for OpenSceneGraph-Data"
+#/usr/bin/perl OpenSceneGraph/Xcode/Misc/FindOSGData.pl
+/usr/bin/perl OpenSceneGraph/Xcode/Misc/FindOSGData.pl --single
+echo "Looking up location for LICENSE_GDAL.rtf"
+/usr/bin/perl OpenSceneGraph/Xcode/Misc/FindOSGData.pl --single LICENSE_GDAL.rtf

-else
-	# Not sure how to find the OSG data, so it has to be done manually
-	# Would Spotlight help?
-	#echo "Next, you must (manually) copy all the OSG-data to PackageDir/Resources and the LICENCE_GDAL.rtf to PackageDir."
-	echo "Did not find OpenSceneGraph-Data/ aside OpenSceneGraph/."
-	echo "Next, you must (manually) copy all the OSG-data to PackageDir/Resources."
-
-	echo "Looking up possible location for OpenSceneGraph-Data"
-	#/usr/bin/perl OpenSceneGraph/Xcode/Misc/FindOSGData.pl
-	/usr/bin/perl OpenSceneGraph/Xcode/Misc/FindOSGData.pl --single
-	#echo "Looking up location for LICENSE_GDAL.rtf"
-	#/usr/bin/perl OpenSceneGraph/Xcode/Misc/FindOSGData.pl --single LICENSE_GDAL.rtf
-
-	echo "After you copy the remaining resources, you will want to package up the DMG. You can use the following line as the basis:"
-	echo "hdiutil create -ov -fs HFS+ -volname OpenSceneGraph -srcfolder PackageDir OpenSceneGraph.dmg"
-fi
+echo "After you copy the remaining resources, you will want to package up the DMG. You can use the following line as the basis:"
+echo "hdiutil create -ov -fs HFS+ -volname OpenSceneGraph -srcfolder PackageDir OpenSceneGraph.dmg"


 # Now we want to package up everything into a .dmg
--- a/Xcode/Misc/DSStoreForDMG
+++ b/Xcode/Misc/DSStoreForDMG
--- a/Xcode/OSX_OSG_README.rtf
+++ b/Xcode/OSX_OSG_README.rtf
@@ -1,202 +1,46 @@
-{\rtf1\ansi\ansicpg1252\cocoartf949
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 Courier;\f2\fnil\fcharset0 Monaco;
-}
+{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf410
+{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
+\f3\fmodern\fcharset77 Courier;\f4\fnil\fcharset77 Monaco;}
 {\colortbl;\red255\green255\blue255;}
 {\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid1}
-{\list\listtemplateid2\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid2}
-{\list\listtemplateid3\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid3}}
-{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}}
+{\list\listtemplateid2\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid2}}
+{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}}
 \margl1440\margr1440\vieww11520\viewh13720\viewkind0
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

 \f0\b\fs24 \cf0 OpenSceneGraph on Mac OS X
-\b0 \
+\f1\b0 \
 \
-This is the readme for the entire OpenThreads/OpenSceneGraph distribution for the OS X frameworks and Xcode projects. This readme was originally written for the binary distribution, but there is a lot of useful information in here so it has also been included with the source code in the Xcode section. This was sync'd with the OSG 2.2 release.\
+This is the readme for the entire OpenThreads/OpenSceneGraph distribution for the OS X frameworks and Xcode projects. This readme was originally written for the binary distribution, but there is a lot of useful information in here so it has also been included with the source code in the Xcode section. This was sync'd with the OSG 1.2 release.\
 \
 The source code is available at {\field{\*\fldinst{HYPERLINK "http://www.openscenegraph.org/"}}{\fldrslt http://www.openscenegraph.org/}}\
 \
-
-\b \
-Quick Start:
-\b0 \
-Screencasts of how to install and get going with OSG for Mac OS X can be found here:\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-{\field{\*\fldinst{HYPERLINK "http://www.openscenegraph.org/projects/osg/wiki/Support/Tutorials/MacOSXTips"}}{\fldrslt \cf0 http://www.openscenegraph.org/projects/osg/wiki/Support/Tutorials/MacOSXTips}}\
-\pard\pardeftab720\ql\qnatural
-\cf0 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\cf0 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-
-\b \cf0 Special Notes for Leopard:\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-
-\b0 \cf0 (See {\field{\*\fldinst{HYPERLINK "http://www.openscenegraph.org/projects/osg/wiki/Support/PlatformSpecifics/MacOSX10.5"}}{\fldrslt http://www.openscenegraph.org/projects/osg/wiki/Support/PlatformSpecifics/MacOSX10.5}} for up-to-date information.)\
-\
-
-\b Broken Binary Compatibility:
-\b0 \
-Apple has broken binary compatibility in a limited way between 10.4 and 10.5 when using OpenGL and C++. Under 32-bit, the GLenum type was changed from long (in 10.4 and before) to int (in 10.5).\
-\
-Under 32-bit, sizeof(long) == sizeof(int) == 4-bytes.\
-(In 64-bit, sizeof(long) == 8-bytes, sizeof(int) == 4-bytes)\
-So in C 32-bit, binary compatibility is preserved.\
-\
-But under C++, even though both types are 4-bytes under 32-bits, C++ name mangling rules treat int and long as fundamentally different types. Thus binary compatibility is broken if you try linking two pieces of code that use different types for GLenum.\
-\
-\
-This means:\
-1) If you have a 10.4 SDK (or before) built OSG framework, you cannot build an application using the 10.5 SDK or you will get strange undefined symbol errors if GLenum is used. This means don't develop against the 10.5 SDK on Leopard.\
-\
-2) You cannot use a 10.5 SDK built OSG framework to build an application using the 10.4 SDK, otherwise this will also give you undefined symbol errors. This means don't develop with 10.5 built OSG frameworks when using the 10.4u SDK on Leopard or developing on 10.4 itself.\
-\
-3) If you have a 10.4 SDK built OSG framework and a 10.4 SDK built application that uses it, this does *not* present a binary compatibility problem and you may be able to run on 10.5 (ignoring any different compatibility issues).\
-\
-4) Similarly to #3, if you have a 10.5 SDK built framework and a 10.5 SDK built application that uses it, this does *not* present a binary compatibility problem  and you may be able to run on 10.4 presuming there are no specific 10.5 dependencies. (But it is safer to build against the 10.4 SDK if you plan on deploying to 10.4 and use no 10.5 specific features.)\
-\
-Basically, this means you can't intermix 10.4 and 10.5 frameworks.\
-\
-You can slip around this problem if you manage to avoid the use of any code that uses GLenum. And pure C is not affected.\
-\
-
-\b \
-OSG 10.4 and 10.5 SDKs:\
-
-\b0 Xcode 3.0 introduces formal support for SDKs created by 3rd parties (like us). Since we now have binary incompatible frameworks, developing binaries for both 10.4 and 10.5 on the same system is a pain. Having a separate OSG 10.4 and 10.5 SDK may help minimize that pain.\
-\
-Stay tuned for the SDKs and instructions.\
-\
-\
-\
-
-\b X11 Link problems:\
-
-\b0 Another common problem developers might experience is:\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-\cf0 ld: cycle in dylib re-exports with /usr/X11R6/lib/libGL.dylib\
-collect2: ld returned 1 exit status\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\cf0 \
-Apple has a posted a Technical Q&A (QA1567) on this entitled "Compiling X11 / OpenGL applications on Mac OS X v.10.5 Leopard"\
-{\field{\*\fldinst{HYPERLINK "http://developer.apple.com/qa/qa2007/qa1567.html"}}{\fldrslt http://developer.apple.com/qa/qa2007/qa1567.html\
-}}\
-Some people have reported a problem similar to this and/or used the solution posted in this Q&A to resolve a problem building the osgdb_freetype plugin. However, I believe this is the wrong solution to this specific problem. In the osgdb_freetype case, the problem was one of two things:\
-1) The wrong libfreetype.dylib was being used (wrong SDK)\
-2) The libfreetype.dylib was not found (wrong path)\
-\
-For #1, the Xcode project was linking to /usr/X11R6/lib, but we should have been linking to $(SDKROOT)/usr/X11R6/lib. You would normally experience this problem when compiling against the 10.4u SDK on 10.5.\
-\
-For #2, the problem was usually experienced by people building against the 10.5 SDK (on 10.5). The problem here is that Leopard has moved from XFree86.org to X.org and the path is now /usr/X11/lib instead of X11R6. Within the SDK, there is no X11R6 path, so the library was not found.\
-\
-The solution is quite simple and change the link path line to:\
-L$(SDKROOT)/usr/X11/lib -L$(SDKROOT)/usr/X11R6/lib in the Other Linker Flags for the osgdb_freetype plugin.\
-\
-This is now fixed in the Xcode project in Subversion.\
-\
-\
-\
-
-\b CMake:\
-
-\b0 The CMake/OSG build system is still not quite ready for prime time. CMake has some general Leopard issues and the OS X/CMake community is trying to work through SDK support issues as the SDKs have become a more prominent part of building on OS X correctly. Framework support is still lacking in the CMake/OSG build system, though CMake CVS is gradually adding/fixing this feature to its code base. \
+Also included is a framework for GDAL. You can get the source code and the full GDAL package at {\field{\*\fldinst{HYPERLINK "http://www.gdal.org/"}}{\fldrslt http://www.gdal.org/}}\
 \
 \

-\b 64-bit:\
-
-\b0 OSG for OS X 64-bit is not ready. There are two major obstacles:\
-1) osgViewer\
-2) osgdb_qt\
-\
-The osgViewer backend is written in Carbon and as far as I know, uses some deprecated APIs that are not available in 64-bit. I do not know if this can be easily cleaned up or not. However, I still believe the better long term solution is for a Cocoa based osgViewer backend to be written. However, nothing yet has been written for this as far as I know.\
-\
-The example, osgviewerCocoa is close to if not already 64-bit clean. However, because the example uses osgViewer::GraphicsWindowEmbedded which needlessly pulls in all the osgViewer Carbon backend dependencies, you will be unable to actually build osgviewerCocoa as 64-bit. But if you are in a hurry to get 64-bit on OS X, this might be where you want to start. Either strip away the Carbon dependencies from osgViewer, or take osgviewerCocoa and transform it into a Cocoa backend for osgViewer.\
-\
-\
-osgdb_qt is a QuickTime based plugin that handles all image handling and movie handling on OS X. However, it is based on the old QuickTime API which has been marked deprecated and will not survive the 64-bit transition. Thus this plugin needs to be replaced.\
-\
-I have already submitted a new plugin called osgdb_ImageIO to osgSubmissions which attempts to assume all the image handling duties. This plugin is based on Apple's ImageIO framework which is the new low-level entry point to deal with all image types handled by the platform. Thus this plugin should handle a lot more image formats than the old QuickTime plugin (e.g. JPEG2000, RAW, etc) and will get more as Apple adds support their system. It also adds support for C++ stream support which was missing from the QuickTime plugin. ImageIO is available on 10.4 and 10.5.\
-\
-However, the osgdb_ImageIO plugin does not handle movies unlike the old QuickTime plugin. The current plan is to introduce a second plugin (osgdb_QTKit), which is based on the new QuickTime Kit framework (10.4 and 10.5). This plugin will replace the movie handling capabilities of the old QuickTime plugin. \
-\
-Once both new plugins are in place and osgViewer is sorted out, we should be able to build a 32-bit/64-bit Universal Binary of OSG for OS X.\
-\
-Mac OS X 10.3 and earlier users and QuickTime for Windows users will still need to use the old QuickTime plugin.\
-\
-
-\b Xcode Project Templates:\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-
-\b0 \cf0 Xcode 3.0 has moved things around. The old location was:\
-/Library/Application Support/Apple/Developer Tools/Project Templates/Application\
-\
-The new scheme is:\
-/Library/Application Support/Developer/\{3.0,Shared\}/Xcode/Project Templates/Application\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\cf0 \
-\pard\pardeftab720\ql\qnatural
-\cf0 Specifying 3.0 will restrict them to only be available in Xcode 3.0, specifying Shared will make them available to 2.5, 3.0 and beyond.\
-\
-I believe our templates will work in both, so Shared is a good location:\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-\cf0 /Library/Application Support/Developer/Shared/Xcode/Project Templates/Application\
-\
-Also note you may place it in per-user locations, e.g.\
-~/Library/Application Support/Developer/Shared/Xcode/Project Templates/Application\
-\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\cf0 \
-\
-\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-
-\b \cf0 What's New in this release (2.2):
-\b0 \
+\f0\b What's New in this release:
+\f1\b0 \
 \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\ql\qnatural\pardirnatural
-\ls1\ilvl0\cf0 (Sorry, no OS X specific notes.)\
+\ls1\ilvl0\cf0 {\listtext	\'a5	}Dwarf debugging format\
+{\listtext	\'a5	}osgsimpleviewerCocoa and osgsimpleviewerSDL\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 \cf0 \
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

-\b \cf0 Notes for 2.0 release:\
-\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\ql\qnatural\pardirnatural
-\ls2\ilvl0
-\b0 \cf0 {\listtext	\'95	}OpenThreads now uses Subversion 'externals' to make it look like part of the OSG source distribution.\
-{\listtext	\'95	}Producer has been removed from the distribution. osgViewer is supposed to replace it. The Mac OS X backend is currently Carbon based.\
-{\listtext	\'95	}GDAL has been removed as it is no longer a dependency.\
-{\listtext	\'95	}osgviewerCocoa (previously osgsimpleviewerCocoa in CVS) is an example program demonstrating  tight integration between OpenSceneGraph and Cocoa. It demonstrates many of the things you should consider in building a first-class OS X application that uses OSG.\
-{\listtext	\'95	}Dwarf debugging format\
-{\listtext	\'95	}osgsimpleviewerSDL\
-\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\cf0 OSG has changed its versioning number scheme. 2.0 is the stable release following 1.2.\
-\
-Producer has been removed from the distribution with osgViewer as its intended replacement.\
-\
-GDAL has also been removed from the distribution as it is no longer a dependency.\
-\
-OSG is in the process to moving to a new CMake based build system. Once the remaining Mac OS X support needed is implemented in CMake, the Xcode projects will be removed in favor of the new unified CMake system.\
-\
-With Leopard on the horizon, the need to deal with 64-bit readiness and deprecated APIs is becoming more critical. In a nutshell, we need a Cocoa based version of osgViewer, and the QuickTime plugin needs to be replaced. Currently, there is a new ImageIO based plugin to assume the image reading/writing duties of the old qt plugin. We are in need of a QTKit based plugin to assume the movie responsibilities of the old plugin. And we are in need of volunteers to write the Cocoa osgViewer backend. Currently, the example osgviewerCocoa demonstrates a lot of similar functionality and could be used as a reference. However, the example needs to be turned 'inside-out'. The example is an NSView class that contains OSG classes; the osgViewer needs to be the opposite where the OSG class needs to contain the NSView class.\
-\
-\
-\
+\f0\b \cf0 Notes for 1.2 release:\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

-\b \cf0 Notes for 1.2 release:\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-
-\b0 \cf0 1.2 was originally intended as a bug fix release for 1.1 (going for 1.1.1), but OSG broke ABI again so the number was bumped to 1.2. There are no significant changes to the Xcode projects or significant OS X specific changes.\
+\f1\b0 \cf0 1.2 was originally intended as a bug fix release for 1.1 (going for 1.1.1), but OSG broke ABI again so the number was bumped to 1.2. There are no significant changes to the Xcode projects or significant OS X specific changes.\
 \
 Since the 1.1 release, we have learned of serious problems (freezing of the window manager) on the (Intel) MacBook Pros using osgText. We believe the problem is with a serious driver bug for ATI in OS X 10.4.7. We believe the bug affects the ATI Radeon X1600. (You can get this string by calling glGetString(GL_RENDERER) when you have a valid OpenGL Context. The string returned to us on affected MacBook Pros is "ATI Radeon X1600 OpenGL Engine".)\
 \
 Robert Osfield says:\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\ri0\ql\qnatural\pardirnatural

-\i \cf0 osgText subloads small glyphs one by one rather than the whole image, so I'd suspect it is this that is broken.  There is a path way in osgText::Font for uploading the whole image at once, which original was specifically implement as a work around for an Octane driver bug, but for 1.1 I enabled this pathway to be selectable via an env var to see if OSX users could work around the OSX driver bug. 
-\i0 \
+\f2\i \cf0 osgText subloads small glyphs one by one rather than the whole image, so I'd suspect it is this that is broken.  There is a path way in osgText::Font for uploading the whole image at once, which original was specifically implement as a work around for an Octane driver bug, but for 1.1 I enabled this pathway to be selectable via an env var to see if OSX users could work around the OSX driver bug. 
+\f1\i0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ri0\ql\qnatural\pardirnatural
 \cf0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
@@ -215,10 +59,10 @@ James Hopper suggests another solution that doesn't require you to launch throug
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx9360\li720\ri0\ql\qnatural\pardirnatural

-\i \cf0 you can set environement variables that work with applications by creating a file ~/.MacOSX/.environment.plist and put them in there. easiest way is to use the preference pane called RCEnvironment at\
+\f2\i \cf0 you can set environement variables that work with applications by creating a file ~/.MacOSX/.environment.plist and put them in there. easiest way is to use the preference pane called RCEnvironment at\
 \
 {\field{\*\fldinst{HYPERLINK "http://www.rubicode.com/Software/RCEnvironment/"}}{\fldrslt http://www.rubicode.com/Software/RCEnvironment/}}
-\i0 \
+\f1\i0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 \cf0 \
 \
@@ -254,17 +98,16 @@ Don't forget to link against Carbon (-framework Carbon) if you use Gestalt.\
 \
 If you are affected by this, please file a bug report at {\field{\*\fldinst{HYPERLINK "https://bugreport.apple.com"}}{\fldrslt https://bugreport.apple.com}}. Apple lives and dies by the bug report system. If anything is to get done, it must be in the bug reporter. And they keep count of how many people file the same bug, so duplicates are good.\
 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

-\i \cf0 (Note: We believe this has been fixed in 10.4.8)
-\i0 \
+\f2\i (Note: We believe this has been fixed in 10.4.8)
+\f1\i0 \
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

-\b \cf0 Notes for 1.1 release:\
+\f0\b \cf0 Notes for 1.1 release:\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

-\b0 \cf0 We are now distributing Universal Binaries. These binaries were built using Xcode 2.3 and gcc 4.0.1.\
+\f1\b0 \cf0 We are now distributing Universal Binaries. These binaries were built using Xcode 2.3 and gcc 4.0.1.\
 The Xcode projects are also set to build as Universal Binaries for both Development and Deployment\
 targets. If you do not need this and want to save build time, you should change the architecture option\
 to your desired setting (most likely to $(NATIVE_ARCH)). It is overridden in the top-level "OpenSceneGraph" project in the Group & Files panel. Don't forget to change OpenThreads \
@@ -287,8 +130,8 @@ We have stopped maintaining the Xcode 1.5/2.0 projects.\
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

-\b \cf0 Notes for 1.0 release:
-\b0 \
+\f0\b \cf0 Notes for 1.0 release:
+\f1\b0 \
 These projects were primarily developed with gcc 4.0.1 under Tiger 10.4.3 using Xcode 2.2. Starting with gcc 4.0, Apple no longer statically links in the C++ runtime. Apple has made available the g++ 4.0 dynamic runtime for Panther under the 10.3.9 release. To run under Panther, your system must have this update (or you must recompile the binaries for your system).\
 \
 With gcc 4.0, serious bugs have been fixed from gcc 3.3 and new features are available to us so we have experimented with more aggressive optimizations. For these binaries we have enabled -O3 optimization and -mtune=G5. We have also enabled autovectorization. We also enabled -fvisibility-inlines-hidden which is expected to shrink the binary sizes, but noticed very little difference. (There may be something wrong.) We have not done the proper benchmarking with these options, so feedback is welcome.\
@@ -300,8 +143,8 @@ With Apple's announcement of the Intel transition, Xcode 2.1 was released to hel
 \
 \

-\b Acknowledgments:
-\b0 \
+\f0\b Acknowledgments:
+\f1\b0 \
 \
 Many thanks should be given to the people that have helped make these projects possible and for their contributions to make OSG run well on OS X through the multiyear run-up to 1.0. I unfortunately don't have a comprehensive list as many contributions have been submitted directly to OpenSceneGraph, but I wanted to give mention to these specific people I've had the pleasure of working with in trying to make this corner of the universe work.\
 \
@@ -309,14 +152,14 @@ James Hopper (work on Xcode templates, GDAL frameworks)\
 David Guthrie (various patches, testing, Xcode project compiler options refinement)\
 Jeremy Bell (original comprehensive discussion on OS X frameworks, patches)\
 Stephen Travis Pope (provider of the OSG on OS X website)\
-Markus St\'f6be (web site design, documentation reviewer and formatter)\
+Markus St\'9abe (web site design, documentation reviewer and formatter)\
 (And for the curious) Eric Wing (Xcode projects and frameworks, patches, documentation)\
 \
 \
 \

-\b Installation:
-\b0 \
+\f0\b Installation:
+\f1\b0 \
 \
 To "Install" the Frameworks, copy the Frameworks inside the \
 frameworks folder to a standard location.\
@@ -353,8 +196,8 @@ Also be aware that if using the 10.4 Universal SDK, you may have to explicitly s
 \
 \

-\b Running the examples:
-\b0 \
+\f0\b Running the examples:
+\f1\b0 \
 \
 Now that osgViewer supports a native Window manager, we have attempted to provide double clickable .app bundles. We cheat a little to keep the download size smaller by symbolically linking the Frameworks, PlugIns, and Resources directories for each .app bundle instead of giving each its own copy. This allows the apps to find their resources when trying to run directly from the .dmg without having to copy anything to your computer. \
 \
@@ -386,15 +229,15 @@ Also remember that OSG will still respond to standard OSG environmental variable
 \
 \

-\b Prebinding Addresses:\
+\f0\b Prebinding Addresses:\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

-\b0 \cf0 \
+\f1\b0 \cf0 \
 	These are now obsolete. Prebinding is now disabled. The old addresses were:\
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

-\f1 \cf0 OpenThreads       -seg1addr 0x1FF00000\
+\f3 \cf0 OpenThreads       -seg1addr 0x1FF00000\
 osg               -seg1addr 0x1FF10000\
 osgUtil           -seg1addr 0x20230000\
 osgDB             -seg1addr 0x20380000\
@@ -407,13 +250,13 @@ osgFX             -seg1addr 0x20690000\
 osgViweer          -seg1addr 0x20700000\
 gdal              -seg1addr 0x207d0000\
 osgTerrain        -seg1addr 0x20c40000
-\f0 \
+\f1 \
 \
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

-\b \cf0 Xcode Projects:
-\b0 \
+\f0\b \cf0 Xcode Projects:
+\f1\b0 \
 \
 The Xcode Projects are now included as part of the official OpenSceneGraph distribution.\
 \
@@ -422,38 +265,20 @@ Xcode 2.0 and below have the extension .xcode (no longer maintained)\
 \
 \

-\b Xcode Templates:\
+\f0\b Xcode Templates:\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural

-\b0 \cf0 \
+\f1\b0 \cf0 \
 We have included a "New Project" template for OpenSceneGraph projects. We recommend you place the "OSG Application" folder into either:\
 \
-Xcode 2.4 and before:\
 /Library/Application Support/Apple/Developer Tools/Project Templates/Appllcation (for system-wide)
-\b \
+\f0\b \

-\b0 ~/Library/Application Support/Apple/Developer Tools/Project Templates/Appllcation (for per-user)
-\b \
+\f1\b0 ~/Library/Application Support/Apple/Developer Tools/Project Templates/Appllcation (for per-user)
+\f0\b \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

-\b0 \cf0 \
-Xcode 2.5/3.0:\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-\cf0 System-wide:\
-/Library/Application Support/Developer/Shared/Xcode/Project Templates/Application (both 2.5 and 3.0)\
-/Library/Application Support/Developer/3.0/Xcode/Project Templates/Application (3.0 only)\
-/Library/Application Support/Developer/2.5/Xcode/Project Templates/Application (2.5 only)\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\cf0 \
-Per-user\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-\cf0 ~/Library/Application Support/Developer/Shared/Xcode/Project Templates/Application (both 2.5 and 3.0)\
-~/Library/Application Support/Developer/3.0/Xcode/Project Templates/Application (3.0 only)\
-~/Library/Application Support/Developer/2.5/Xcode/Project Templates/Application (2.5 only)\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\cf0 \
-\
-\
+\f1\b0 \cf0 \
 After doing this, when doing a File->New Project, you will see "OSG Application" under the Application category. Selecting this will create a simple OSG project with some sample source code already in place which currently renders 2 colored tetrahedrons.\
 \
 All the OSG related frameworks are listed already, though gdal and osgTerrain are not checked by default. To link against them, you must check their checkboxes to enable them. Feel free to uncheck or remove frameworks you don't need.\
@@ -474,8 +299,8 @@ Finally, there may still be issues with Zerolink. If you have problems seeing th
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

-\b \cf0 Compatibility:
-\b0 \
+\f0\b \cf0 Compatibility:
+\f1\b0 \
 \
 The binaries are built using gcc 4.0.1 under Tiger 10.4.7. These binaries also will run under Panther 10.3.9 (which has the needed C++ runtime library). \
 \
@@ -485,39 +310,39 @@ Also keep in mind that the prebinding addresses are finicky. Changing the compil
 \
 If you are compiling under Xcode 1.5 and are using our Xcode 1.5/2.0 projects, there have been reports of problems I have been unable to reproduce. If you do encounter these problems, please try the following. \
 \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\ql\qnatural\pardirnatural
-\ls3\ilvl0\cf0 {\listtext	\'95	}I have more rigorously tested the Deployment build style than the Development build style so use the Deployment build style. Make sure you are compiling using -Os or -O0 optimization. -O3 is known to have problems under gcc 3.3. \
-{\listtext	\'95	}The -mtune=G4 is has been tested more under Xcode 1.5 than -mtune=G5. \
-{\listtext	\'95	}I noticed that for some reason, Xcode has problems compiling the Carbon header with the OpenThreads framework when autovectorization and precompiled headers were enabled. You might try disabling precompiled headers if it is not already. If the problem persists, you may also need to delete the entry that enables autovectorization. In the Groups and Files panel (left side panel), open the Info inspector for the project (top item) and click on the Build tab. Scroll down to the bottom, and remove the autovectorization option. \
+\ls2\ilvl0\cf0 {\listtext	\'a5	}I have more rigorously tested the Deployment build style than the Development build style so use the Deployment build style. Make sure you are compiling using -Os or -O0 optimization. -O3 is known to have problems under gcc 3.3. \
+{\listtext	\'a5	}The -mtune=G4 is has been tested more under Xcode 1.5 than -mtune=G5. \
+{\listtext	\'a5	}I noticed that for some reason, Xcode has problems compiling the Carbon header with the OpenThreads framework when autovectorization and precompiled headers were enabled. You might try disabling precompiled headers if it is not already. If the problem persists, you may also need to delete the entry that enables autovectorization. In the Groups and Files panel (left side panel), open the Info inspector for the project (top item) and click on the Build tab. Scroll down to the bottom, and remove the autovectorization option. \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 \cf0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

-\b \cf0 Universal Binaries:
-\b0 \
+\f0\b \cf0 Universal Binaries:
+\f1\b0 \
 \
 Be aware, when building you're own Universal Binaries and you use the 10.4 SDK, you must explicitly\
 list the search path to the frameworks in the project options. It seems that using any SDK will cause\
 the standard places like /Library/Frameworks to not be searched.\
 \

-\b Known Issues:
-\b0 \
+\f0\b Known Issues:
+\f1\b0 \
 \
 There is one known serious bug that appears sometimes. With Xcode 2.0 and 2.1, in some cases when you build OpenThreads/OSG from scratch, when you run the examples, they will crash on load. The workaround seems to be to delete just the OpenThreads framework after everything is built. Then rebuild just the OpenThreads framework. Bug reports have been filed with Apple, but the root cause remains to be a mystery. (We have some guesses, but nothing substantial.) I have not yet seen this issue emerge with Xcode 2.2, so maybe the problem is fixed.\
 \
 The osgdb_geo plugin is not big endian safe. The Makefile system does not build it for OS X. We have added it for the Xcode projects, but you probably shouldn't use it unless you're on Intel.\
 \
 Do not use the 
-\f2\fs22 -fvisibility=hidden 
-\f0\fs24 flag unless you know what you're doing. In some cases, Xcode 2.2 seems to enable this by default in the project settings. You should verify your project settings and make sure this is disabled. Among other things, this flag will hide RTTI information causing dynamic_cast<> operations to fail. Since parts of OSG are dependent on RTTI, this option should remain off. The flag 
-\f2\fs22 -fvisibility-inlines-hidden 
-\f0\fs24 may be safe to use. (This is actually enabled in our Xcode projects. If there are problems, please let us know.)\
+\f4\fs22 -fvisibility=hidden 
+\f1\fs24 flag unless you know what you're doing. In some cases, Xcode 2.2 seems to enable this by default in the project settings. You should verify your project settings and make sure this is disabled. Among other things, this flag will hide RTTI information causing dynamic_cast<> operations to fail. Since parts of OSG are dependent on RTTI, this option should remain off. The flag 
+\f4\fs22 -fvisibility-inlines-hidden 
+\f1\fs24 may be safe to use. (This is actually enabled in our Xcode projects. If there are problems, please let us know.)\
 \
 Finally, there may still be issues with Zerolink. In the Project Template, we defer to the default for this option and in current Xcode versions, the default is on. The OSG Xcode projects themselves have explicitly disabled Zerolink. In the worst cases, scenes will not render correctly or the application may crash. The worst thing about this is that the problems are so strange, you may not realize Zerolink is the problem. To see this for yourself (we tried in Xcode 2.2), you might try comparing the osgdelaunay example with and without Zerolink, toggling through all values of 'n'. With Zerolink certain objects do not even appear and it crashes. So you are probably should disable this to be safe. However, for the daring, Zerolink does seem to work for some projects though we do not fully understand the criteria for this. Furthermore, Apple constantly works on improving this feature so maybe one day it will all just work right.\
 \

-\b Misc:
-\b0 \
+\f0\b Misc:
+\f1\b0 \
 \
 Included with the OSG Xcode projects are some of the little scripts I used to help put everything together. The build script might be of interest to those who wish to produce their own automated nightly builds.\
 \
@@ -533,7 +358,7 @@ On the topic of feature requests, another potentially useful thing to have is a
 \
 \
 -Eric Wing\
-ewing . public  - at -  gmail (in the commercial domain)\
+ewing 2121  - at -  yahoo (in the commercial domain)\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 {\field{\*\fldinst{HYPERLINK "http://www.create.ucsb.edu/OSG/"}}{\fldrslt \cf0 http://www.create.ucsb.edu/OSG/}}\
-}
+}
--- a/Xcode/OpenSceneGraph/OpenSceneGraph.xcodeproj/project.pbxproj
+++ b/Xcode/OpenSceneGraph/OpenSceneGraph.xcodeproj/project.pbxproj
--- a/Xcode/OpenSceneGraph/os-Info.plist
+++ b/Xcode/OpenSceneGraph/os-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.OpenSceneGraph.os</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osg-Info.plist
+++ b/Xcode/OpenSceneGraph/osg-Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgDB-Info.plist
+++ b/Xcode/OpenSceneGraph/osgDB-Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgFX-Info.plist
+++ b/Xcode/OpenSceneGraph/osgFX-Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgGA-Info.plist
+++ b/Xcode/OpenSceneGraph/osgGA-Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgGL2-Info.plist
+++ b/Xcode/OpenSceneGraph/osgGL2-Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0d1</string>
+	<string>2.0.0d1</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgGLUTkeyboardmouse-Info.plist
+++ b/Xcode/OpenSceneGraph/osgGLUTkeyboardmouse-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.OpenSceneGraph.osgGLUTkeyboardmouse</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgGLUTsimple-Info.plist
+++ b/Xcode/OpenSceneGraph/osgGLUTsimple-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.OpenSceneGraph.osgGLUTsimple</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgManipulator-Info.plist
+++ b/Xcode/OpenSceneGraph/osgManipulator-Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgParticle-Info.plist
+++ b/Xcode/OpenSceneGraph/osgParticle-Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgShadow-Info.plist
+++ b/Xcode/OpenSceneGraph/osgShadow-Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgSim-Info.plist
+++ b/Xcode/OpenSceneGraph/osgSim-Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgTerrain-Info.plist
+++ b/Xcode/OpenSceneGraph/osgTerrain-Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgText-Info.plist
+++ b/Xcode/OpenSceneGraph/osgText-Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgUtil-Info.plist
+++ b/Xcode/OpenSceneGraph/osgUtil-Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgViewer-Info.plist
+++ b/Xcode/OpenSceneGraph/osgViewer-Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osganimate-Info.plist
+++ b/Xcode/OpenSceneGraph/osganimate-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osganimate</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgarchive-Info.plist
+++ b/Xcode/OpenSceneGraph/osgarchive-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany. osgarchive</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgautotransform-Info.plist
+++ b/Xcode/OpenSceneGraph/osgautotransform-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgautotransform</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgbillboard-Info.plist
+++ b/Xcode/OpenSceneGraph/osgbillboard-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgbillboard</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgblendequation-Info.plist
+++ b/Xcode/OpenSceneGraph/osgblendequation-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgblendequation</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgcallback-Info.plist
+++ b/Xcode/OpenSceneGraph/osgcallback-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgcallback</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgcamera-Info.plist
+++ b/Xcode/OpenSceneGraph/osgcamera-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.OpenSceneGraph.osgcamera</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgcameragroup-Info.plist
+++ b/Xcode/OpenSceneGraph/osgcameragroup-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgcameragroup</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgcatch-Info.plist
+++ b/Xcode/OpenSceneGraph/osgcatch-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgcatch</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgclip-Info.plist
+++ b/Xcode/OpenSceneGraph/osgclip-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgclip</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgcluster-Info.plist
+++ b/Xcode/OpenSceneGraph/osgcluster-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgcluster</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgcompositeviewer-Info.plist
+++ b/Xcode/OpenSceneGraph/osgcompositeviewer-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.OpenSceneGraph.osgcompositeviewer</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>1.9.7</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgconv-Info.plist
+++ b/Xcode/OpenSceneGraph/osgconv-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgconv</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgcopy-Info.plist
+++ b/Xcode/OpenSceneGraph/osgcopy-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com. OpenSceneGraph.osgcopy</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgcubemap-Info.plist
+++ b/Xcode/OpenSceneGraph/osgcubemap-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgcubemap</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgdb_freetype-Info.plist
+++ b/Xcode/OpenSceneGraph/osgdb_freetype-Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0d1</string>
+	<string>2.0.0d1</string>
 	<key>CSResourcesFileMapped</key>
 	<string>yes</string>
 </dict>
--- a/Xcode/OpenSceneGraph/osgdb_freetype2-Info.plist
+++ b/Xcode/OpenSceneGraph/osgdb_freetype2-Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0d1</string>
+	<string>2.0.0d1</string>
 	<key>CSResourcesFileMapped</key>
 	<string>yes</string>
 </dict>
--- a/Xcode/OpenSceneGraph/osgdb_osgText-Info.plist
+++ b/Xcode/OpenSceneGraph/osgdb_osgText-Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0d1</string>
+	<string>2.0.0d1</string>
 	<key>CSResourcesFileMapped</key>
 	<string>yes</string>
 </dict>
--- a/Xcode/OpenSceneGraph/osgdelaunay-Info.plist
+++ b/Xcode/OpenSceneGraph/osgdelaunay-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.OpenSceneGraph.osgdelaunay</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgdepthpartition-Info.plist
+++ b/Xcode/OpenSceneGraph/osgdepthpartition-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.OpenSceneGraph.osgdepthpartition</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgdepthshadow-Info.plist
+++ b/Xcode/OpenSceneGraph/osgdepthshadow-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgdepthshadow</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgdistortion-Info.plist
+++ b/Xcode/OpenSceneGraph/osgdistortion-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgdistortion</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0d</string>
+	<string>2.0.0d</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgfadetext-Info.plist
+++ b/Xcode/OpenSceneGraph/osgfadetext-Info.plist
@@ -15,6 +15,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string></string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgforest-Info.plist
+++ b/Xcode/OpenSceneGraph/osgforest-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgforest</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgfxbrowser-Info.plist
+++ b/Xcode/OpenSceneGraph/osgfxbrowser-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgfxbrowser</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osggeometry-Info.plist
+++ b/Xcode/OpenSceneGraph/osggeometry-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osggeometry</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osghangglide-Info.plist
+++ b/Xcode/OpenSceneGraph/osghangglide-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osghangglide</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osghud-Info.plist
+++ b/Xcode/OpenSceneGraph/osghud-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osghud</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgimposter-Info.plist
+++ b/Xcode/OpenSceneGraph/osgimposter-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgimposter</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgintrospection-Info.plist
+++ b/Xcode/OpenSceneGraph/osgintrospection-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.OpenSceneGraph.osgintrospection</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgkeyboard-Info.plist
+++ b/Xcode/OpenSceneGraph/osgkeyboard-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgkeyboard</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osgkeyboardmouse-Info.plist
+++ b/Xcode/OpenSceneGraph/osgkeyboardmouse-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgkeyboardmouse</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osglauncher-Info.plist
+++ b/Xcode/OpenSceneGraph/osglauncher-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osglauncher</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Xcode/OpenSceneGraph/osglightpoint-Info.plist
+++ b/Xcode/OpenSceneGraph/osglightpoint-Info.plist
@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osglightpoint</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Robert Osfield	de44c21d99	Fixed URL	2008-04-03 15:45:34 +00:00
Robert Osfield	a6dbd537e8	Changed the svn:externals to link to OpenThreads-2.2	2008-04-03 15:43:36 +00:00
Robert Osfield	42db377ddb	Release OpenSceneGraph-2.0.0	2007-06-15 17:05:58 +00:00