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

Merge pull request #2288 from Azaezel/unixUpdates

Browse source 
corrects compilation errors on non-mac unix derivatives
This commit is contained in:
Areloch 2019-01-06 02:12:45 -06:00 • committed by GitHub
commit 480818795f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Engine/source/platformX86UNIX/x86UNIXConsole.cpp
View file

@ -34,13 +34,14 @@
#include <stdarg.h> #include <stdarg.h>
#include <fcntl.h> #include <fcntl.h>
#include "console/engineAPI.h"
StdConsole *stdConsole = NULL; StdConsole *stdConsole = NULL;
ConsoleFunction(enableWinConsole, void, 2, 2, "enableWinConsole(bool);") DefineEngineFunction(enableWinConsole, void, (bool _enable),, "enableWinConsole(bool);")
{ {
argc;
if (stdConsole) if (stdConsole)
stdConsole->enable(dAtob(argv[1])); stdConsole->enable(_enable);
} }
void StdConsole::create() void StdConsole::create()

2
Engine/source/platformX86UNIX/x86UNIXFileio.cpp
View file

@ -55,7 +55,7 @@
#include "console/console.h" #include "console/console.h"
#include "core/strings/stringFunctions.h" #include "core/strings/stringFunctions.h"
#include "util/tempAlloc.h" #include "util/tempAlloc.h"
#include "cinterface/cinterface.h" #include "cinterface/c_controlInterface.h"
#include "core/volume.h" #include "core/volume.h"
#if defined(__FreeBSD__) #if defined(__FreeBSD__)

10
Engine/source/platformX86UNIX/x86UNIXMath.cpp
View file

@ -24,7 +24,7 @@
#include "console/console.h" #include "console/console.h"
#include "math/mMath.h" #include "math/mMath.h"
#include "core/strings/stringFunctions.h" #include "core/strings/stringFunctions.h"
#include "console/engineAPI.h"
extern void mInstallLibrary_C(); extern void mInstallLibrary_C();
extern void mInstallLibrary_ASM(); extern void mInstallLibrary_ASM();
@ -35,7 +35,13 @@ extern void mInstall_Library_SSE();
//-------------------------------------- //--------------------------------------
ConsoleFunction( MathInit, void, 1, 10, "(detect|C|FPU|MMX|3DNOW|SSE|...)") DefineEngineStringlyVariadicFunction( mathInit, void, 1, 10, "( ... )"
"@brief Install the math library with specified extensions.\n\n"
"Possible parameters are:\n\n"
" - 'DETECT' Autodetect math lib settings.\n\n"
" - 'C' Enable the C math routines. C routines are always enabled.\n\n"
" - 'SSE' Enable SSE math routines.\n\n"
"@ingroup Math")
{ {
U32 properties = CPU_PROP_C; // C entensions are always used U32 properties = CPU_PROP_C; // C entensions are always used

7
Engine/source/platformX86UNIX/x86UNIXProcessControl.cpp
View file

@ -29,7 +29,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <signal.h> #include <signal.h>
#include "console/engineAPI.h"
#ifndef TORQUE_DEDICATED #ifndef TORQUE_DEDICATED
#include <SDL.h> #include <SDL.h>
#endif #endif
@ -203,10 +203,7 @@ void Platform::outputDebugString(const char *string, ...)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// testing function // testing function
ConsoleFunction(debug_debugbreak, void, 1, 1, "debug_debugbreak()") //DefineEngineFunction(debug_debugbreak, void, () , , "debug_debugbreak();");
{
Platform::debugBreak();
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void Platform::restartInstance() void Platform::restartInstance()