Commit Graph

454 Commits

Author SHA1 Message Date
OpenSceneGraph git repository
91aec8107a
Improved indentation 2017-12-31 13:32:44 +00:00
Alberto Luaces
08e1a06fcd Detecting the windows version at build time breaks cross-compilation.
I have made this auto-detection optional (default ON).
2017-12-26 15:35:42 +01:00
Björn Blissing
09eefd7973 Added script to identify Windows version
Added script to identify the Windows version used to compile the source.
Currently the windows version for Windows NT is hard coded into the
source. By running this CMake script the _WIN32_WINNT preprocessor
variable gets set to the corresponding windows version.
2017-11-30 12:53:24 +01:00
Robert Osfield
4af66f6897 Update version to 3.5.10 2017-11-29 15:06:53 +00:00
Robert Osfield
28af946c4b Bummped the SO version 2017-11-29 10:40:20 +00:00
Robert Osfield
d60b9714fe Moved the version to 3.5.9 and the version setting code to top of CMake file 2017-11-20 12:49:20 +00:00
Raymond de Vries
41dda781ee attached fixes for configuring and building the osgPlugin exr with Visual Studio and using out-of-the-box builds of ilmbase and openexr, i.e. without manual/extra config for using these 2 libs with the OSG.
Previously, the assumption was made that ilmbase and openexr were installed in a common directory and hence the header files and libs were both found in that common directory. That is not consistent with other libs and this submission makes it consistent and therefore the OSG configures out of the box. I made this work for ilmbase-2.1.0.tar.gz / openexr-2.1.0.tar.gz and ilmbase-2.2.0.tar.gz / openexr-2.2.0.tar.gz
2017-11-14 10:59:08 +00:00
Robert Osfield
cba8559137 Updated SO version to 152 to reflect the resent API changes to osgAnimation. 2017-11-11 14:50:55 +00:00
Robert Osfield
51a9c66856 Added OSG_ENVVAR_SUPPORTED cmake control and bool osg::getEnvVar(const char* name, T& value, ...) conviniece funcions to make it easier to implement optinal getenv reading code. 2017-11-01 13:32:47 +00:00
Robert Osfield
053ba83be6 Merged support for StateSet::DefineList from shader_pipeline branch 2017-10-30 09:32:04 +00:00
Robert Osfield
b2603d6c93 Updated version number 2017-10-09 12:25:40 +01:00
Robert Osfield
be2f2d6595 Bumped SO version to reflect changes in ABI 2017-08-24 11:17:43 +01:00
Robert Osfield
af79ad451e Added remapping of CMAKE_BUILD_TYPE strings that don't have the correct case. 2017-08-16 17:51:58 +01:00
luzpaz
2cd31f65e4 misc. typo fixes
mostly non-user-facing but some doxy.
2017-08-15 12:23:49 -04:00
Robert Osfield
fc95045259 Updated version number, ChangeLog and AUTHORS file for 3.5.7 developer release 2017-07-28 17:17:25 +01:00
Robert Osfield
fcdd3750c2 Replaced FindOurDCMTK.cmake usage with FindDCMTK.cmake 2017-07-26 12:54:37 +01:00
Robert Osfield
0b5f45289d Updated SO version number to 149 to enable uint64 object length read/writing in the .osgb format 2017-06-19 15:55:42 +01:00
OpenSceneGraph git repository
ccd79d9db1 Merge pull request #258 from kornerr/master
Add x86_64 architecture to iOS simulator
2017-05-25 09:37:26 +01:00
Robert Osfield
20ac472d1f Moved OSG_USE_DEPRECATED_API from include/osg/Export to Cmake controlled include/osg/Config 2017-05-24 19:40:08 +01:00
Michael Kapelko
55d394490a Add x86_64 architecture to iOS simulator 2017-05-24 22:29:19 +07:00
Robert Osfield
36bd42b0dd Updated SO_VERSION to reflect API changes to KdTree 2017-05-11 16:10:47 +01:00
Remo E
3f99ce540f Fix VS2013 build issue
Fix this build issue on VS2013:

```
\src\osg\State.cpp(99): fatal error C1017: invalid integer constant expression
```

I hope this works also on other platforms.
2017-03-29 15:28:09 +02:00
Robert Osfield
76afbc9bcf Fixed ac plugin's handling of rot primitive in .ac files 2017-03-27 20:30:14 +01:00
Thomas Hogarth
7ba2e728cd GLES3 now working on iOS, tried to maintain support for have bother gles2 and gles3, allowed avfoundation to be added on iOS, improved iOS example cmake generation 2017-03-20 18:39:56 +00:00
Thomas Hogarth
76fe572934 Added conditionals for GLES3, added correct gl headers for GLES3 on iOS and Android to GL.in 2017-03-20 18:33:08 +00:00
Laurens Voerman
7b67ef0c6f split travis-ci apple build into two jobs to avoid job time limit. 2017-02-03 10:01:15 +01:00
Robert Osfield
a9bc508dc4 From Abhishek Bansal, with ammendemts by Robet Osfield to get working with recent OpenCascade and usng CMake. 2016-11-30 19:11:15 +00:00
Robert Osfield
4e5f0fc3a5 Added a dedicated FindEGL.cmake script to help with locating the EGL.so library and header 2016-10-14 11:06:31 +01:00
Robert Osfield
dbdd25742d Updated version number to 3.5.6 and SO version to 146 after VAO merge 2016-10-12 09:09:37 +01:00
Mathieu MARACHE
46c86f53ac remove a warning when compiling with GL3 core profile and macOS 2016-10-11 11:29:29 +01:00
Robert Osfield
56a7208891 Removed Qt dependency examples, osgQt NodeKit and qfont plugin as these are now provided by the separate osgQt project 2016-09-26 09:31:22 +01:00
Robert Osfield
3f91c5d970 Changed the min CMake version to 2.8.0 2016-09-22 18:33:35 +01:00
Laurens Voerman
ba3ab1a7c1 fix error in CmakeLists: CMAKE_CXX_COMPILER_VERSIO -> CMAKE_CXX_COMPILER_VERSION 2016-09-22 09:09:46 +02:00
Laurens Voerman
3b029f5d3e short version with gcc warning flags depending on compiler version. 2016-09-20 10:23:15 +02:00
Laurens Voerman
65567fdeac Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph into Submissions10 2016-09-20 10:20:47 +02:00
Laurens Voerman
37bd1c6b93 disable warning C4589 for MSVC 2016-09-19 16:40:59 +02:00
Laurens Voerman
c757fdb779 enable some more aggressive warning flags for gcc 4.7 and cmake version below 3 2016-09-16 17:12:41 +02:00
Laurens Voerman
743ecf3706 remove last Performer reference 2016-09-09 10:58:19 +02:00
Robert Osfield
489860fb87 Updated version number to 3.5.5 2016-09-06 09:31:16 +01:00
Robert Osfield
aae78b8a8b Updated ChangeLog formatting 2016-09-05 19:12:54 +01:00
Ravi Mathur
e9d6737ec4 Updates to the CMake build system for Mac OSX 2016-08-10 14:30:28 +01:00
Robert Osfield
072eace1bf Removed the osgviewerGLUT as GLUT is terrible example of how to build a modern 3D graphics application. 2016-06-21 09:21:45 +01:00
Robert Osfield
3816e4c76e Updated SO version number to reflect changes to API 2016-06-14 12:00:36 +01:00
Robert Osfield
358a882031 Updated version number of to 3.5.4 2016-06-10 18:03:18 +01:00
Robert Osfield
16645b1e25 Added -Wmaybe-uninitialized -Wextra warnings to GNU CXX build. 2016-06-08 10:21:57 +01:00
Robert Osfield
7d7c0daa5e Added check against GCC version when adding the -Wshadow warning to OSG_AGGRESSIVE_WARNING_FLAGS so that it's only used in versions later than 4.9. 2016-06-02 20:00:42 +01:00
Robert Osfield
dd9bcf6013 Set default value of OSG_USE_REF_PTR_SAFE_DEREFERENCE of OFF to avoid the check overhead polutting all OSG applications. 2016-06-02 13:03:07 +01:00
Robert Osfield
c0b560175c Fixed typo 2016-06-02 12:43:09 +01:00
Robert Osfield
88a01aa09d Bumped version number for 3.5.3 dev release 2016-06-02 11:25:40 +01:00
Robert Osfield
045fa05b0d Restructed the control of OSG_AGGRESSIVE_WARNINGS_FLAGS to make it possible to edit them in ccmake/CMakeSetup.
Changed the name of OSG_USE_AGGRESSIVE_WARNINGS to OSG_AGGRESSIVE_WARNINGS to make sure it sits alongside the OSG_AGGRESSIVE_WARNINGS_FLAGS within ccmake
so that it's easier to see how the two variables are coupled.
2016-06-02 11:06:50 +01:00