Merge pull request cocos2d#3993 from minggo/iss2905-adjust_folder

Samples build ok on linux

Author: minggo

build/Makefile

@@ -3,68 +3,89 @@ PLATFORM ?= linux
 all:
 
 chipmunk:
-	$(MAKE) -C external/chipmunk/proj.$(PLATFORM)
+	$(MAKE) -C ../external/chipmunk/proj.$(PLATFORM)
 chipmunk-clean:
-	$(MAKE) -C external/chipmunk/proj.$(PLATFORM) clean
+	$(MAKE) -C ../external/chipmunk/proj.$(PLATFORM) clean
 
 box2d:
-	$(MAKE) -C external/Box2D/proj.$(PLATFORM)
+	$(MAKE) -C ../external/Box2D/proj.$(PLATFORM)
 box2d-clean:
-	$(MAKE) -C external/Box2D/proj.$(PLATFORM) clean
+	$(MAKE) -C ../external/Box2D/proj.$(PLATFORM) clean
 
-libextensions: chipmunk cocosdenshion  box2d
-	$(MAKE) -C extensions/proj.$(PLATFORM)
-libextensions-clean:
-	$(MAKE) -C extensions/proj.$(PLATFORM) clean
+cocos2dx: chipmunk
+	$(MAKE) -C ../cocos/2d
+cocos2dx-clean:
+	$(MAKE) -C ../cocos/2d clean
 
-libcocos2dx: libextensions
-	$(MAKE) -C cocos2dx/proj.$(PLATFORM)
-libcocos2dx-clean:
-	$(MAKE) -C cocos2dx/proj.$(PLATFORM) clean
+audio: cocos2dx
+	$(MAKE) -C ../cocos/audio/proj.$(PLATFORM)
+audio-clean:
+	$(MAKE) -C ../cocos/audio/proj.$(PLATFORM) clean
 
-cocosdenshion: libcocos2dx
-	$(MAKE) -C audio/proj.$(PLATFORM)
-cocosdenshion-clean:
-	$(MAKE) -C audio/proj.$(PLATFORM) clean
+gui:
+	$(MAKE) -C ../cocos/gui
+gui-clean:
+	$(MAKE) -C ../cocos/gui clean
 
-lua: libextensions
-	$(MAKE) -C scripting/lua/proj.$(PLATFORM)
+network: cocos2dx
+	$(MAKE) -C ../cocos/network
+network-clean:
+	$(MAKE) -C ../cocos/network clean
+
+cocosbuilder:
+	$(MAKE) -C ../cocos/editor-support/cocosbuilder
+cocosbuilder-clean:
+	$(MAKE) -C ../cocos/editor-support/cocosbuilder clean
+
+spine:
+	$(MAKE) -C ../cocos/editor-support/spine
+spine-clean:
+	$(MAKE) -C ../cocos/editor-support/spine clean
+
+cocostudio:
+	$(MAKE) -C ../cocos/editor-support/cocostudio
+cocostudio-clean:
+	$(MAKE) -C ../cocos/editor-support/cocostudio clean
+
+extensions: chipmunk audio  box2d
+	$(MAKE) -C ../extensions/proj.$(PLATFORM)
+extensions-clean:
+	$(MAKE) -C ../extensions/proj.$(PLATFORM) clean
+
+lua: extensions cocosbuilder cocostudio
+	$(MAKE) -C ../cocos/scripting/lua/bindings
 lua-clean:
-	$(MAKE) -C scripting/lua/proj.$(PLATFORM) clean
+	$(MAKE) -C ../cocos/scripting/lua/bindings clean
 
-hellocpp: libcocos2dx
-	$(MAKE) -C samples/Cpp/HelloCpp/proj.$(PLATFORM)
+hellocpp: cocos2dx
+	$(MAKE) -C ../samples/Cpp/HelloCpp/proj.$(PLATFORM)
 hellocpp-clean:
-	$(MAKE) -C samples/Cpp/HelloCpp/proj.$(PLATFORM) clean
+	$(MAKE) -C ../samples/Cpp/HelloCpp/proj.$(PLATFORM) clean
 
-testcpp: libcocos2dx libextensions
-	$(MAKE) -C samples/Cpp/TestCpp/proj.$(PLATFORM)
+testcpp: cocos2dx audio extensions cocostudio gui cocosbuilder spine network
+	$(MAKE) -C ../samples/Cpp/TestCpp/proj.$(PLATFORM)
 testcpp-clean:
-	$(MAKE) -C samples/Cpp/TestCpp/proj.$(PLATFORM) clean
+	$(MAKE) -C ../samples/Cpp/TestCpp/proj.$(PLATFORM) clean
 
-simplegame: libcocos2dx
-	$(MAKE) -C samples/Cpp/SimpleGame/proj.$(PLATFORM)
+simplegame: cocos2dx audio
+	$(MAKE) -C ../samples/Cpp/SimpleGame/proj.$(PLATFORM)
 simplegame-clean:
-	$(MAKE) -C samples/Cpp/SimpleGame/proj.$(PLATFORM) clean
-
-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
+	$(MAKE) -C ../samples/Cpp/SimpleGame/proj.$(PLATFORM) clean
 
-# Haven't yet got the lua projects working with emscripten
-ifneq ($(PLATFORM),emscripten)
+all: chipmunk audio extensions cocos2dx lua hellocpp testcpp simplegame
+clean: cocos2dx-clean box2d-clean chipmunk-clean audio-clean extensions-clean lua-clean hellocpp-clean testcpp-clean simplegame-clean
 
-hellolua: libcocos2dx lua
-	$(MAKE) -C samples/Lua/HelloLua/proj.$(PLATFORM)
+hellolua: cocos2dx lua
+	$(MAKE) -C ../samples/Lua/HelloLua/proj.$(PLATFORM)
 hellolua-clean:
-	$(MAKE) -C samples/Lua/HelloLua/proj.$(PLATFORM) clean
+	$(MAKE) -C ../samples/Lua/HelloLua/proj.$(PLATFORM) clean
 
-testlua: libcocos2dx lua
-	$(MAKE) -C samples/Lua/TestLua/proj.$(PLATFORM)
+testlua: cocos2dx lua
+	$(MAKE) -C ../samples/Lua/TestLua/proj.$(PLATFORM)
 testlua-clean:
-	$(MAKE) -C samples/Lua/TestLua/proj.$(PLATFORM) clean
+	$(MAKE) -C ../samples/Lua/TestLua/proj.$(PLATFORM) clean
 
 all: hellolua testlua
 clean: hellolua-clean testlua-clean
-endif
 
 .PHONY: all clean

build/install-deps-linux.sh

@@ -32,5 +32,5 @@ if [ -n "$MISSING" ]; then
 fi
 
 # install glfw
-tools/travis-scripts/install_glfw.sh
+../tools/travis-scripts/install_glfw.sh