mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-11 14:44:36 +00:00
update bullet so it actually works
Moved the addSourceDirectory for physics/Bullet into the Engine/Source/CMakeLists.txt file that way it can actually appear where we expect it to in the solution explorer.
This commit is contained in:
parent
c7be48130a
commit
13fa178cf6
5986 changed files with 1811270 additions and 453803 deletions
|
|
@ -3,12 +3,11 @@
|
|||
|
||||
#include "Bullet3Common/b3Logging.h"
|
||||
|
||||
|
||||
void myerrorprintf(const char* msg)
|
||||
{
|
||||
printf("%s",msg);
|
||||
printf("%s", msg);
|
||||
}
|
||||
|
||||
|
||||
static bool sVerboseWarning = true;
|
||||
|
||||
void mywarningprintf(const char* msg)
|
||||
|
|
@ -16,38 +15,38 @@ void mywarningprintf(const char* msg)
|
|||
if (sVerboseWarning)
|
||||
{
|
||||
//OutputDebugStringA(msg);
|
||||
printf("%s",msg);
|
||||
printf("%s", msg);
|
||||
}
|
||||
}
|
||||
|
||||
static bool sVerbosePrintf=true;//false;
|
||||
static bool sVerbosePrintf = true; //false;
|
||||
|
||||
void myprintf(const char* msg)
|
||||
{
|
||||
if (sVerbosePrintf)
|
||||
{
|
||||
//OutputDebugStringA(msg);
|
||||
printf("%s",msg);
|
||||
printf("%s", msg);
|
||||
}
|
||||
}
|
||||
|
||||
int gArgc=0;
|
||||
char** gArgv=0;
|
||||
int gArgc = 0;
|
||||
char** gArgv = 0;
|
||||
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
#if _MSC_VER
|
||||
_CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
|
||||
//void *testWhetherMemoryLeakDetectionWorks = malloc(1);
|
||||
_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
|
||||
//void *testWhetherMemoryLeakDetectionWorks = malloc(1);
|
||||
#endif
|
||||
::testing::InitGoogleTest(&argc, argv);
|
||||
::testing::InitGoogleTest(&argc, argv);
|
||||
|
||||
gArgc = argc;
|
||||
gArgv = argv;
|
||||
gArgc = argc;
|
||||
gArgv = argv;
|
||||
|
||||
b3SetCustomPrintfFunc(myprintf);
|
||||
b3SetCustomWarningMessageFunc(mywarningprintf);
|
||||
b3SetCustomErrorMessageFunc(myerrorprintf);
|
||||
b3SetCustomPrintfFunc(myprintf);
|
||||
b3SetCustomWarningMessageFunc(mywarningprintf);
|
||||
b3SetCustomErrorMessageFunc(myerrorprintf);
|
||||
|
||||
return RUN_ALL_TESTS();
|
||||
return RUN_ALL_TESTS();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue