TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-11 00:10:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'Preview4_0' into feature-vfs-security

Browse source
This commit is contained in:
Robert MacGregor 2022-06-13 08:05:26 -04:00
commit 161ffc62fe
3013 changed files with 348715 additions and 182470 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Tools/CMake/basics.cmake
View file

@ -467,6 +467,19 @@ if(WIN32)
ENDFOREACH()
endif()
else()
if(${CMAKE_VERSION} VERSION_LESS "3.16.0")
macro(CHECK_OBJC_SOURCE_COMPILES SOURCE VAR)
set(PREV_REQUIRED_DEFS "${CMAKE_REQUIRED_DEFINITIONS}")
set(CMAKE_REQUIRED_DEFINITIONS "-x objective-c ${PREV_REQUIRED_DEFS}")
CHECK_C_SOURCE_COMPILES(${SOURCE} ${VAR})
set(CMAKE_REQUIRED_DEFINITIONS "${PREV_REQUIRED_DEFS}")
endmacro()
else()
include(CheckOBJCSourceCompiles)
if (APPLE)
enable_language(OBJC)
endif()
endif()
# TODO: improve default settings on other platforms
set(TORQUE_CXX_FLAGS_EXECUTABLES "" CACHE STRING "")
mark_as_advanced(TORQUE_CXX_FLAGS_EXECUTABLES)

19
Tools/CMake/libraries/assimp.cmake
View file

@ -122,6 +122,23 @@ addDef(ASSIMP_BUILD_NO_GLTF_EXPORTER)
#addDef(ASSIMP_BUILD_NO_X_EXPORTER)
#addDef(ASSIMP_BUILD_NO_X3D_EXPORTER)
addDef(ASSIMP_IGNORE_GIT_HASH)
SET(GIT_COMMIT_HASH 0)
SET(GIT_BRANCH 0)
SET(ASSIMP_VERSION_MAJOR 5)
SET(ASSIMP_VERSION_MINOR 2)
SET(ASSIMP_VERSION_PATCH 3)
SET(ASSIMP_PACKAGE_VERSION "5_2_3")
CONFIGURE_FILE(
${libDir}/assimp/revision.h.in
${libDir}/assimp/revision.h
)
CONFIGURE_FILE(
${libDir}/assimp/include/assimp/config.h.in
${libDir}/assimp/include/assimp/config.h
)
addInclude(${libDir}/assimp)
addInclude(${libDir}/assimp/include/)
addInclude(${libDir}/assimp/include/assimp)
@ -131,6 +148,8 @@ addInclude(${libDir}/assimp/contrib/irrXML)
addInclude(${libDir}/assimp/contrib/Open3DGC)
addInclude(${libDir}/assimp/contrib/openddlparser)
addInclude(${libDir}/assimp/contrib/poly2tri)
addInclude(${libDir}/assimp/contrib/pugixml/src)
addInclude(${libDir}/assimp/contrib/pugixml/contrib)
addInclude(${libDir}/assimp/contrib/rapidjson)
addInclude(${libDir}/assimp/contrib/rapidjson/include)
addInclude(${libDir}/assimp/contrib/unzip)

4
Tools/CMake/torque3d.cmake
View file

@ -61,8 +61,8 @@ option(TORQUE_ADVANCED_LIGHTING "Advanced Lighting" ON)
mark_as_advanced(TORQUE_ADVANCED_LIGHTING)
option(TORQUE_BASIC_LIGHTING "Basic Lighting" ON)
mark_as_advanced(TORQUE_BASIC_LIGHTING)
option(TORQUE_SFX_DirectX "DirectX Sound" OFF)
mark_as_advanced(TORQUE_SFX_DirectX)
# option(TORQUE_SFX_DirectX "DirectX Sound" OFF)
# mark_as_advanced(TORQUE_SFX_DirectX)
option(TORQUE_SFX_OPENAL "OpenAL Sound" ON)
mark_as_advanced(TORQUE_APP_PASSWORD)
set(TORQUE_APP_PASSWORD "changeme" CACHE STRING "zip file password")