diff --git a/CocosDenshion/proj.linux/.cproject b/CocosDenshion/proj.linux/.cproject index 8a0899731e..f1f3ad05f8 100755 --- a/CocosDenshion/proj.linux/.cproject +++ b/CocosDenshion/proj.linux/.cproject @@ -1,7 +1,5 @@ - - - + @@ -40,10 +38,7 @@ + @@ -77,8 +72,152 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -96,53 +235,51 @@ - - - - - - - - diff --git a/cocos2dx/proj.linux/.cproject b/cocos2dx/proj.linux/.cproject index 9e0dbc0a23..c258fffe38 100755 --- a/cocos2dx/proj.linux/.cproject +++ b/cocos2dx/proj.linux/.cproject @@ -1,7 +1,5 @@ - - - + @@ -48,6 +46,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/external/Box2D/proj.linux/.cproject b/external/Box2D/proj.linux/.cproject index 90ee353eae..ba1c68a473 100644 --- a/external/Box2D/proj.linux/.cproject +++ b/external/Box2D/proj.linux/.cproject @@ -1,7 +1,5 @@ - - - + @@ -12,7 +10,7 @@ - + @@ -44,7 +42,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/external/chipmunk/proj.linux/.cproject b/external/chipmunk/proj.linux/.cproject index c209c7a69a..18467c15ca 100644 --- a/external/chipmunk/proj.linux/.cproject +++ b/external/chipmunk/proj.linux/.cproject @@ -1,7 +1,5 @@ - - - + @@ -9,7 +7,7 @@ - + @@ -30,7 +28,7 @@ @@ -62,7 +60,7 @@ - + @@ -83,7 +81,7 @@ @@ -109,6 +107,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/make-all-linux-project.sh b/make-all-linux-project.sh index 5663b169ae..ef110ca59c 100755 --- a/make-all-linux-project.sh +++ b/make-all-linux-project.sh @@ -54,21 +54,25 @@ make -C $COCOS2DX20_TRUNK/external/Box2D/proj.linux clean make -C $COCOS2DX20_TRUNK/external/Box2D/proj.linux debug check_make_result cp $COCOS2DX20_TRUNK/external/Box2D/proj.linux/libbox2d.a $OUTPUT_DEBUG +rm $COCOS2DX20_TRUNK/external/Box2D/proj.linux/libbox2d.a make -C $COCOS2DX20_TRUNK/external/Box2D/proj.linux clean make -C $COCOS2DX20_TRUNK/external/Box2D/proj.linux release check_make_result cp $COCOS2DX20_TRUNK/external/Box2D/proj.linux/libbox2d.a $OUTPUT_RELEASE +rm $COCOS2DX20_TRUNK/external/Box2D/proj.linux/libbox2d.a make -C $COCOS2DX20_TRUNK/external/chipmunk/proj.linux clean make -C $COCOS2DX20_TRUNK/external/chipmunk/proj.linux debug check_make_result cp $COCOS2DX20_TRUNK/external/chipmunk/proj.linux/libchipmunk.a $OUTPUT_DEBUG +rm $COCOS2DX20_TRUNK/external/chipmunk/proj.linux/libchipmunk.a make -C $COCOS2DX20_TRUNK/external/chipmunk/proj.linux clean make -C $COCOS2DX20_TRUNK/external/chipmunk/proj.linux release check_make_result cp $COCOS2DX20_TRUNK/external/chipmunk/proj.linux/libchipmunk.a $OUTPUT_RELEASE +rm $COCOS2DX20_TRUNK/external/chipmunk/proj.linux/libchipmunk.a make -C $COCOS2DX20_TRUNK/cocos2dx/proj.linux clean make -C $COCOS2DX20_TRUNK/cocos2dx/proj.linux debug @@ -86,47 +90,51 @@ make -C $COCOS2DX20_TRUNK/CocosDenshion/proj.linux clean make -C $COCOS2DX20_TRUNK/CocosDenshion/proj.linux debug check_make_result cp $COCOS2DX20_TRUNK/CocosDenshion/proj.linux/libcocosdenshion.so $OUTPUT_DEBUG +rm $COCOS2DX20_TRUNK/CocosDenshion/proj.linux/libcocosdenshion.so make -C $COCOS2DX20_TRUNK/CocosDenshion/proj.linux clean make -C $COCOS2DX20_TRUNK/CocosDenshion/proj.linux release check_make_result cp $COCOS2DX20_TRUNK/CocosDenshion/proj.linux/libcocosdenshion.so $OUTPUT_RELEASE +rm $COCOS2DX20_TRUNK/CocosDenshion/proj.linux/libcocosdenshion.so make -C $COCOS2DX20_TRUNK/scripting/lua/proj.linux clean make -C $COCOS2DX20_TRUNK/scripting/lua/proj.linux debug check_make_result cp $COCOS2DX20_TRUNK/scripting/lua/proj.linux/liblua.so $OUTPUT_DEBUG +rm $COCOS2DX20_TRUNK/scripting/lua/proj.linux/liblua.so make -C $COCOS2DX20_TRUNK/scripting/lua/proj.linux clean make -C $COCOS2DX20_TRUNK/scripting/lua/proj.linux release check_make_result cp $COCOS2DX20_TRUNK/scripting/lua/proj.linux/liblua.so $OUTPUT_RELEASE +rm $COCOS2DX20_TRUNK/scripting/lua/proj.linux/liblua.so -make -C $COCOS2DX20_TRUNK/samples/TestCpp/proj.linux clean -make -C $COCOS2DX20_TRUNK/samples/TestCpp/proj.linux debug +make -C $COCOS2DX20_TRUNK/samples/Cpp/TestCpp/proj.linux clean +make -C $COCOS2DX20_TRUNK/samples/Cpp/TestCpp/proj.linux debug check_make_result -make -C $COCOS2DX20_TRUNK/samples/TestCpp/proj.linux clean -make -C $COCOS2DX20_TRUNK/samples/TestCpp/proj.linux release +make -C $COCOS2DX20_TRUNK/samples/Cpp/TestCpp/proj.linux clean +make -C $COCOS2DX20_TRUNK/samples/Cpp/TestCpp/proj.linux release check_make_result -make -C $COCOS2DX20_TRUNK/samples/HelloCpp/proj.linux clean -make -C $COCOS2DX20_TRUNK/samples/HelloCpp/proj.linux debug +make -C $COCOS2DX20_TRUNK/samples/Cpp/HelloCpp/proj.linux clean +make -C $COCOS2DX20_TRUNK/samples/Cpp/HelloCpp/proj.linux debug check_make_result -make -C $COCOS2DX20_TRUNK/samples/HelloCpp/proj.linux clean -make -C $COCOS2DX20_TRUNK/samples/HelloCpp/proj.linux release +make -C $COCOS2DX20_TRUNK/samples/Cpp/HelloCpp/proj.linux clean +make -C $COCOS2DX20_TRUNK/samples/Cpp/HelloCpp/proj.linux release check_make_result -make -C $COCOS2DX20_TRUNK/samples/TestLua/proj.linux clean -make -C $COCOS2DX20_TRUNK/samples/TestLua/proj.linux debug +make -C $COCOS2DX20_TRUNK/samples/Lua/TestLua/proj.linux clean +make -C $COCOS2DX20_TRUNK/samples/Lua/TestLua/proj.linux debug check_make_result -make -C $COCOS2DX20_TRUNK/samples/TestLua/proj.linux clean -make -C $COCOS2DX20_TRUNK/samples/TestLua/proj.linux release +make -C $COCOS2DX20_TRUNK/samples/Lua/TestLua/proj.linux clean +make -C $COCOS2DX20_TRUNK/samples/Lua/TestLua/proj.linux release check_make_result -make -C $COCOS2DX20_TRUNK/samples/HelloLua/proj.linux clean -make -C $COCOS2DX20_TRUNK/samples/HelloLua/proj.linux debug +make -C $COCOS2DX20_TRUNK/samples/Lua/HelloLua/proj.linux clean +make -C $COCOS2DX20_TRUNK/samples/Lua/HelloLua/proj.linux debug check_make_result -make -C $COCOS2DX20_TRUNK/samples/HelloLua/proj.linux clean -make -C $COCOS2DX20_TRUNK/samples/HelloLua/proj.linux release +make -C $COCOS2DX20_TRUNK/samples/Lua/HelloLua/proj.linux clean +make -C $COCOS2DX20_TRUNK/samples/Lua/HelloLua/proj.linux release check_make_result diff --git a/samples/Cpp/HelloCpp/proj.linux/.cproject b/samples/Cpp/HelloCpp/proj.linux/.cproject index edd02d726c..bdac8010df 100644 --- a/samples/Cpp/HelloCpp/proj.linux/.cproject +++ b/samples/Cpp/HelloCpp/proj.linux/.cproject @@ -1,7 +1,5 @@ - - - + @@ -22,7 +20,7 @@ - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + @@ -180,21 +355,29 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - diff --git a/samples/Cpp/TestCpp/proj.linux/.cproject b/samples/Cpp/TestCpp/proj.linux/.cproject index 4363a225f9..d7dcde4db6 100644 --- a/samples/Cpp/TestCpp/proj.linux/.cproject +++ b/samples/Cpp/TestCpp/proj.linux/.cproject @@ -59,7 +59,7 @@ - + - + @@ -123,15 +113,15 @@ - + - - + - + @@ -210,16 +191,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + @@ -228,10 +408,20 @@ + + + + + + + + + + + + + + + - - - - - diff --git a/samples/Cpp/TestCpp/proj.linux/.project b/samples/Cpp/TestCpp/proj.linux/.project index 1f0233c8e6..0153f98c58 100644 --- a/samples/Cpp/TestCpp/proj.linux/.project +++ b/samples/Cpp/TestCpp/proj.linux/.project @@ -97,7 +97,7 @@ extensions 2 - PARENT-3-PROJECT_LOC/extensions + PARENT-4-PROJECT_LOC/extensions diff --git a/samples/Lua/HelloLua/proj.linux/.cproject b/samples/Lua/HelloLua/proj.linux/.cproject index 5ccf22ef44..5652be01fa 100644 --- a/samples/Lua/HelloLua/proj.linux/.cproject +++ b/samples/Lua/HelloLua/proj.linux/.cproject @@ -1,7 +1,5 @@ - - - + @@ -65,7 +63,7 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -200,6 +392,9 @@ + + + diff --git a/samples/Lua/HelloLua/proj.linux/.project b/samples/Lua/HelloLua/proj.linux/.project index 31ca58204c..5b6df85717 100644 --- a/samples/Lua/HelloLua/proj.linux/.project +++ b/samples/Lua/HelloLua/proj.linux/.project @@ -36,7 +36,7 @@ cocos2dx_support 2 - PARENT-3-PROJECT_LOC/scripting/lua/cocos2dx_support + PARENT-4-PROJECT_LOC/scripting/lua/cocos2dx_support diff --git a/samples/Lua/TestLua/.gitignore b/samples/Lua/TestLua/.gitignore new file mode 100644 index 0000000000..c3b37a78af --- /dev/null +++ b/samples/Lua/TestLua/.gitignore @@ -0,0 +1,3 @@ +# resources get copied from TestCpp during build, ignore them +Resources/* +!Resources/luaScript diff --git a/samples/Lua/TestLua/proj.linux/.cproject b/samples/Lua/TestLua/proj.linux/.cproject index 54f06765ae..aa3e5a741c 100644 --- a/samples/Lua/TestLua/proj.linux/.cproject +++ b/samples/Lua/TestLua/proj.linux/.cproject @@ -1,7 +1,5 @@ - - - + @@ -16,7 +14,7 @@ - + @@ -64,7 +62,7 @@ - + - + @@ -161,7 +159,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - diff --git a/samples/Lua/TestLua/proj.linux/.project b/samples/Lua/TestLua/proj.linux/.project index 9b6bf99e14..ffdd86c367 100644 --- a/samples/Lua/TestLua/proj.linux/.project +++ b/samples/Lua/TestLua/proj.linux/.project @@ -38,7 +38,7 @@ cocos2dx_support 2 - PARENT-3-PROJECT_LOC/scripting/lua/cocos2dx_support + PARENT-4-PROJECT_LOC/scripting/lua/cocos2dx_support diff --git a/samples/Lua/TestLua/proj.linux/Makefile b/samples/Lua/TestLua/proj.linux/Makefile index 869ab67c99..f907800e70 100644 --- a/samples/Lua/TestLua/proj.linux/Makefile +++ b/samples/Lua/TestLua/proj.linux/Makefile @@ -86,7 +86,7 @@ release: $(TARGET) ####### Build rules $(TARGET): $(OBJECTS) mkdir -p $(BIN_DIR) - cp -R ../../../../samples/TestCpp/Resources ../../../../samples/TestLua/ + cp -R ../../../../samples/Cpp/TestCpp/Resources ../../../../samples/Lua/TestLua $(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(OBJECTS) -o $(BIN_DIR)/$(TARGET) $(SHAREDLIBS) $(STATICLIBS) ####### Compile diff --git a/scripting/lua/proj.linux/.cproject b/scripting/lua/proj.linux/.cproject index 5a09d65ece..038298d420 100644 --- a/scripting/lua/proj.linux/.cproject +++ b/scripting/lua/proj.linux/.cproject @@ -75,7 +75,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -97,7 +97,7 @@ @@ -106,7 +106,7 @@ @@ -131,6 +131,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +