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

linux build ok

This commit is contained in:
minggo 2013-09-17 22:36:15 +08:00
parent ba820790ec
commit b1c8871208
3 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -12,7 +12,7 @@ box2d:
box2d-clean: box2d-clean:
$(MAKE) -C external/Box2D/proj.$(PLATFORM) clean $(MAKE) -C external/Box2D/proj.$(PLATFORM) clean
libextensions: cocosdenshion chipmunk box2d libextensions: chipmunk cocosdenshion box2d
$(MAKE) -C extensions/proj.$(PLATFORM) $(MAKE) -C extensions/proj.$(PLATFORM)
libextensions-clean: libextensions-clean:
$(MAKE) -C extensions/proj.$(PLATFORM) clean $(MAKE) -C extensions/proj.$(PLATFORM) clean
@ -47,7 +47,7 @@ simplegame: libcocos2dx
simplegame-clean: simplegame-clean:
$(MAKE) -C samples/Cpp/SimpleGame/proj.$(PLATFORM) clean $(MAKE) -C samples/Cpp/SimpleGame/proj.$(PLATFORM) clean
all: box2d cocosdenshion libextensions libcocos2dx lua hellocpp testcpp simplegame all: chipmunk cocosdenshion libextensions libcocos2dx lua hellocpp testcpp simplegame
clean: libcocos2dx-clean box2d-clean chipmunk-clean cocosdenshion-clean libextensions-clean lua-clean hellocpp-clean testcpp-clean simplegame-clean clean: libcocos2dx-clean box2d-clean chipmunk-clean cocosdenshion-clean libextensions-clean lua-clean hellocpp-clean testcpp-clean simplegame-clean
# Haven't yet got the lua projects working with emscripten # Haven't yet got the lua projects working with emscripten

38
cocos2dx/proj.linux/Makefile
View File

@ -1,17 +1,17 @@
TARGET = libcocos2d.so TARGET = libcocos2d.so
INCLUDES += \ INCLUDES += \
-I../platform/third_party/linux/libfreetype2 \ -I../platform/third_party/linux/libfreetype2 \
-I../platform/third_party/common/etc \ -I../platform/third_party/common/etc \
-I../platform/third_party/common/s3tc \ -I../platform/third_party/common/s3tc \
-I../platform/third_party/common/atitc \ -I../platform/third_party/common/atitc \
-I../../extensions \ -I../../extensions \
-I../../extensions/CCBReader \ -I../../extensions/CCBReader \
-I../../extensions/GUI/CCControlExtension \ -I../../extensions/GUI/CCControlExtension \
-I../../extensions/GUI/CCControlExtension \ -I../../extensions/GUI/CCControlExtension \
-I../../external/chipmunk/include/chipmunk \ -I../../external/chipmunk/include/chipmunk \
-I../../extensions/network \ -I../../extensions/network \
-I../../extensions/Components \ -I../../extensions/Components
SOURCES = ../actions/CCAction.cpp \ SOURCES = ../actions/CCAction.cpp \
../actions/CCActionCamera.cpp \ ../actions/CCActionCamera.cpp \
@ -81,9 +81,19 @@ SOURCES = ../actions/CCAction.cpp \
../particle_nodes/CCParticleSystem.cpp \ ../particle_nodes/CCParticleSystem.cpp \
../particle_nodes/CCParticleSystemQuad.cpp \ ../particle_nodes/CCParticleSystemQuad.cpp \
../particle_nodes/CCParticleBatchNode.cpp \ ../particle_nodes/CCParticleBatchNode.cpp \
../physics/Box2D/CCPhysicsContactInfo.cpp \
../physics/Box2D/CCPhysicsJointInfo.cpp \
../physics/Box2D/CCPhysicsShapeInfo.cpp \
../physics/Box2D/CCPhysicsBodyInfo.cpp \
../physics/Box2D/CCPhysicsWorldInfo.cpp \
../physics/chipmunk/CCPhysicsContactInfo.cpp \
../physics/chipmunk/CCPhysicsJointInfo.cpp \
../physics/chipmunk/CCPhysicsShapeInfo.cpp \
../physics/chipmunk/CCPhysicsBodyInfo.cpp \
../physics/chipmunk/CCPhysicsWorldInfo.cpp \
../physics/CCPhysicsBody.cpp \ ../physics/CCPhysicsBody.cpp \
../physics/CCPhysicsContactDelegate.cpp \ ../physics/CCPhysicsContact.cpp \
../physics/CCPhysicsFixture.cpp \ ../physics/CCPhysicsShape.cpp \
../physics/CCPhysicsJoint.cpp \ ../physics/CCPhysicsJoint.cpp \
../physics/CCPhysicsWorld.cpp \ ../physics/CCPhysicsWorld.cpp \
../platform/CCSAXParser.cpp \ ../platform/CCSAXParser.cpp \
@ -167,6 +177,8 @@ include cocos2dx.mk
CXXFLAGS += -Wno-sequence-point CXXFLAGS += -Wno-sequence-point
CCFLAGS += -Wno-sequence-point CCFLAGS += -Wno-sequence-point
STATICLIBS += $(LIB_DIR)/libchipmunk.a
TARGET := $(LIB_DIR)/$(TARGET) TARGET := $(LIB_DIR)/$(TARGET)
all: $(TARGET) all: $(TARGET)

3
cocos2dx/proj.linux/cocos2dx.mk
View File

@ -59,8 +59,7 @@ INCLUDES += \
-I$(COCOS_SRC)/platform/linux \ -I$(COCOS_SRC)/platform/linux \
-I$(COCOS_SRC)/platform/third_party/linux/libjpeg \ -I$(COCOS_SRC)/platform/third_party/linux/libjpeg \
-I$(COCOS_SRC)/platform/third_party/linux/libtiff \ -I$(COCOS_SRC)/platform/third_party/linux/libtiff \
-I$(COCOS_SRC)/platform/third_party/linux/libwebp \ -I$(COCOS_SRC)/platform/third_party/linux/libwebp
-I$(COCOS_ROOT/external/chipmunk/include/chipmunk
LBITS := $(shell getconf LONG_BIT) LBITS := $(shell getconf LONG_BIT)
ifeq ($(LBITS),64) ifeq ($(LBITS),64)