TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-24 09:03:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Minimal changes to compile T3D on WIN64.

Browse source
This commit is contained in:
LuisAntonRebollo 2014-09-14 21:39:56 +02:00
parent a93f179138
commit 8ed0f508ca
13 changed files with 161 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/platform/platformCPUCount.cpp
View file

@ -24,6 +24,8 @@
#include "platform/platform.h"
#include "platform/platformCPUCount.h"
#if defined(TORQUE_OS_LINUX) || defined(TORQUE_OS_OSX) || defined(TORQUE_OS_XENON) || defined(TORQUE_OS_PS3)
// Consoles don't need this
#if defined(TORQUE_OS_XENON) || defined(TORQUE_OS_PS3)
namespace CPUInfo
@ -661,4 +663,6 @@ next:
}
} // namespace CPUInfo
#endif
#endif
#endif

4
Engine/source/platform/platformFont.h
View file

@ -88,10 +88,10 @@ public:
/// This is just for createPlatformFont to call.
///
/// @todo Rethink this so we don't have a private public.
virtual bool create(const char *name, U32 size, U32 charset = TGE_ANSI_CHARSET) = 0;
virtual bool create( const char *name, dsize_t size, U32 charset = TGE_ANSI_CHARSET ) = 0;
static void enumeratePlatformFonts( Vector<StringTableEntry>& fonts, UTF16* fontFamily = NULL );
};
extern PlatformFont *createPlatformFont(const char *name, U32 size, U32 charset = TGE_ANSI_CHARSET);
extern PlatformFont *createPlatformFont(const char *name, dsize_t size, U32 charset = TGE_ANSI_CHARSET);
#endif // _PLATFORMFONT_H_

4
Engine/source/platform/profiler.cpp
View file

@ -476,8 +476,8 @@ void Profiler::hashPop(ProfilerRootData *expected)
else
{
Con::warnf("Warning: the Torque profiler thread may now run on any cpu.");
DWORD procMask;
DWORD sysMask;
DWORD_PTR procMask;
DWORD_PTR sysMask;
GetProcessAffinityMask( GetCurrentProcess(), &procMask, &sysMask);
SetThreadAffinityMask( GetCurrentThread(), procMask);
}

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

@ -59,7 +59,7 @@ typedef unsigned _int64 U64;
# define TORQUE_OS_STRING "Xbox"
# define TORQUE_OS_XBOX
# include "platform/types.win.h"
#elif defined( _WIN32 )
#elif defined( _WIN32 ) && !defined ( _WIN64 )
# define TORQUE_OS_STRING "Win32"
# define TORQUE_OS_WIN
# define TORQUE_OS_WIN32