diff options
| -rw-r--r-- | tests/box2d/Benchmark.cpp | 1 | ||||
| -rw-r--r-- | tests/box2d/Makefile | 12 | ||||
| -rwxr-xr-x | tests/runner.py | 4 |
3 files changed, 7 insertions, 10 deletions
diff --git a/tests/box2d/Benchmark.cpp b/tests/box2d/Benchmark.cpp index 914c13a0..46dbbcb0 100644 --- a/tests/box2d/Benchmark.cpp +++ b/tests/box2d/Benchmark.cpp @@ -26,7 +26,6 @@ typedef struct { #include <math.h> #include "Box2D/Box2D.h" -#include "Bench2d.h" using namespace std; diff --git a/tests/box2d/Makefile b/tests/box2d/Makefile index 13f62093..d37adaa4 100644 --- a/tests/box2d/Makefile +++ b/tests/box2d/Makefile @@ -48,16 +48,14 @@ OBJECTS = \ $(O)/Dynamics/Joints/b2WheelJoint.o \ $(O)/Rope/b2Rope.o -all: box2d.o - -OPTS = -O2 +all: box2d.a %.o: %.cpp - $(CXX) -I. $< -o $@ $(OPTS) + $(CXX) -I. $< -o $@ -O2 -c -box2d.o: $(OBJECTS) - $(CXX) -o $@ $(OBJECTS) $(OPTS) +box2d.a: $(OBJECTS) + $(AR) rvs $@ $(OBJECTS) clean: - rm box2d.o + rm box2d.a diff --git a/tests/runner.py b/tests/runner.py index 74e78f61..eb6fb110 100755 --- a/tests/runner.py +++ b/tests/runner.py @@ -12379,8 +12379,8 @@ ok. def zzztest_yyy_box2d(self): # Called thus so it runs late in the alphabetical cycle... it is long src = open(path_from_root('tests', 'box2d', 'Benchmark.cpp'), 'r').read() - js_lib = self.get_library('box2d', [os.path.join('box2d.o')], configure=None) - js_lib = self.get_library('box2d_native', [os.path.join('box2d.o')], configure=None, native=True) + js_lib = self.get_library('box2d', [os.path.join('box2d.a')], configure=None) + native_lib = self.get_library('box2d_native', [os.path.join('box2d.a')], configure=None, native=True) emcc_args = js_lib + ['-I' + path_from_root('tests', 'box2d')] native_args = native_lib + ['-I' + path_from_root('tests', 'box2d')] |