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

Merge remote-tracking branch 'jamesu/simplify_compiler_ast' into x64

Browse source 
Conflicts:
	Engine/source/console/compiler.cpp
	Engine/source/console/compiler.h
This commit is contained in:
Daniel Buckmaster 2014-09-15 11:50:32 +10:00
commit 6fdebd16f6
9 changed files with 973 additions and 1039 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/platform/types.h
View file

@ -109,7 +109,7 @@ static const F32 F32_MAX = F32(3.402823466e+38F); ///< Constant
#endif
/// Integral type matching the host's memory address width.
#ifdef TORQUE_64BITS
#ifdef TORQUE_CPU_X64
typedef U64 MEM_ADDRESS;
#else
typedef U32 MEM_ADDRESS;