[LOG] fix makefile

This commit is contained in:
pengfei tong 2012-08-02 13:19:40 +08:00
parent b93d0b5ebf
commit c82c8412a8
5 changed files with 118 additions and 122 deletions

View File

@ -173,9 +173,6 @@ OBJECTS = ../actions/CCAction.o \
../CCDrawingPrimitives.o \
../CCScheduler.o \
../cocos2d.o
# ../cocoa/CCData.o \
# ../layers_scenes_transitions_nodes/CCTransitionRadial.o \
# ../misc_nodes/CCRibbon.o \
LBITS := $(shell getconf LONG_BIT)
ifeq ($(LBITS),64)
@ -190,7 +187,6 @@ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \
$(STATICLIBS_DIR)/libpng.a \
$(STATICLIBS_DIR)/libjpeg.a \
$(STATICLIBS_DIR)/libtiff.a \
# $(STATICLIBS_DIR)/libGLEW.a \
SHAREDLIBS =
SHAREDLIBS += -lglfw -lGL

View File

@ -39,7 +39,7 @@ if ! test -d $DIR_GLEW170/glew-1.7.0/; then
cd -
fi
DIR_SPIDERMONKEY_LINUX=$COCOS2DX20_TRUNK/js/spidermonkey-linux
DIR_SPIDERMONKEY_LINUX=$COCOS2DX20_TRUNK/scripting/javascript/spidermonkey-linux
if ! test -d $DIR_SPIDERMONKEY_LINUX/js-1.8.5; then
cd $DIR_SPIDERMONKEY_LINUX
echo -e $TXTCOLOR_GREEN"building spidermonkey ..."$TXTCOLOR_DEFAULT;
@ -54,13 +54,13 @@ if ! test -d $OUTPUT_DEBUG; then
mkdir $OUTPUT_DEBUG -p
fi
make -C $COCOS2DX20_TRUNK/Box2D/proj.linux
make -C $COCOS2DX20_TRUNK/external/Box2D/proj.linux
check_make_result
cp $COCOS2DX20_TRUNK/Box2D/proj.linux/libbox2d.a $OUTPUT_DEBUG
cp $COCOS2DX20_TRUNK/external/Box2D/proj.linux/libbox2d.a $OUTPUT_DEBUG
make -C $COCOS2DX20_TRUNK/chipmunk/proj.linux
make -C $COCOS2DX20_TRUNK/external/chipmunk/proj.linux
check_make_result
cp $COCOS2DX20_TRUNK/chipmunk/proj.linux/libchipmunk.a $OUTPUT_DEBUG
cp $COCOS2DX20_TRUNK/external/chipmunk/proj.linux/libchipmunk.a $OUTPUT_DEBUG
make -C $COCOS2DX20_TRUNK/cocos2dx/proj.linux
check_make_result
@ -71,11 +71,11 @@ check_make_result
cp $COCOS2DX20_TRUNK/CocosDenshion/proj.linux/libcocosdenshion.so $OUTPUT_DEBUG
make -C $COCOS2DX20_TRUNK/tests/proj.linux
make -C $COCOS2DX20_TRUNK/samples/TestCpp/proj.linux
check_make_result
make -C $COCOS2DX20_TRUNK/HelloWorld/Linux
make -C $COCOS2DX20_TRUNK/samples/HelloCpp/Linux
check_make_result
make -C $COCOS2DX20_TRUNK/testjs/proj.linux
make -C $COCOS2DX20_TRUNK/samples/TestJavascript/proj.linux
check_make_result
#cd $COCOS2DX20_TRUNK/tests/proj.linux

View File

@ -5,7 +5,7 @@ CCFLAGS = -Wall -g -O2
CXXFLAGS = -Wall -g -O2
VISIBILITY =
COCOS2DX_PATH = ../../cocos2dx
COCOS2DX_PATH = ../../../cocos2dx
INCLUDES = -I../ \
-I../Classes \
-I$(COCOS2DX_PATH) \
@ -29,9 +29,9 @@ OBJECTS = ./main.o \
LBITS := $(shell getconf LONG_BIT)
ifeq ($(LBITS),64)
STATICLIBS_DIR = ../../cocos2dx/platform/third_party/linux/libraries/lib64
STATICLIBS_DIR = ../../../cocos2dx/platform/third_party/linux/libraries/lib64
else
STATICLIBS_DIR = ../../cocos2dx/platform/third_party/linux/libraries
STATICLIBS_DIR = ../../../cocos2dx/platform/third_party/linux/libraries
endif
STATICLIBS =
STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \
@ -43,10 +43,10 @@ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \
# $(STATICLIBS_DIR)/libGLEW.a \
SHAREDLIBS = -L../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../lib/linux/Debug/
SHAREDLIBS = -L../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../lib/linux/Debug/
SHAREDLIBS += -lglfw
SHAREDLIBS += -Wl,-rpath,../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib
SHAREDLIBS += -L../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -lGLEW
SHAREDLIBS += -Wl,-rpath,../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib
SHAREDLIBS += -L../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -lGLEW
#$(shell ../../build-linux.sh $<)
####### Build rules

View File

@ -6,7 +6,7 @@ CXXFLAGS = -Wall -g #-O2
VISIBILITY =
LIBS =
COCOS2DX_PATH = ../../cocos2dx
COCOS2DX_PATH = ../../../cocos2dx
INCLUDES = -I../ \
-I../../ \
-I../Classes \
@ -21,8 +21,8 @@ INCLUDES = -I../ \
-I$(COCOS2DX_PATH)/platform/third_party/linux/glew-1.7.0/glew-1.7.0/include/ \
-I$(COCOS2DX_PATH)/platform/third_party/linux/libxml2 \
-I$(COCOS2DX_PATH)/platform/third_party/linux/libjpeg \
-I../../CocosDenshion/include \
-I../../chipmunk/include/chipmunk \
-I../../../CocosDenshion/include \
-I../../../external/chipmunk/include/chipmunk \
@ -34,92 +34,92 @@ INCLUDES = -I../ \
DEFINES = -DLINUX
#DEFINES += -D__LP64__
OBJECTS = ../tests/AccelerometerTest/AccelerometerTest.o \
../tests/ActionManagerTest/ActionManagerTest.o \
../tests/ActionsEaseTest/ActionsEaseTest.o \
../tests/ActionsProgressTest/ActionsProgressTest.o \
../tests/ActionsTest/ActionsTest.o \
../tests/Box2DTest/Box2dTest.o \
../tests/Box2DTestBed/Box2dView.o \
../tests/Box2DTestBed/GLES-Render.o \
../tests/Box2DTestBed/Test.o \
../tests/Box2DTestBed/TestEntries.o \
../tests/BugsTest/Bug-1159.o \
../tests/BugsTest/Bug-1174.o \
../tests/BugsTest/Bug-350.o \
../tests/BugsTest/Bug-422.o \
../tests/BugsTest/Bug-458/Bug-458.o \
../tests/BugsTest/Bug-458/QuestionContainerSprite.o \
../tests/BugsTest/Bug-624.o \
../tests/BugsTest/Bug-886.o \
../tests/BugsTest/Bug-899.o \
../tests/BugsTest/Bug-914.o \
../tests/BugsTest/BugsTest.o \
../tests/ChipmunkAccelTouchTest/ChipmunkAccelTouchTest.o \
../tests/ClickAndMoveTest/ClickAndMoveTest.o \
../tests/CocosDenshionTest/CocosDenshionTest.o \
../tests/CurlTest/CurlTest.o \
../tests/CurrentLanguageTest/CurrentLanguageTest.o \
../tests/DrawPrimitivesTest/DrawPrimitivesTest.o \
../tests/EffectsAdvancedTest/EffectsAdvancedTest.o \
../tests/EffectsTest/EffectsTest.o \
../tests/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.o \
../tests/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.o \
../tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.o \
../tests/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.o \
../tests/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.o \
../tests/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.o \
../tests/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.o \
../tests/ExtensionsTest/ControlExtensionTest/CCControlScene.o \
../tests/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.o \
../tests/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.o \
../tests/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.o \
../tests/ExtensionsTest/ExtensionsTest.o \
../tests/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.o \
../tests/FontTest/FontTest.o \
../tests/IntervalTest/IntervalTest.o \
../tests/KeypadTest/KeypadTest.o \
../tests/LabelTest/LabelTest.o \
../tests/LayerTest/LayerTest.o \
../tests/MenuTest/MenuTest.o \
../tests/MotionStreakTest/MotionStreakTest.o \
../tests/MutiTouchTest/MutiTouchTest.o \
../tests/NodeTest/NodeTest.o \
../tests/ParallaxTest/ParallaxTest.o \
../tests/ParticleTest/ParticleTest.o \
../tests/PerformanceTest/PerformanceNodeChildrenTest.o \
../tests/PerformanceTest/PerformanceParticleTest.o \
../tests/PerformanceTest/PerformanceSpriteTest.o \
../tests/PerformanceTest/PerformanceTest.o \
../tests/PerformanceTest/PerformanceTextureTest.o \
../tests/PerformanceTest/PerformanceTouchesTest.o \
../tests/RenderTextureTest/RenderTextureTest.o \
../tests/RotateWorldTest/RotateWorldTest.o \
../tests/SceneTest/SceneTest.o \
../tests/SchedulerTest/SchedulerTest.o \
../tests/ShaderTest/ShaderTest.o \
../tests/SpriteTest/SpriteTest.o \
../tests/TextInputTest/TextInputTest.o \
../tests/Texture2dTest/Texture2dTest.o \
../tests/TextureCacheTest/TextureCacheTest.o \
../tests/TileMapTest/TileMapTest.o \
../tests/TouchesTest/Ball.o \
../tests/TouchesTest/Paddle.o \
../tests/TouchesTest/TouchesTest.o \
../tests/TransitionsTest/TransitionsTest.o \
../tests/UserDefaultTest/UserDefaultTest.o \
../tests/ZwoptexTest/ZwoptexTest.o \
../tests/controller.o \
../tests/testBasic.o \
OBJECTS = ../Classes/AccelerometerTest/AccelerometerTest.o \
../Classes/ActionManagerTest/ActionManagerTest.o \
../Classes/ActionsEaseTest/ActionsEaseTest.o \
../Classes/ActionsProgressTest/ActionsProgressTest.o \
../Classes/ActionsTest/ActionsTest.o \
../Classes/Box2DTest/Box2dTest.o \
../Classes/Box2DTestBed/Box2dView.o \
../Classes/Box2DTestBed/GLES-Render.o \
../Classes/Box2DTestBed/Test.o \
../Classes/Box2DTestBed/TestEntries.o \
../Classes/BugsTest/Bug-1159.o \
../Classes/BugsTest/Bug-1174.o \
../Classes/BugsTest/Bug-350.o \
../Classes/BugsTest/Bug-422.o \
../Classes/BugsTest/Bug-458/Bug-458.o \
../Classes/BugsTest/Bug-458/QuestionContainerSprite.o \
../Classes/BugsTest/Bug-624.o \
../Classes/BugsTest/Bug-886.o \
../Classes/BugsTest/Bug-899.o \
../Classes/BugsTest/Bug-914.o \
../Classes/BugsTest/BugsTest.o \
../Classes/ChipmunkAccelTouchTest/ChipmunkAccelTouchTest.o \
../Classes/ClickAndMoveTest/ClickAndMoveTest.o \
../Classes/CocosDenshionTest/CocosDenshionTest.o \
../Classes/CurlTest/CurlTest.o \
../Classes/CurrentLanguageTest/CurrentLanguageTest.o \
../Classes/DrawPrimitivesTest/DrawPrimitivesTest.o \
../Classes/EffectsAdvancedTest/EffectsAdvancedTest.o \
../Classes/EffectsTest/EffectsTest.o \
../Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.o \
../Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.o \
../Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.o \
../Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.o \
../Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.o \
../Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.o \
../Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.o \
../Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.o \
../Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.o \
../Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.o \
../Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.o \
../Classes/ExtensionsTest/ExtensionsTest.o \
../Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.o \
../Classes/FontTest/FontTest.o \
../Classes/IntervalTest/IntervalTest.o \
../Classes/KeypadTest/KeypadTest.o \
../Classes/LabelTest/LabelTest.o \
../Classes/LayerTest/LayerTest.o \
../Classes/MenuTest/MenuTest.o \
../Classes/MotionStreakTest/MotionStreakTest.o \
../Classes/MutiTouchTest/MutiTouchTest.o \
../Classes/NodeTest/NodeTest.o \
../Classes/ParallaxTest/ParallaxTest.o \
../Classes/ParticleTest/ParticleTest.o \
../Classes/PerformanceTest/PerformanceNodeChildrenTest.o \
../Classes/PerformanceTest/PerformanceParticleTest.o \
../Classes/PerformanceTest/PerformanceSpriteTest.o \
../Classes/PerformanceTest/PerformanceTest.o \
../Classes/PerformanceTest/PerformanceTextureTest.o \
../Classes/PerformanceTest/PerformanceTouchesTest.o \
../Classes/RenderTextureTest/RenderTextureTest.o \
../Classes/RotateWorldTest/RotateWorldTest.o \
../Classes/SceneTest/SceneTest.o \
../Classes/SchedulerTest/SchedulerTest.o \
../Classes/ShaderTest/ShaderTest.o \
../Classes/SpriteTest/SpriteTest.o \
../Classes/TextInputTest/TextInputTest.o \
../Classes/Texture2dTest/Texture2dTest.o \
../Classes/TextureCacheTest/TextureCacheTest.o \
../Classes/TileMapTest/TileMapTest.o \
../Classes/TouchesTest/Ball.o \
../Classes/TouchesTest/Paddle.o \
../Classes/TouchesTest/TouchesTest.o \
../Classes/TransitionsTest/TransitionsTest.o \
../Classes/UserDefaultTest/UserDefaultTest.o \
../Classes/ZwoptexTest/ZwoptexTest.o \
../Classes/controller.o \
../Classes/testBasic.o \
../AppDelegate.o \
./main.o
LBITS := $(shell getconf LONG_BIT)
ifeq ($(LBITS),64)
STATICLIBS_DIR = ../../cocos2dx/platform/third_party/linux/libraries/lib64
STATICLIBS_DIR = ../../../cocos2dx/platform/third_party/linux/libraries/lib64
else
STATICLIBS_DIR = ../../cocos2dx/platform/third_party/linux/libraries
STATICLIBS_DIR = ../../../cocos2dx/platform/third_party/linux/libraries
endif
STATICLIBS =
STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \
@ -128,25 +128,25 @@ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \
$(STATICLIBS_DIR)/libpng.a \
$(STATICLIBS_DIR)/libjpeg.a \
$(STATICLIBS_DIR)/libtiff.a \
../../lib/linux/Debug/libbox2d.a \
../../lib/linux/Debug/libchipmunk.a \
../../../lib/linux/Debug/libbox2d.a \
../../../lib/linux/Debug/libchipmunk.a \
# $(STATICLIBS_DIR)/libGLEW.a \
SHAREDLIBS =
ifeq ($(LBITS),64)
SHAREDLIBS_DIR = ../../CocosDenshion/third_party/fmod/lib64/api/lib
SHAREDLIBS_DIR = ../../../CocosDenshion/third_party/fmod/lib64/api/lib
SHAREDLIBS = -L$(SHAREDLIBS_DIR) -lfmodex64
else
SHAREDLIBS_DIR = ../../CocosDenshion/third_party/fmod/api/lib
SHAREDLIBS_DIR = ../../../CocosDenshion/third_party/fmod/api/lib
SHAREDLIBS = -L$(SHAREDLIBS_DIR) -lfmodex
endif
SHAREDLIBS += -lglfw -lGL
#SHAREDLIBS += -lGLEW
SHAREDLIBS += -L../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../lib/linux/Debug/
SHAREDLIBS += -L../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../lib/linux/Debug/
SHAREDLIBS += -Wl,-rpath,$(SHAREDLIBS_DIR)
SHAREDLIBS += -Wl,-rpath,../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib
SHAREDLIBS += -L../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -lGLEW
SHAREDLIBS += -Wl,-rpath,../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib
SHAREDLIBS += -L../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -lGLEW
SHAREDLIBS += -Wl,-rpath,$(STATICLIBS_DIR)
SHAREDLIBS += -L$(STATICLIBS_DIR) -lcurl

View File

@ -5,13 +5,13 @@ CCFLAGS = -Wall -g -O2
CXXFLAGS = -Wall -g -O2
VISIBILITY =
COCOS2DX_PATH = ../../cocos2dx
JSBINDING_PATH=../../js/JSBindings
COCOS2DX_PATH = ../../../cocos2dx
JSBINDING_PATH=../../../scripting/javascript/bindings
INCLUDES = -I../ \
-I../Classes \
-I../../js/JSBindings \
-I../../js/spidermonkey-linux/js-1.8.5/js/src \
-I../../CocosDenshion/include \
-I$(JSBINDING_PATH) \
-I$(JSBINDING_PATH)/../spidermonkey-linux/js-1.8.5/js/src \
-I../../../CocosDenshion/include \
-I$(COCOS2DX_PATH) \
-I$(COCOS2DX_PATH)/cocoa \
-I$(COCOS2DX_PATH)/include \
@ -33,34 +33,34 @@ OBJECTS = ./main.o \
$(JSBINDING_PATH)/cocos_denshion_generated.o \
$(JSBINDING_PATH)/ScriptingCore.o \
../Classes/AppDelegate.o \
../Classes/simple_class.o \
../Classes/simple_native_generated.o
# ../Classes/simple_class.o \
# ../Classes/simple_native_generated.o
LBITS := $(shell getconf LONG_BIT)
ifeq ($(LBITS),64)
STATICLIBS_DIR = ../../cocos2dx/platform/third_party/linux/libraries/lib64
STATICLIBS_DIR = ../../../cocos2dx/platform/third_party/linux/libraries/lib64
else
STATICLIBS_DIR = ../../cocos2dx/platform/third_party/linux/libraries
STATICLIBS_DIR = ../../../cocos2dx/platform/third_party/linux/libraries
endif
STATICLIBS =
STATICLIBS += $(STATICLIBS_DIR)/libtiff.a \
../../js/spidermonkey-linux/js-1.8.5/js/src/libjs_static.a \
$(JSBINDING_PATH)/../spidermonkey-linux/js-1.8.5/js/src/libjs_static.a \
ifeq ($(LBITS),64)
SHAREDLIBS_DIR = ../../CocosDenshion/third_party/fmod/lib64/api/lib
SHAREDLIBS_DIR = ../../../CocosDenshion/third_party/fmod/lib64/api/lib
SHAREDLIBS = -L$(SHAREDLIBS_DIR) -lfmodex64
else
SHAREDLIBS_DIR = ../../CocosDenshion/third_party/fmod/api/lib
SHAREDLIBS_DIR = ../../../CocosDenshion/third_party/fmod/api/lib
SHAREDLIBS = -L$(SHAREDLIBS_DIR) -lfmodex
endif
SHAREDLIBS += -L../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../lib/linux/Debug/
SHAREDLIBS += -L../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../lib/linux/Debug/
SHAREDLIBS += -lglfw
#SHAREDLIBS += -lGLEW
SHAREDLIBS += -Wl,-rpath,$(SHAREDLIBS_DIR)
SHAREDLIBS += -Wl,-rpath,../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib
SHAREDLIBS += -L../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -lGLEW
SHAREDLIBS += -Wl,-rpath,../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib
SHAREDLIBS += -L../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -lGLEW
#$(shell ../../build-linux.sh $<)
####### Build rules