TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lower engine requirements back to c++17 standards, not c++20.

Browse source
This commit is contained in:
AzaezelX 2023-10-15 15:19:41 -05:00 • committed by Brian Roberts
parent e6ead9f268
commit 3bdce1f33e
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/CMakeLists.txt
View file

@ -340,7 +340,6 @@ if (TORQUE_DYNAMIC_LIBRARY AND NOT TORQUE_TESTING)
target_compile_definitions(TorqueEngine PUBLIC ${TORQUE_COMPILE_DEFINITIONS}) target_compile_definitions(TorqueEngine PUBLIC ${TORQUE_COMPILE_DEFINITIONS})
target_link_libraries(TorqueEngine ${TORQUE_LINK_LIBRARIES}) target_link_libraries(TorqueEngine ${TORQUE_LINK_LIBRARIES})
target_include_directories(TorqueEngine PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_BINARY_DIR}/temp" ${TORQUE_INCLUDE_DIRECTORIES}) target_include_directories(TorqueEngine PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_BINARY_DIR}/temp" ${TORQUE_INCLUDE_DIRECTORIES})
target_compile_features(TorqueEngine PRIVATE cxx_std_20)
set(TORQUE_SOURCE_FILES "main/main.cpp") set(TORQUE_SOURCE_FILES "main/main.cpp")
set(TORQUE_LINK_LIBRARIES TorqueEngine) set(TORQUE_LINK_LIBRARIES TorqueEngine)
@ -409,7 +408,6 @@ if (TORQUE_TARGET_PROPERTIES)
set_target_properties(${TORQUE_APP_NAME} PROPERTIES ${TORQUE_TARGET_PROPERTIES}) set_target_properties(${TORQUE_APP_NAME} PROPERTIES ${TORQUE_TARGET_PROPERTIES})
endif (TORQUE_TARGET_PROPERTIES) endif (TORQUE_TARGET_PROPERTIES)
target_include_directories(${TORQUE_APP_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_BINARY_DIR}/temp" ${TORQUE_INCLUDE_DIRECTORIES}) target_include_directories(${TORQUE_APP_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_BINARY_DIR}/temp" ${TORQUE_INCLUDE_DIRECTORIES})
target_compile_features(${TORQUE_APP_NAME} PRIVATE cxx_std_20)
if(TORQUE_TESTING) if(TORQUE_TESTING)
if(WIN32) if(WIN32)

8
Engine/source/scene/sceneQueryUtil.h
View file

@ -80,14 +80,14 @@ struct SceneBinRange
inline bool operator==(const SceneBinRange& other) const inline bool operator==(const SceneBinRange& other) const
{ {
return dMemcmp(minCoord, other.minCoord, sizeof(minCoord)) == 0 && return memcmp(minCoord, other.minCoord, sizeof(minCoord)) == 0 &&
dMemcmp(maxCoord, other.maxCoord, sizeof(maxCoord)) == 0; memcmp(maxCoord, other.maxCoord, sizeof(maxCoord)) == 0;
} }
inline bool operator!=(const SceneBinRange& other) const inline bool operator!=(const SceneBinRange& other) const
{ {
if (dMemcmp(minCoord, other.minCoord, sizeof(minCoord)) == 0 && if (memcmp(minCoord, other.minCoord, sizeof(minCoord)) == 0 &&
dMemcmp(maxCoord, other.maxCoord, sizeof(maxCoord)) == 0) memcmp(maxCoord, other.maxCoord, sizeof(maxCoord)) == 0)
return false; return false;
else else
return true; return true;