iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

- added option_tinygltf

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8864 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 2a83de7fe9b2e57c1eb68ddd3041a2b4109583b0
Former-commit-id: f616fdfa72c458b387be6c0b78bcdd7b5c0f7236
This commit is contained in:
torcs-ng 2023-04-04 09:19:30 +00:00
parent 9cdb966e9a
commit a1aa6b25f2
2 changed files with 43 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/options.cmake
View file

@ -80,6 +80,8 @@ MACRO(ADD_SD_COMPILE_OPTIONS)
SET(OPTION_OSGGRAPH true CACHE BOOL "Build OpenScenGraph-based WIP osggraph graphics module")
SET(OPTION_TINYGLTF false CACHE BOOL "Use tinygltf library")
SET(OPTION_WEBSERVER true CACHE BOOL "Build with WebServer functionality")
SET(OPTION_CLIENT_SERVER false CACHE BOOL "Build with Client/Server network architecture")

49
cmake/thirdpartydeps.cmake
View file

@ -2,7 +2,7 @@
#
# file : thirdpartydeps.cmake
# copyright : (C) 2008 by Mart Kelder, 2010 by J.-P. Meuret
# web : www.speed-dreams.org
# web : www.speed-dreams.org
# version : $Id$
#
############################################################################
@ -90,7 +90,7 @@ MACRO(ADD_PLIB_LIBRARY TARGET)
# Special case: Apple only uses one library
IF(APPLE AND NOT OPTION_USE_MACPORTS)
SET(PLIB_LIBRARIES ${PLIB_LIBRARIES} ${PLIB_APPLE_LIBRARY})
SET(PLIB_LIBRARIES ${PLIB_LIBRARIES} ${PLIB_APPLE_LIBRARY})
ENDIF(APPLE AND NOT OPTION_USE_MACPORTS)
TARGET_LINK_LIBRARIES(${TARGET} ${PLIB_LIBRARIES})
@ -100,7 +100,7 @@ ENDMACRO(ADD_PLIB_LIBRARY TARGET)
MACRO(ADD_OSG_INCLUDEDIR)
IF(NOT OPENSCENEGRAPH_FOUND)
FIND_PACKAGE(OpenSceneGraph REQUIRED osgDB osgViewer osgGA osgUtil osgFX
FIND_PACKAGE(OpenSceneGraph REQUIRED osgDB osgViewer osgGA osgUtil osgFX
osgParticle OsgShadow osgText)
ENDIF(NOT OPENSCENEGRAPH_FOUND)
@ -115,7 +115,7 @@ ENDMACRO(ADD_OSG_INCLUDEDIR)
MACRO(ADD_OSG_LIBRARY TARGET)
IF(NOT OPENSCENEGRAPH_FOUND)
FIND_PACKAGE(OpenSceneGraph REQUIRED osgDB osgViewer osgGA osgUtil osgFX
FIND_PACKAGE(OpenSceneGraph REQUIRED osgDB osgViewer osgGA osgUtil osgFX
osgParticle osgShadow osgText)
ENDIF(NOT OPENSCENEGRAPH_FOUND)
@ -127,6 +127,39 @@ MACRO(ADD_OSG_LIBRARY TARGET)
ENDMACRO(ADD_OSG_LIBRARY TARGET)
MACRO(ADD_TINYGLTF_INCLUDEDIR)
IF(OPTION_3RDPARTY_TINYGLTF)
FIND_PACKAGE(TINYGLTF)
IF(TINYGLTF_FOUND)
INCLUDE_DIRECTORIES(${TINYGLTF_INCLUDE_DIR})
ELSE(TINYGLTF_FOUND)
MESSAGE(FATAL_ERROR "Cannot find tinygltf header files")
ENDIF(TINYGLTF_FOUND)
ENDIF(OPTION_3RDPARTY_TINYGLTF)
ENDMACRO(ADD_TINYGLTF_INCLUDEDIR)
MACRO(ADD_TINYGLTF_LIBRARY TARGET)
IF(OPTION_3RDPARTY_TINYGLTF)
FIND_PACKAGE(TINYGLTF)
IF(TINYGLTF_FOUND)
TARGET_LINK_LIBRARIES(${TARGET} ${TINYGLTF_LIBRARY})
ELSE(TINYGLTF_FOUND)
MESSAGE(FATAL_ERROR "Cannot find tinygltf libraries")
ENDIF(TINYGLTF_FOUND)
ENDIF(OPTION_3RDPARTY_TINYGLTF)
ENDMACRO(ADD_TINYGLTF_LIBRARY TARGET)
MACRO(ADD_SDL2_INCLUDEDIR)
FIND_PACKAGE(SDL2)
@ -326,7 +359,7 @@ ENDMACRO(ADD_ENET_LIBRARY TARGET)
MACRO(ADD_EXPAT_INCLUDEDIR)
IF(OPTION_3RDPARTY_EXPAT)
FIND_PACKAGE(EXPAT)
IF(EXPAT_FOUND)
@ -342,7 +375,7 @@ ENDMACRO(ADD_EXPAT_INCLUDEDIR)
MACRO(ADD_EXPAT_LIBRARY TARGET)
IF(OPTION_3RDPARTY_EXPAT)
FIND_PACKAGE(EXPAT)
IF(EXPAT_FOUND)
@ -358,7 +391,7 @@ ENDMACRO(ADD_EXPAT_LIBRARY TARGET)
MACRO(ADD_SOLID_INCLUDEDIR)
IF(OPTION_3RDPARTY_SOLID)
FIND_PACKAGE(SOLID)
IF(SOLID_FOUND)
@ -374,7 +407,7 @@ ENDMACRO(ADD_SOLID_INCLUDEDIR)
MACRO(ADD_SOLID_LIBRARY TARGET)
IF(OPTION_3RDPARTY_SOLID)
FIND_PACKAGE(SOLID)
IF(SOLID_FOUND)