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

Merge pull request #894 from Areloch/SMAA_and_Misc20220916

Browse source 
Implements SMAA and a few unaffiliated fixes
This commit is contained in:
Brian Roberts 2022-09-16 23:11:39 -05:00 • committed by GitHub
commit 391b656e2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 3435 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Tools/CMake/modules/module_curl.cmake
View file

@ -20,7 +20,8 @@
# IN THE SOFTWARE.
# -----------------------------------------------------------------------------
option(TORQUE_NET_CURL "Use CURL and enable HTTPObject" ON)
option(TORQUE_NET_CURL "Use CURL and enable HTTPObject" OFF)
mark_as_advanced(TORQUE_NET_CURL)
if( NOT TORQUE_NET_CURL )
return()

4
Tools/CMake/torque3d.cmake
View file

@ -247,7 +247,7 @@ endif()
# Always enabled paths first
###############################################################################
addPath("${srcDir}/") # must come first :)
addPathRec("${srcDir}/app")
addPath("${srcDir}/app")
addPath("${srcDir}/sfx/media")
addPath("${srcDir}/sfx/null")
addPath("${srcDir}/sfx")
@ -295,7 +295,7 @@ addPath("${srcDir}/platform/output")
addPath("${srcDir}/app")
if (NOT TORQUE_NET_CURL)
set(BLACKLIST "httpObject.h httpObject.cpp")
set(BLACKLIST "httpObject.h" "httpObject.cpp" )
endif()
addPath("${srcDir}/app/net")
set(BLACKLIST "")