FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,298 Commits 1 Branch 26 Tags 73 MiB
711d69d2fd
Commit Graph

507 Commits

Author SHA1 Message Date
Gleb Mazovetskiy
df0c312d99 CMakeLists.txt: OSG_FIND_3RD_PARTY_DEPS option 
Android-specific macros aren't needed in some cases, e.g. if the NDK is
setup with all the needed dependencies a much easier way to find
packages is to simply specify the correct `CMAKE_FIND_ROOT_PATH`.

The `ANDROID_3RD_PARTY` macro interferes with this.
Adds an option to disable it.

WIN32 build is in a similar situation, the new option affects it also.
 2021-01-22 15:21:47 +00:00
Robert Osfield
ce5efa9505
Merge pull request #1027 from glebm/fix-windowing-system 
Fix osgViewer `USE_GRAPHICSWINDOW` without a windowing system
 2021-01-18 14:47:47 +00:00
Robert Osfield
b330920c11
Merge pull request #1026 from glebm/patch-1 
cmake: Allow passing LTO option
 2021-01-18 14:44:07 +00:00
Gleb Mazovetskiy
0968256923 Fix osgViewer USE_GRAPHICSWINDOW without a windowing system 
There is no way for the user to know whether OSG was compiled with a
windowing system.

This means calling USE_GRAPHICSWINDOW() in client libraries was unsafe
in the case of the "None" windowing system, as it would fail to link.

Turns the call into a no-op in that case.
 2021-01-14 21:44:42 +00:00
Gleb Mazovetskiy
f6505a0f84 cmake: Allow passing LTO option 2021-01-14 01:30:25 +00:00
Sam Brkopac
56d3dd0e4c updated cmake to properly disable debug iterators on windows 2020-12-10 14:17:36 -07:00
Robert Osfield
50de0c25f7 Updated SO version number 2020-08-19 16:09:41 +01:00
OpenSceneGraph git repository
32bb3fd91e
Merge branch 'master' into bufferstorage 2020-01-07 11:21:42 +00:00
Julien Valentin
22473d0f7f add MappingBitField serializer and increment SO version 2020-01-06 20:11:23 +01:00
Laurens Voerman
477dd3cda2 fix apple carbon reference 2019-12-11 18:31:44 +00:00
OpenSceneGraph git repository
480e4607a8
Merge pull request #832 from remoe/win_egl_port 
WIP: EGL support for Windows. Allow to run OSG with Google/Angle
 2019-12-11 17:06:38 +00:00
Konstantin S. Matveyev
f73ece7d1e Fix build iOS: when using Toolchain or building with Makefiles (not Xcode) 2019-12-11 16:59:26 +00:00
Remo E
fbc31d9987 First implementation of EGL/Angle support. Tested with GLES3 on DirectX11 platform. 
Pixelbuffer currently not supported.
 2019-08-30 19:28:55 +02:00
konstantin.matveyev
36a3c5f2b2 OSG_TEXT_USE_FONTCONFIG cmake option added: Set to ON to enable attempt to use FontConfig in osgText; Disabled by default for iOS and Android 2019-07-26 14:13:02 +01:00
Robert Osfield
b957581342 Removed references OpenVRML plugin 2019-07-18 11:16:08 +01:00
Ralf Habacker
58de37c9ff cmake: Add summary information to get an idea of what dependencies might be missing 2019-07-16 12:16:46 +01:00
Robert Osfield
8607ac24eb Merged Alberto Luaces commit "Avoid that mingw cross-compilation choosing X11 as the windowing system" from the OpenSceneGraph-3.6 branch 2019-07-16 11:49:32 +01:00
Robert Osfield
87597a7fff Added osg::Node associated limited to SO version 200 and higher 2019-07-15 12:22:11 +01:00
StefanBruens
f21f269302
Fix wxWidgets COMPONENTS specification, deprecated usage broken with CMake 3.14 
Current FindWxWidgets.cmake allows to specify OPTIONAL components, unfortunately
this broke the (deprecated) use of wxWidgets_USE_LIBS.

Fixes: #779
 2019-07-02 20:37:02 +02:00
Laurens Voerman
e1de14c689 add missing E to ELSIF 
# Conflicts:
#	src/osgViewer/CMakeLists.txt
 2019-04-30 11:26:03 +02:00
Robert Osfield
5a6baf3885 Merged CMake: OSG_WINDOWING_SYSTEM fixed from the 3.6 branch 2019-04-26 09:53:49 +01:00
Jeongseok Lee
8fc039d352 Update comments and fix cmake version check 2019-03-20 09:09:56 -07:00
Jeongseok Lee
ce61fc413a Use GNUInstallDirs only for CMake >= 2.8.5 2019-03-20 08:56:17 -07:00
Jeongseok Lee
3285bdc8d8 Use GNUInstallDirs for library installation path 2019-03-14 08:46:46 -07:00
Capostrophic
52fe3679a3 Add OSG_USE_FLOAT_QUAT build option to use single precision quaternions 2019-03-13 22:08:19 +03:00
Ulrich Hertlein
10af927260 Support for macOS 10.14 
- 10.14 drops libstdc++
- drops support for Carbon :-)
- drops support for macOS < 10.9
 2019-02-07 19:18:11 +01:00
Ulrich Hertlein
eac4c9df60 Minor cmake cleanups and formatting 2019-02-07 19:16:00 +01:00
Michael X. Grey
bb515c4816 Install config files to OSG-specific cmake directory 2018-11-15 16:54:58 +08:00
Michael X. Grey
ea9d61964d Fix target exporting 2018-11-15 16:38:18 +08:00
Michael X. Grey
af1be65012 Automatically generate pkgconfig files instead of using manually maintained templates 2018-11-15 14:26:41 +08:00
Michael X. Grey
b1b34b51e1 Change to CamelCase package name convention 2018-11-15 12:52:11 +08:00
Michael X. Grey
7440d0c3d8 Make openscenegraph-config.cmake lowercase 2018-11-14 18:43:29 +08:00
Michael X. Grey
b65e29badc Create a config-file and export library targets for downstream users 2018-11-14 18:28:21 +08:00
Robert Osfield
85504b45f6 Restructed the setting of the OSG_GL_CONTEXT_VERSION to allow script to set it's default value 2018-11-11 10:17:37 +00:00
Robert Osfield
8636ad8394 Added make clobber target, imported in from the VSG project. 2018-11-09 11:30:57 +00:00
Thomas Hogarth
49e9aadbf5 Improved iOS cmake support for xcode 9.4 and cmake 3.11 2018-07-10 02:09:28 +01:00
Robert Osfield
f94980b1fe Removed the gl3.h usage for GL3 case as these headers were replaced by glcorearb.h, it's probably better to just fallback to gl.h and have the OSG get the extentions at runtime. 2018-06-29 09:57:55 +01:00
Robert Osfield
22e5861c0b Removed deprecated xine plugin to simplify licensing (xine plugin is GPL'd) 2018-05-31 15:12:28 +01:00
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