[Scummvm-cvs-logs] scummvm master -> 801c27bd224f20370e152372941510964a85a6c3

[Littleboy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
801c27bd22 TOOLS: Exclude .o files from projects files generated by create_project


Commit: 801c27bd224f20370e152372941510964a85a6c3
    https://github.com/scummvm/scummvm/commit/801c27bd224f20370e152372941510964a85a6c3
Author: Littleboy (littleboy at users.sourceforge.net)
Date: 2011-04-27T14:00:55-07:00

Commit Message:
TOOLS: Exclude .o files from projects files generated by create_project

Changed paths:
    devtools/create_project/create_project.cpp



diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 148cd40..aa3960d 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -798,9 +798,10 @@ bool producesObjectFile(const std::string &fileName) {
  * Checks whether the give file in the specified directory is present in the given
  * file list.
  *
- * This function does as special match against the file list. It will not take file
- * extensions into consideration, when the extension of a file in the specified
- * directory is one of "h", "cpp", "c" or "asm".
+ * This function does as special match against the file list. Object files (.o) are
+ * excluded by default and it will not take file extensions into consideration,
+ * when the extension of a file in the specified directory is one of "h", "cpp",
+ * "c" or "asm".
  *
  * @param dir Parent directory of the file.
  * @param fileName File name to match.
@@ -830,7 +831,9 @@ bool isInList(const std::string &dir, const std::string &fileName, const StringL
 		}
 
 		const std::string lastPathComponent = getLastPathComponent(*i);
-		if (!producesObjectFile(fileName) && extensionName != "h") {
+		if (extensionName == "o") {
+			return false;
+		} else if (!producesObjectFile(fileName) && extensionName != "h") {
 			if (fileName == lastPathComponent)
 				return true;
 		} else {