Merge branch 'newcode' into v3

super626 · super626 · commit cd060e01dc34 · 2014-11-19T11:54:36.000+08:00
diff --git a/tests/cpp-empty-test/.cocos-project.json b/tests/cpp-empty-test/.cocos-project.json
@@ -41,5 +41,6 @@
         "project_path": "../../build",
         "sln_file": "cocos2d-win8.1-universal.sln",
         "project_name": "HelloCpp.Windows"
-    }
+    },
+    "engine_dir": "../../"
 }
diff --git a/tests/cpp-tests/.cocos-project.json b/tests/cpp-tests/.cocos-project.json
@@ -41,5 +41,6 @@
         "project_path": "../../build",
         "sln_file": "cocos2d-win8.1-universal.sln",
         "project_name": "cpp-tests.Windows"
-    }
+    },
+    "engine_dir": "../../"
 }
diff --git a/tests/lua-empty-test/.cocos-project.json b/tests/lua-empty-test/.cocos-project.json
@@ -26,5 +26,6 @@
     },
     "android_cfg": {
         "project_path": "project/proj.android"
-    }
+    },
+    "engine_dir": "../../"
 }
diff --git a/tests/lua-tests/.cocos-project.json b/tests/lua-tests/.cocos-project.json
@@ -26,5 +26,6 @@
     },
     "android_cfg": {
         "project_path": "project/proj.android"
-    }
+    },
+    "engine_dir": "../../"
 }
diff --git a/tools/cocos2d-console b/tools/cocos2d-console
@@ -1 +1 @@
-Subproject commit d6d63b4d76b15fa6b21074e5b8cf575385e33d28
+Subproject commit 40e583566474a9e1e0ed1c7ab7a746f4fa354fa0

Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,6 @@`
`41`	`41`	`"project_path": "../../build",`
`42`	`42`	`"sln_file": "cocos2d-win8.1-universal.sln",`
`43`	`43`	`"project_name": "HelloCpp.Windows"`
`44`		`- }`
	`44`	`+ },`
	`45`	`+ "engine_dir": "../../"`
`45`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,6 @@`
`26`	`26`	`},`
`27`	`27`	`"android_cfg": {`
`28`	`28`	`"project_path": "project/proj.android"`
`29`		`- }`
	`29`	`+ },`
	`30`	`+ "engine_dir": "../../"`
`30`	`31`	`}`