TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-11 08:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #583 from tdev/x64_basics

Browse source 
windows 64 bit basics
This commit is contained in:
Thomas Fischer 2014-03-18 00:51:58 +01:00
commit 29d7fe310d
33 changed files with 81 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gfx/D3D9/gfxD3D9CardProfiler.cpp
View file

@ -25,7 +25,7 @@
#include "gfx/primBuilder.h"
#include "gfx/D3D9/gfxD3D9CardProfiler.h"
#include "gfx/D3D9/gfxD3D9EnumTranslate.h"
#ifdef TORQUE_OS_WIN32
#ifdef TORQUE_OS_WIN
#include "platformWin32/videoInfo/wmiVideoInfo.h"
#endif

4
Engine/source/gfx/gfxDevice.cpp
View file

@ -184,8 +184,8 @@ GFXDevice::GFXDevice()
// Add a few system wide shader macros.
GFXShader::addGlobalMacro( "TORQUE", "1" );
GFXShader::addGlobalMacro( "TORQUE_VERSION", String::ToString(getVersionNumber()) );
#if defined TORQUE_OS_WIN32
GFXShader::addGlobalMacro( "TORQUE_OS_WIN32" );
#if defined TORQUE_OS_WIN
GFXShader::addGlobalMacro( "TORQUE_OS_WIN" );
#elif defined TORQUE_OS_MAC
GFXShader::addGlobalMacro( "TORQUE_OS_MAC" );
#elif defined TORQUE_OS_LINUX