TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP

Browse source 
# Conflicts:
#	Engine/source/gfx/D3D11/gfxD3D11Device.cpp
#	Engine/source/lighting/lightManager.cpp
#	Templates/Full/game/levels/Empty Room.mis
#	Templates/Full/game/levels/Empty Terrain.mis
This commit is contained in:
AzaezelX 2019-05-01 23:18:31 -05:00
commit dd1470202d
218 changed files with 7060 additions and 2938 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Tools/CMake/torque3d.cmake
View file

@ -204,6 +204,9 @@ mark_as_advanced(TORQUE_DEBUG_GFX_MODE)
#option(DEBUG_SPEW "more debug" OFF)
set(TORQUE_NO_DSO_GENERATION ON)
option(TORQUE_USE_ZENITY "use the Zenity backend for NFD" OFF)
mark_as_advanced(TORQUE_USE_ZENITY)
if(WIN32)
# warning C4800: 'XXX' : forcing value to bool 'true' or 'false' (performance warning)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4800")
@ -462,7 +465,11 @@ if(TORQUE_SDL)
# Add other flags to the compiler
add_definitions(${GTK3_CFLAGS_OTHER})
set(BLACKLIST "nfd_win.cpp" "nfd_cocoa.m" )
if(TORQUE_USE_ZENITY)
set(BLACKLIST "nfd_win.cpp" "nfd_cocoa.m" "nfd_gtk.c" )
else()
set(BLACKLIST "nfd_win.cpp" "nfd_cocoa.m" "simple_exec.h" "nfd_zenity.c")
endif()
addLib(nativeFileDialogs)
set(BLACKLIST "" )
@ -472,7 +479,7 @@ if(TORQUE_SDL)
addLib(nativeFileDialogs)
set(BLACKLIST "" )
else()
set(BLACKLIST "nfd_gtk.c" "nfd_cocoa.m" )
set(BLACKLIST "nfd_gtk.c" "nfd_cocoa.m" "simple_exec.h" "nfd_zenity.c")
addLib(nativeFileDialogs)
set(BLACKLIST "" )
addLib(comctl32)