mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-11 22:54:34 +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
|
|
@ -1,38 +1,40 @@
|
|||
/////////////////////////////
|
||||
// In the header file
|
||||
|
||||
|
||||
#include <sstream>
|
||||
using namespace std;
|
||||
|
||||
class Salutation
|
||||
{
|
||||
public:
|
||||
static string greet(const string& name);
|
||||
static string greet(const string& name);
|
||||
};
|
||||
|
||||
///////////////////////////////////////
|
||||
// In the class implementation file
|
||||
|
||||
string Salutation::greet(const string& name) {
|
||||
ostringstream s;
|
||||
s << "Hello " << name << "!";
|
||||
return s.str();
|
||||
string Salutation::greet(const string& name)
|
||||
{
|
||||
ostringstream s;
|
||||
s << "Hello " << name << "!";
|
||||
return s.str();
|
||||
}
|
||||
|
||||
///////////////////////////////////////////
|
||||
// In the test file
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
TEST(SalutationTest, Static) {
|
||||
EXPECT_EQ(string("Hello World!"), Salutation::greet("World"));
|
||||
TEST(SalutationTest, Static)
|
||||
{
|
||||
EXPECT_EQ(string("Hello World!"), Salutation::greet("World"));
|
||||
}
|
||||
|
||||
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);
|
||||
return RUN_ALL_TESTS();
|
||||
::testing::InitGoogleTest(&argc, argv);
|
||||
return RUN_ALL_TESTS();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue