mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-15 16:44:36 +00:00
Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into alpha41/cmake_adjustments
This commit is contained in:
commit
52093cbde5
25 changed files with 530 additions and 266 deletions
|
|
@ -43,7 +43,7 @@
|
|||
#include <iosfwd> // for ostream forward-declaration
|
||||
|
||||
// Don't use bits/type_traits.h on Linux - Andrew Galante, GG 8/2/2009
|
||||
#if !defined(_MSC_VER) && !defined(__CELLOS_LV2__) && !defined(__APPLE__) && !defined(__linux__)
|
||||
#if !defined(_MSC_VER) && !defined(__CELLOS_LV2__) && !defined(__APPLE__) && !defined(__linux__) && !defined( __FreeBSD__)
|
||||
#ifdef __MINGW32__
|
||||
#define HAVE_TYPE_TRAITS
|
||||
#include <bits/type_traits.h>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue