diff --git a/cocos2dx/proj.linux/Makefile b/cocos2dx/proj.linux/Makefile index a7c7cfc630..14b2ca16a6 100644 --- a/cocos2dx/proj.linux/Makefile +++ b/cocos2dx/proj.linux/Makefile @@ -17,6 +17,7 @@ INCLUDES = -I.. \ -I../../extensions/CCBReader \ -I../../extensions/GUI/CCControlExtension \ -I../../extensions/GUI/CCControlExtension \ + -I../../external/chipmunk/include/chipmunk \ -I../../extensions/network \ -I../platform/linux/ \ -I../platform/third_party/linux/glew-1.7.0/glew-1.7.0/include/ \ @@ -79,6 +80,7 @@ OBJECTS = ../actions/CCAction.o \ ../menu_nodes/CCMenuItem.o \ ../misc_nodes/CCMotionStreak.o \ ../misc_nodes/CCProgressTimer.o \ +../misc_nodes/CCClippingNode.o \ ../misc_nodes/CCRenderTexture.o \ ../particle_nodes/CCParticleExamples.o \ ../particle_nodes/CCParticleSystem.o \ @@ -94,8 +96,6 @@ OBJECTS = ../actions/CCAction.o \ ../platform/linux/CCApplication.o \ ../platform/linux/CCEGLView.o \ ../platform/linux/CCImage.o \ -../physics_nodes/CCPhysicsDebugNode.o \ -../physics_nodes/CCPhysicsSprite.o \ ../script_support/CCScriptSupport.o \ ../sprite_nodes/CCAnimation.o \ ../sprite_nodes/CCAnimationCache.o \ @@ -135,47 +135,6 @@ OBJECTS = ../actions/CCAction.o \ ../shaders/ccGLStateCache.o \ ../shaders/CCShaderCache.o \ ../shaders/ccShaders.o \ -../../extensions/CCBReader/CCBFileLoader.o \ -../../extensions/CCBReader/CCMenuItemImageLoader.o \ -../../extensions/CCBReader/CCBReader.o \ -../../extensions/CCBReader/CCMenuItemLoader.o \ -../../extensions/CCBReader/CCControlButtonLoader.o \ -../../extensions/CCBReader/CCNodeLoader.o \ -../../extensions/CCBReader/CCControlLoader.o \ -../../extensions/CCBReader/CCNodeLoaderLibrary.o \ -../../extensions/CCBReader/CCLabelBMFontLoader.o \ -../../extensions/CCBReader/CCParticleSystemQuadLoader.o \ -../../extensions/CCBReader/CCLabelTTFLoader.o \ -../../extensions/CCBReader/CCScale9SpriteLoader.o \ -../../extensions/CCBReader/CCLayerColorLoader.o \ -../../extensions/CCBReader/CCScrollViewLoader.o \ -../../extensions/CCBReader/CCLayerGradientLoader.o \ -../../extensions/CCBReader/CCSpriteLoader.o \ -../../extensions/CCBReader/CCLayerLoader.o \ -../../extensions/CCBReader/CCBAnimationManager.o \ -../../extensions/CCBReader/CCBKeyframe.o \ -../../extensions/CCBReader/CCBSequence.o \ -../../extensions/CCBReader/CCBSequenceProperty.o \ -../../extensions/CCBReader/CCBValue.o \ -../../extensions/CCBReader/CCData.o \ -../../extensions/CCBReader/CCNode+CCBRelativePositioning.o \ -../../extensions/GUI/CCScrollView/CCScrollView.o \ -../../extensions/GUI/CCScrollView/CCSorting.o \ -../../extensions/GUI/CCScrollView/CCTableView.o \ -../../extensions/GUI/CCScrollView/CCTableViewCell.o \ -../../extensions/GUI/CCControlExtension/CCControlButton.o \ -../../extensions/GUI/CCControlExtension/CCControlColourPicker.o \ -../../extensions/GUI/CCControlExtension/CCControl.o \ -../../extensions/GUI/CCControlExtension/CCControlHuePicker.o \ -../../extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.o \ -../../extensions/GUI/CCControlExtension/CCControlSlider.o \ -../../extensions/GUI/CCControlExtension/CCControlSwitch.o \ -../../extensions/GUI/CCControlExtension/CCControlUtils.o \ -../../extensions/GUI/CCControlExtension/CCInvocation.o \ -../../extensions/GUI/CCControlExtension/CCScale9Sprite.o \ -../../extensions/GUI/CCControlExtension/CCControlPotentiometer.o \ -../../extensions/GUI/CCControlExtension/CCControlStepper.o \ -../../extensions/network/HttpClient.o \ ../kazmath/src/aabb.o \ ../kazmath/src/plane.o \ ../kazmath/src/vec2.o \ @@ -206,7 +165,7 @@ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \ $(STATICLIBS_DIR)/libxml2.a \ $(STATICLIBS_DIR)/libpng.a \ $(STATICLIBS_DIR)/libjpeg.a \ - $(STATICLIBS_DIR)/libtiff.a \ + $(STATICLIBS_DIR)/libtiff.a SHAREDLIBS = SHAREDLIBS += -lglfw -lGL -lcurl -lfontconfig @@ -215,12 +174,12 @@ SHAREDLIBS += -L../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/ debug: CCFLAGS += -g3 -O0 debug: CXXFLAGS += -g3 -O0 -debug: DEFINES += -DDEBUG +debug: DEFINES += -DDEBUG -DCC_ENABLE_CHIPMUNK_INTEGRATION debug: $(TARGET) release: CCFLAGS += -O3 release: CXXFLAGS += -O3 -release: DEFINES += -DNDEBUG +release: DEFINES += -DNDEBUG -DCC_ENABLE_CHIPMUNK_INTEGRATION release: $(TARGET) ####### Build rules diff --git a/extensions/proj.linux/Makefile b/extensions/proj.linux/Makefile new file mode 100644 index 0000000000..dd94ef86db --- /dev/null +++ b/extensions/proj.linux/Makefile @@ -0,0 +1,43 @@ +EXTENSIONS_OBJECTS = ../CCBReader/CCBFileLoader.o \ +../CCBReader/CCMenuItemImageLoader.o \ +../CCBReader/CCBReader.o \ +../CCBReader/CCMenuItemLoader.o \ +../CCBReader/CCControlButtonLoader.o \ +../CCBReader/CCNodeLoader.o \ +../CCBReader/CCControlLoader.o \ +../CCBReader/CCNodeLoaderLibrary.o \ +../CCBReader/CCLabelBMFontLoader.o \ +../CCBReader/CCParticleSystemQuadLoader.o \ +../CCBReader/CCLabelTTFLoader.o \ +../CCBReader/CCScale9SpriteLoader.o \ +../CCBReader/CCLayerColorLoader.o \ +../CCBReader/CCScrollViewLoader.o \ +../CCBReader/CCLayerGradientLoader.o \ +../CCBReader/CCSpriteLoader.o \ +../CCBReader/CCLayerLoader.o \ +../CCBReader/CCBAnimationManager.o \ +../CCBReader/CCBKeyframe.o \ +../CCBReader/CCBSequence.o \ +../CCBReader/CCBSequenceProperty.o \ +../CCBReader/CCBValue.o \ +../CCBReader/CCData.o \ +../CCBReader/CCNode+CCBRelativePositioning.o \ +../GUI/CCScrollView/CCScrollView.o \ +../GUI/CCScrollView/CCSorting.o \ +../GUI/CCScrollView/CCTableView.o \ +../GUI/CCScrollView/CCTableViewCell.o \ +../GUI/CCControlExtension/CCControlButton.o \ +../GUI/CCControlExtension/CCControlColourPicker.o \ +../GUI/CCControlExtension/CCControl.o \ +../GUI/CCControlExtension/CCControlHuePicker.o \ +../GUI/CCControlExtension/CCControlSaturationBrightnessPicker.o \ +../GUI/CCControlExtension/CCControlSlider.o \ +../GUI/CCControlExtension/CCControlSwitch.o \ +../GUI/CCControlExtension/CCControlUtils.o \ +../GUI/CCControlExtension/CCInvocation.o \ +../GUI/CCControlExtension/CCScale9Sprite.o \ +../GUI/CCControlExtension/CCControlPotentiometer.o \ +../GUI/CCControlExtension/CCControlStepper.o \ +../network/HttpClient.o \ +../physics_nodes/CCPhysicsDebugNode.o \ +../physics_nodes/CCPhysicsSprite.o diff --git a/samples/TestCpp/proj.linux/Makefile b/samples/TestCpp/proj.linux/Makefile index 8c9f053c83..502bf4630d 100644 --- a/samples/TestCpp/proj.linux/Makefile +++ b/samples/TestCpp/proj.linux/Makefile @@ -25,6 +25,7 @@ INCLUDES = -I../ \ -I../../../external/ \ -I../../../external/chipmunk/include/chipmunk \ + LBITS := $(shell getconf LONG_BIT) ifeq ($(LBITS),64) INCLUDES += -I$(COCOS2DX_PATH)/platform/third_party/linux/include64 @@ -60,8 +61,9 @@ OBJECTS = ../Classes/AccelerometerTest/AccelerometerTest.o \ ../Classes/BugsTest/Bug-899.o \ ../Classes/BugsTest/Bug-914.o \ ../Classes/BugsTest/BugsTest.o \ - ../Classes/ChipmunkAccelTouchTest/ChipmunkAccelTouchTest.o \ + ../Classes/ChipmunkTest/ChipmunkTest.o \ ../Classes/ClickAndMoveTest/ClickAndMoveTest.o \ + ../Classes/ClippingNodeTest/ClippingNodeTest.o \ ../Classes/CocosDenshionTest/CocosDenshionTest.o \ ../Classes/CurlTest/CurlTest.o \ ../Classes/CurrentLanguageTest/CurrentLanguageTest.o \ @@ -126,6 +128,9 @@ OBJECTS = ../Classes/AccelerometerTest/AccelerometerTest.o \ ../Classes/VisibleRect.o \ ./main.o +include $(COCOS2DX_PATH)/../extensions/proj.linux/Makefile +OBJECTS += $(addprefix ../../../extensions/proj.linux/, $(EXTENSIONS_OBJECTS)) + ifeq ($(LBITS),64) STATICLIBS_DIR = ../../../cocos2dx/platform/third_party/linux/libraries/lib64 else @@ -167,14 +172,14 @@ BIN_DIR = BIN_DIR_ROOT debug: SHAREDLIBS += -L../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../../../lib/linux/Debug debug: CCFLAGS += -g3 -O0 debug: CXXFLAGS += -g3 -O0 -debug: DEFINES += -DDEBUG +debug: DEFINES += -DDEBUG -DCC_ENABLE_CHIPMUNK_INTEGRATION debug: BIN_DIR = $(BIN_DIR_ROOT)/debug debug: $(TARGET) release: SHAREDLIBS += -L../../../lib/linux/Release -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../../../lib/linux/Release release: CCFLAGS += -O3 release: CXXFLAGS += -O3 -release: DEFINES += -DNDEBUG +release: DEFINES += -DNDEBUG -DCC_ENABLE_CHIPMUNK_INTEGRATION release: BIN_DIR = $(BIN_DIR_ROOT)/release release: $(TARGET)