mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-16 17:42:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'add_additional_osg_plugins' into 'master'

Browse Source 
reorg of cmake osg plugins; add osgSim and osgdb_dae requirements

See merge request OpenMW/openmw!946
This commit is contained in:
psi29a 2022-09-11 17:17:52 +00:00
commit ab5023932d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -243,17 +243,20 @@ if (USE_QT)
endif() endif()
set(USED_OSG_COMPONENTS set(USED_OSG_COMPONENTS
osgAnimation
osgDB osgDB
osgViewer
osgText
osgGA osgGA
osgParticle
osgUtil
osgFX osgFX
osgParticle
osgText
osgUtil
osgShadow osgShadow
osgAnimation) osgSim
osgViewer
)
set(USED_OSG_PLUGINS set(USED_OSG_PLUGINS
osgdb_bmp osgdb_bmp
osgdb_dae
osgdb_dds osgdb_dds
osgdb_freetype osgdb_freetype
osgdb_jpeg osgdb_jpeg

3
extern/CMakeLists.txt vendored
View File

@ -103,13 +103,14 @@ if(NOT OPENMW_USE_SYSTEM_OSG)
set(BUILD_OSG_PLUGINS_BY_DEFAULT OFF CACHE BOOL "") set(BUILD_OSG_PLUGINS_BY_DEFAULT OFF CACHE BOOL "")
set(BUILD_OSG_PLUGIN_BMP ON CACHE BOOL "") set(BUILD_OSG_PLUGIN_BMP ON CACHE BOOL "")
set(BUILD_OSG_PLUGIN_DAE ON CACHE BOOL "")
set(BUILD_OSG_PLUGIN_DDS ON CACHE BOOL "") set(BUILD_OSG_PLUGIN_DDS ON CACHE BOOL "")
set(BUILD_OSG_PLUGIN_FREETYPE ON CACHE BOOL "") set(BUILD_OSG_PLUGIN_FREETYPE ON CACHE BOOL "")
set(BUILD_OSG_PLUGIN_JPEG ON CACHE BOOL "") set(BUILD_OSG_PLUGIN_JPEG ON CACHE BOOL "")
set(BUILD_OSG_PLUGIN_KTX ON CACHE BOOL "")
set(BUILD_OSG_PLUGIN_OSG ON CACHE BOOL "") set(BUILD_OSG_PLUGIN_OSG ON CACHE BOOL "")
set(BUILD_OSG_PLUGIN_PNG ON CACHE BOOL "") set(BUILD_OSG_PLUGIN_PNG ON CACHE BOOL "")
set(BUILD_OSG_PLUGIN_TGA ON CACHE BOOL "") set(BUILD_OSG_PLUGIN_TGA ON CACHE BOOL "")
set(BUILD_OSG_PLUGIN_KTX ON CACHE BOOL "")
set(OSG_USE_FLOAT_MATRIX ON CACHE BOOL "") set(OSG_USE_FLOAT_MATRIX ON CACHE BOOL "")
set(OSG_USE_FLOAT_PLANE ON CACHE BOOL "") set(OSG_USE_FLOAT_PLANE ON CACHE BOOL "")