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

Merge remote-tracking branch 'bpay/clang-cl-build-fixes' into development

Browse source 
Conflicts:
	Engine/source/T3D/shapeBase.h
This commit is contained in:
Daniel Buckmaster 2015-07-17 16:55:12 +10:00
commit c2e5dc3345
17 changed files with 40 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/platformWin32/winDirectInput.cpp
View file

@ -450,7 +450,7 @@ int DInputManager::getXInputState(S32 controllerID, S32 property, bool current)
switch(property)
{
#define CHECK_PROP_ANALOG(prop, stateTest) \
case prop: (current) ? retVal = mXInputStateNew[controllerID].state.Gamepad.##stateTest : retVal = mXInputStateOld[controllerID].state.Gamepad.##stateTest; return retVal;
case prop: (current) ? retVal = mXInputStateNew[controllerID].state.Gamepad.stateTest : retVal = mXInputStateOld[controllerID].state.Gamepad.stateTest; return retVal;
CHECK_PROP_ANALOG(XI_THUMBLX, sThumbLX)
CHECK_PROP_ANALOG(XI_THUMBLY, sThumbLY)

6
Engine/source/platformWin32/winFileio.cpp
View file

@ -1411,9 +1411,9 @@ static bool recurseDumpDirectories(const char *basePath, const char *subPath, Ve
if( ( subPath && ( dStrncmp( subPath, "", 1 ) != 0 ) ))
{
if( subTrail == '/' )
dSprintf(search, search.size, "%s%s", subPath, fileName);
dSprintf(search, search.size, "%s%s", subPath, fileName.ptr);
else
dSprintf(search, search.size, "%s/%s", subPath, fileName);
dSprintf(search, search.size, "%s/%s", subPath, fileName.ptr);
char* child = search;
if( currentDepth < recurseDepth || recurseDepth == -1 )
@ -1427,7 +1427,7 @@ static bool recurseDumpDirectories(const char *basePath, const char *subPath, Ve
child = fileName;
else
{
dSprintf(search, search.size, "/%s", fileName);
dSprintf(search, search.size, "/%s", fileName.ptr);
child = search;
}

2
Engine/source/platformWin32/winMath.cpp
View file

@ -79,7 +79,7 @@ ConsoleFunction( mathInit, void, 1, 10, "( ... )"
properties |= CPU_PROP_SSE;
continue;
}
Con::printf("Error: MathInit(): ignoring unknown math extension '%s'", *argv);
Con::printf("Error: MathInit(): ignoring unknown math extension '%s'", argv->getStringValue());
}
Math::init(properties);
}