Merge pull request #319 from GuoLunHao/v3

change the lib path for the prebuilt project searched

Author: pandamicro

plugins/plugin_generate/gen_templates.py

@@ -286,7 +286,7 @@ def modify_project_properties(self, cfg_path):
 
     def modify_build_cfg(self):
         build_cfg_files = self.config_json[TemplateGenerator.KEY_BUILD_CFG_FILES]
-        fw_version_path = "${COCOS_FRAMEWORKS}/%s" % self.fw_version
+        fw_version_path = "${COCOS_X_ROOT}/%s" % self.fw_version
 
         for build_cfg_file in build_cfg_files:
             cfg_full_path = os.path.join(self.engine_template_dir, build_cfg_file)

plugins/plugin_generate/modify_template.py

@@ -94,7 +94,7 @@ def modify_xcode_proj(self, proj_file_path):
             # pbx_proj.remove_group_by_name("JS Common")
 
         # add libraries search path
-        libs_path = "/Applications/Cocos/frameworks/%s/prebuilt" % self.version
+        libs_path = "/Applications/Cocos/Cocos2d-x/%s/prebuilt" % self.version
         ios_template_prebuilt_path = "%s/%s" % (libs_path, "ios")
         pbx_proj.add_library_search_paths(ios_template_prebuilt_path, target_name=ios_target_name, recursive=False)
         mac_template_prebuilt_path = "%s/%s" % (libs_path, "mac")
@@ -133,7 +133,7 @@ def modify_xcode_proj(self, proj_file_path):
         file_content = f.read()
         f.close()
 
-        install_path = "/Applications/Cocos/frameworks/%s" % self.version
+        install_path = "/Applications/Cocos/Cocos2d-x/%s" % self.version
         for old_engine_path in replace_engine_strs:
             file_content = file_content.replace(old_engine_path, install_path)
 
@@ -158,7 +158,7 @@ def modify_vs_proj(self, proj_file_path):
         # remove the project references
         vcx_proj.remove_proj_reference()
 
-        install_path = "$(COCOS_FRAMEWORKS)\\%s\\" % self.version
+        install_path = "$(COCOS_X_ROOT)\\%s\\" % self.version
 
         copy_libs_cmd = "if not exist \"$(OutDir)\" mkdir \"$(OutDir)\"\n" \
                         "xcopy /Y /Q \"$(EngineRoot)\\prebuilt\\win32\\*.*\" \"$(OutDir)\"\n"