Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #423 from aismann/dev 

Enable box2d testbed on linux/macos
This commit is contained in:
aismann 2021-07-06 20:29:38 +02:00 committed by GitHub
parent d5f6714534
commit a46bc403ae
4 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/cpp-tests/CMakeLists.txt
View File

@ -361,23 +361,21 @@ list(APPEND GAME_HEADER
Classes/Box2DTest/Box2dTest.h Classes/Box2DTest/Box2dTest.h
) )
if(WINDOWS)
list(APPEND GAME_HEADER
Classes/Box2DTestBed/Test.h
Classes/Box2DTestBed/Box2DTestBed.h
Classes/Box2DTestBed/CCPhysicsDebugNodeBox2D.h
)
endif()
list(APPEND GAME_SOURCE list(APPEND GAME_SOURCE
Classes/Box2DTest/Box2dTest.cpp Classes/Box2DTest/Box2dTest.cpp
) )
if(WINDOWS) if(WINDOWS OR MACOSX OR LINUX)
list(APPEND GAME_HEADER list(APPEND GAME_HEADER
Classes/Box2DTestBed/test.h
Classes/Box2DTestBed/Box2DTestBed.h
Classes/Box2DTestBed/CCPhysicsDebugNodeBox2D.h
)
list(APPEND GAME_SOURCE
Classes/Box2DTestBed/Box2DTestBed.cpp Classes/Box2DTestBed/Box2DTestBed.cpp
Classes/Box2DTestBed/CCPhysicsDebugNodeBox2D.cpp Classes/Box2DTestBed/CCPhysicsDebugNodeBox2D.cpp
Classes/Box2DTestBed/Test.cpp Classes/Box2DTestBed/test.cpp
Classes/Box2DTestBed/tests/add_pair.cpp Classes/Box2DTestBed/tests/add_pair.cpp
Classes/Box2DTestBed/tests/apply_force.cpp Classes/Box2DTestBed/tests/apply_force.cpp
@ -439,6 +437,7 @@ if(WINDOWS)
Classes/Box2DTestBed/tests/wrecking_ball.cpp Classes/Box2DTestBed/tests/wrecking_ball.cpp
) )
endif() endif()
list(APPEND GAME_HEADER list(APPEND GAME_HEADER
Classes/Physics3DTest/Physics3DTest.h Classes/Physics3DTest/Physics3DTest.h
Classes/NavMeshTest/NavMeshTest.h Classes/NavMeshTest/NavMeshTest.h
@ -451,18 +450,17 @@ list(APPEND GAME_HEADER
Classes/PhysicsTest/PhysicsTest.h Classes/PhysicsTest/PhysicsTest.h
Classes/ChipmunkTest/ChipmunkTest.h Classes/ChipmunkTest/ChipmunkTest.h
) )
if(WINDOWS)
list(APPEND GAME_HEADER
Classes/ChipmunkTestBed/Demo/ChipmunkDemo.h
Classes/ChipmunkTestBed/ChipmunkTestBed.h
)
endif()
list(APPEND GAME_SOURCE list(APPEND GAME_SOURCE
Classes/PhysicsTest/PhysicsTest.cpp Classes/PhysicsTest/PhysicsTest.cpp
Classes/ChipmunkTest/ChipmunkTest.cpp Classes/ChipmunkTest/ChipmunkTest.cpp
) )
if(WINDOWS OR MACOSX OR LINUX) if(WINDOWS OR MACOSX OR LINUX)
list(APPEND GAME_HEADER
Classes/ChipmunkTestBed/demo/ChipmunkDemo.h
Classes/ChipmunkTestBed/ChipmunkTestBed.h
)
set (TESTBED_C_SORUCES set (TESTBED_C_SORUCES
Classes/ChipmunkTestBed/demo/Bench.c Classes/ChipmunkTestBed/demo/Bench.c
Classes/ChipmunkTestBed/demo/Chains.c Classes/ChipmunkTestBed/demo/Chains.c

2
tests/cpp-tests/Classes/Box2DTestBed/CCPhysicsDebugNodeBox2D.h
View File

@ -19,7 +19,7 @@
#ifndef __PHYSICSNODES_DEBUGNODE_BOX2D_H__ #ifndef __PHYSICSNODES_DEBUGNODE_BOX2D_H__
#define __PHYSICSNODES_DEBUGNODE_BOX2D_H__ #define __PHYSICSNODES_DEBUGNODE_BOX2D_H__
#include "Box2D/Box2D.h" #include "box2d/box2d.h"
#include "cocos2d.h" #include "cocos2d.h"
struct b2AABB; struct b2AABB;

2
tests/cpp-tests/Classes/Box2DTestBed/Test.h
View File

@ -19,7 +19,7 @@
#ifndef TEST_H #ifndef TEST_H
#define TEST_H #define TEST_H
#include "Box2D/Box2D.h" #include "box2d/box2d.h"
#include "CCPhysicsDebugNodeBox2D.h" #include "CCPhysicsDebugNodeBox2D.h"
#include <cstdlib> #include <cstdlib>

2
tests/cpp-tests/Classes/controller.cpp
View File

@ -56,7 +56,7 @@ public:
addTest("Box2D - Basic", []() { return new (std::nothrow) Box2DTests(); }); addTest("Box2D - Basic", []() { return new (std::nothrow) Box2DTests(); });
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) #if defined(CC_PLATFORM_PC)
addTest("Box2D - TestBed", []() { return new (std::nothrow) Box2DTestBedTests(); }); addTest("Box2D - TestBed", []() { return new (std::nothrow) Box2DTestBedTests(); });
#endif #endif
addTest("Chipmunk2D - Basic", []() { return new ChipmunkTests(); }); addTest("Chipmunk2D - Basic", []() { return new ChipmunkTests(); });