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

Merge branch 'box2d' of https://github.com/minggo/cocos2d-x into box2d

This commit is contained in:
minggo 2011-11-30 15:32:49 +08:00
parent 4607ba8029 7194c25b63
commit 5391d17421
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Box2D/proj.linux/Makefile
View File

@ -51,7 +51,7 @@ OBJECTS = ../Collision/Shapes/b2ChainShape.o \
../Dynamics/b2Body.o \
../Dynamics/b2ContactManager.o \
../Dynamics/b2Fixture.o \
vDynamics/b2Island.o \
../Dynamics/b2Island.o \
../Dynamics/b2World.o \
../Dynamics/b2WorldCallbacks.o \
../Rope/b2Rope.o
@ -63,7 +63,7 @@ $(TARGET): $(OBJECTS)
$(AR) $(ARFLAGS) $(TARGET) $(OBJECTS)
####### Compile
%.o: %.o
%.o: %.cpp
$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@
%.o: %.c