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

fixed WIN64 precompiler flags up - basics

Browse source
This commit is contained in:
Thomas Fischer 2014-03-15 13:43:48 +01:00
parent b1c52f8bb1
commit e37ecb0567
5 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/platform/types.codewarrior.h
View file

@ -51,6 +51,10 @@ typedef unsigned long long U64; ///< Compiler independent Unsigned 64-bit in
//-------------------------------------- //--------------------------------------
// Identify the Operating System // Identify the Operating System
#if defined(_WIN64)
# define TORQUE_OS_STRING "Win64"
# define TORQUE_OS_WIN64
# include "platform/types.win32.h"
#if defined(_WIN32) #if defined(_WIN32)
# define TORQUE_OS_STRING "Win32" # define TORQUE_OS_STRING "Win32"
# define TORQUE_OS_WIN32 # define TORQUE_OS_WIN32

4
Engine/source/platform/types.gcc.h
View file

@ -55,6 +55,10 @@ typedef unsigned long long U64;
//-------------------------------------- //--------------------------------------
// Identify the Operating System // Identify the Operating System
#if defined(_WIN64)
# define TORQUE_OS_STRING "Win64"
# define TORQUE_OS_WIN64
# include "platform/types.win32.h"
#if defined(__WIN32__) || defined(_WIN32) #if defined(__WIN32__) || defined(_WIN32)
# define TORQUE_OS_STRING "Win32" # define TORQUE_OS_STRING "Win32"
# define TORQUE_OS_WIN32 # define TORQUE_OS_WIN32

12
Engine/source/platform/types.visualc.h
View file

@ -59,10 +59,14 @@ typedef unsigned _int64 U64;
# define TORQUE_OS_STRING "Xbox" # define TORQUE_OS_STRING "Xbox"
# define TORQUE_OS_XBOX # define TORQUE_OS_XBOX
# include "platform/types.win32.h" # include "platform/types.win32.h"
#elif defined(_WIN32) #elif defined( _WIN32 )
# define TORQUE_OS_STRING "Win32" # define TORQUE_OS_STRING "Win32"
# define TORQUE_OS_WIN32 # define TORQUE_OS_WIN32
# include "platform/types.win32.h" # include "platform/types.win32.h"
#elif defined( _WIN64 )
# define TORQUE_OS_STRING "Win64"
# define TORQUE_OS_WIN64
# include "platform/types.win32.h"
#else #else
# error "VC: Unsupported Operating System" # error "VC: Unsupported Operating System"
#endif #endif
@ -70,17 +74,17 @@ typedef unsigned _int64 U64;
//-------------------------------------- //--------------------------------------
// Identify the CPU // Identify the CPU
#if defined(_M_X64) #if defined( _M_X64 )
# define TORQUE_CPU_STRING "x64" # define TORQUE_CPU_STRING "x64"
# define TORQUE_CPU_X64 # define TORQUE_CPU_X64
# define TORQUE_LITTLE_ENDIAN # define TORQUE_LITTLE_ENDIAN
#elif defined(_M_IX86) #elif defined( _M_IX86 )
# define TORQUE_CPU_STRING "x86" # define TORQUE_CPU_STRING "x86"
# define TORQUE_CPU_X86 # define TORQUE_CPU_X86
# define TORQUE_LITTLE_ENDIAN # define TORQUE_LITTLE_ENDIAN
# define TORQUE_SUPPORTS_NASM # define TORQUE_SUPPORTS_NASM
# define TORQUE_SUPPORTS_VC_INLINE_X86_ASM # define TORQUE_SUPPORTS_VC_INLINE_X86_ASM
#elif defined(TORQUE_OS_XENON) #elif defined( TORQUE_OS_XENON )
# define TORQUE_CPU_STRING "ppc" # define TORQUE_CPU_STRING "ppc"
# define TORQUE_CPU_PPC # define TORQUE_CPU_PPC
# define TORQUE_BIG_ENDIAN # define TORQUE_BIG_ENDIAN

7
Engine/source/platform/types.win32.h
View file

@ -29,7 +29,12 @@
// size_t is needed to overload new // size_t is needed to overload new
// size_t tends to be OS and compiler specific and may need to // size_t tends to be OS and compiler specific and may need to
// be if/def'ed in the future // be if/def'ed in the future
typedef unsigned int dsize_t;
#ifdef _WIN64
typedef unsigned long long dsize_t;
#else
typedef unsigned int dsize_t;
#endif // _WIN64
/// Platform dependent file date-time structure. The definition of this structure /// Platform dependent file date-time structure. The definition of this structure

5
Engine/source/platform/typesWin32.h
View file

@ -76,7 +76,12 @@ typedef double F64; ///< Compiler independent 64-bit float
// size_t is needed to overload new // size_t is needed to overload new
// size_t tends to be OS and compiler specific and may need to // size_t tends to be OS and compiler specific and may need to
// be if/def'ed in the future // be if/def'ed in the future
#ifdef _WIN64
typedef unsigned long long dsize_t;
#else
typedef unsigned int dsize_t; typedef unsigned int dsize_t;
#endif // _WIN64
typedef const char* StringTableEntry; typedef const char* StringTableEntry;