diff --git a/CMakeLists.txt b/CMakeLists.txt index c9d08feca..017fd5433 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ PROJECT(OpenSceneGraph) SET(OPENSCENEGRAPH_MAJOR_VERSION 1) SET(OPENSCENEGRAPH_MINOR_VERSION 9) -SET(OPENSCENEGRAPH_PATCH_VERSION 2) +SET(OPENSCENEGRAPH_PATCH_VERSION 3) SET(OpenThreads_SOURCE_DIR ${OpenSceneGraph_SOURCE_DIR}) diff --git a/INSTALL.txt b/INSTALL.txt deleted file mode 100644 index 461e795cc..000000000 --- a/INSTALL.txt +++ /dev/null @@ -1,25 +0,0 @@ -The OpenSceneGraph use the CMake build system to generate platform specific -build environment. CMake reads the CMakeLists.txt files that you'll find -throughout the OpenSceneGraph directories, check for installed dependnecies -and then generate the appropriate build system. - -If you don't already have CMake installed on your system you can grab it -from http://www.cmake.org, version 2.4.6 or later. - -Under unices (i.e. Linux, IRIX, Solaris, Free-BSD, HP-Ux, AIX, OSX) use the -cmake or ccmake commandline utils: - - cd OpenSceneGraph - ccmake . - 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 should help -guide you through the process: - - http://www.openscenegraph.com/index.php?page=Build.CMake - -For further details on compiliation, installation and platform specific information -read "Getting Started" at http://www.openscenegraph.org, under -"Documentation". diff --git a/README.txt b/README.txt index 1344a28e2..f1cec7e2d 100644 --- a/README.txt +++ b/README.txt @@ -1,13 +1,46 @@ Welcome to the OpenSceneGraph (OSG). -For up to date information on the project, how to compile and run libraries -and examples, and see the documentation on the OpenSceneGraph website. +For up to date information on the project, how to indepth details on how to +compile and run libraries and examples, and see the documentation on the +OpenSceneGraph website. http://www.openscenegraph.org -Or for the impatient read the INSTALL.txt in the OpenSceneGraph root directory. +For the impatient, read the simplified build notes below. Robert Osfield. Project Lead. -1st May 2007. +7th May 2007. + +-- + +How to build the OpenSceneGraph +=============================== + +The OpenSceneGraph use the CMake build system to generate platform specific +build environment. CMake reads the CMakeLists.txt files that you'll find +throughout the OpenSceneGraph directories, check for installed dependnecies +and then generate the appropriate build system. + +If you don't already have CMake installed on your system you can grab it +from http://www.cmake.org, version 2.4.6 or later. + +Under unices (i.e. Linux, IRIX, Solaris, Free-BSD, HP-Ux, AIX, OSX) use the +cmake or ccmake commandline utils: + + cd OpenSceneGraph + ccmake . + 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 should help +guide you through the process: + + http://www.openscenegraph.com/index.php?page=Build.CMake + +For further details on compiliation, installation and platform specific information +read "Getting Started" at http://www.openscenegraph.org, under +"Documentation". + diff --git a/include/osg/Version b/include/osg/Version index 07a23b02f..d1d7945ff 100644 --- a/include/osg/Version +++ b/include/osg/Version @@ -20,7 +20,7 @@ extern "C" { #define OSG_VERSION_MAJOR 1 #define OSG_VERSION_MINOR 9 -#define OSG_VERSION_RELEASE 2 +#define OSG_VERSION_RELEASE 3 #define OSG_VERSION_REVISION 0 /**