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

Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0_MenuUIRework

Browse source
This commit is contained in:
Areloch 2020-06-01 03:48:20 -05:00
commit 69089e1ee2
297 changed files with 4174 additions and 470 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Tools/CMake/torque3d.cmake
View file

@ -38,10 +38,6 @@ if(UNIX)
endif()
# for asm files
SET (CMAKE_ASM_NASM_OBJECT_FORMAT "elf")
ENABLE_LANGUAGE (ASM_NASM)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif()