[Scummvm-git-logs] scummvm master -> 8aa74967e9f4d316f9a4d5676a89280847afba26

[SupSuper]

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

Summary:
74f9e0dfc0 CREATE_PROJECT: Remove obsolete "browser.cpp" hack
8aa74967e9 CREATE_PROJECT: Add missing source files to CodeBlocks project


Commit: 74f9e0dfc0541597131c50230634d99488273d25
    https://github.com/scummvm/scummvm/commit/74f9e0dfc0541597131c50230634d99488273d25
Author: SupSuper (supsuper at gmail.com)
Date: 2019-07-01T01:57:26+01:00

Commit Message:
CREATE_PROJECT: Remove obsolete "browser.cpp" hack

browser.cpp no longer depends on the target platform since pull request #1414

Changed paths:
    devtools/create_project/xcode.cpp


diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index abfa3f0..8312a3c 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -133,12 +133,6 @@ bool shouldSkipFileForTarget(const std::string &fileID, const std::string &targe
 		}
 	}
 	else {
-		// Ugly hack: explicitly remove the browser.cpp file.
-		// The problem is that we have only one project for two different targets,
-		// and the parsing of the "mk" files added this file for both targets...
-		if (fileID.length() > 12 && fileID.substr(fileID.length() - 12) == "/browser.cpp") {
-			return true;
-		}
 		// macOS target: we skip all files with the "_ios" suffix
 		if (name.length() > 4 && name.substr(name.length() - 4) == "_ios") {
 			return true;


Commit: 8aa74967e9f4d316f9a4d5676a89280847afba26
    https://github.com/scummvm/scummvm/commit/8aa74967e9f4d316f9a4d5676a89280847afba26
Author: SupSuper (supsuper at gmail.com)
Date: 2019-07-01T01:59:00+01:00

Commit Message:
CREATE_PROJECT: Add missing source files to CodeBlocks project

Changed paths:
    devtools/create_project/codeblocks/create_project.cbp


diff --git a/devtools/create_project/codeblocks/create_project.cbp b/devtools/create_project/codeblocks/create_project.cbp
index 1b592d5..b015577 100644
--- a/devtools/create_project/codeblocks/create_project.cbp
+++ b/devtools/create_project/codeblocks/create_project.cbp
@@ -37,6 +37,8 @@
 			<Add option="-fexceptions" />
 		</Compiler>
 		<Unit filename="..\config.h" />
+		<Unit filename="..\cmake.cpp" />
+		<Unit filename="..\cmake.h" />
 		<Unit filename="..\codeblocks.cpp" />
 		<Unit filename="..\codeblocks.h" />
 		<Unit filename="..\create_project.cpp" />