Robert Osfield
72fca371e1
Removed use of deprecated cmake policy
2018-05-12 07:57:44 +01:00
Robert Osfield
651a79b657
Changed the ordering of the build include directory and the source include directory to avoid build issues on systems where a different version of the OSG has been built in-source then another built out-of-source resulting in conflicts
2018-05-10 19:00:13 +01:00
Robert Osfield
e2e8e779e9
Renamed CMake variable + C++ #define to OSG_GL_CONTEXT_VERSION
2018-04-24 17:05:03 +01:00
Robert Osfield
ef3d672f8c
Added OSG_GL_CONTEXT_STRING cmake variable to set include/osg/GL headers that sets Traits::glContextVersion.
2018-04-24 16:30:48 +01:00
Robert Osfield
084927d5ae
Moved OPENGL_INCLUDE_DIR include into it's own INCLUDE_DIRECTORIES(SYSTEM ${OPENGL_INCLUDE_DIR}) entry to help with FreeBSD builds where a previous rev of the OSG has already been installed
2018-03-22 17:05:38 +00:00
Robert Osfield
f7d9974681
Updated version to 3.7.0 after making of the 3.6 stable release branch
2018-03-20 09:47:23 +00:00
Robert Osfield
12a7808aa6
Removed -m message that was causing problems with branch creation
2018-03-20 09:22:11 +00:00
Robert Osfield
383161c14c
Updated version numbers in prep for 3.6 branch
2018-03-20 09:12:58 +00:00
Robert Osfield
950823fac9
Updated ChangeLog and updated version to 3.5.11
2018-03-19 14:27:18 +00:00
Alessandro Terenzi
9010fd8035
iOS CMake project generation improvements (bitcode option)
...
when building for iOS, Xcode allows developers to specify to enable or disable the 'bitcode' compilation option. There's not a preferred way to go and the choice is really up to the developer but considering that:
1. Currently the generated project defaults the option to YES
2. There are almost 90 projects targets that should be modified if one wants to disable the bitcode option (which considerably reduces the footprint of the app)
3. Even though one can select all the 90+ targets and set the option to NO for all of them, the updates could take a few seconds and could be error prone because one could miss to select some targets
I propose to add a CMake setting that is displayed only when building for iOS. By setting this option "before" the project generation would speed up things for developers and would avoid errors at compiling time.
2018-03-09 10:17:59 +00:00
Robert Osfield
753d86d6d8
Merged shader_pipeline version of CMakeLists.txt
2018-01-23 15:27:24 +00:00
Robert Osfield
e49aaa9f2c
Removed the OSG_SYSTEM_SUPPORTED cmake var and added use of posix_spawn under Apple with C system function used elsewhere.
2018-01-23 11:43:55 +00:00
Julien Valentin
020bff3ab1
increment SO version
2018-01-13 21:19:25 +01:00
Robert Osfield
ae57f3cd46
Added ability to toggle on/off use of C system() function call, using OSG_SYSTEM_SUPPORTED Cmake option
2018-01-12 19:52:31 +00:00
Julien Valentin
196256fdcd
Evolve DSO
...
add Node associate on Drawable based:
Drawable
Geometry
DrawPixels.cpp
ShapeDrawable.cpp
RigGeometry.cpp
ConnectedParticleSystem.cpp
FadeText.cpp
Text.cpp
Text3D.cpp
TextBase.cpp
2018-01-04 05:15:13 +01:00
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
