[Scummvm-cvs-logs] scummvm master -> 66a74cf3f3767604ccdbf4c18c87cbe22cf4f6be

lordhoto lordhoto at gmail.com
Wed Mar 9 22:04:31 CET 2016


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

Summary:
4ee3623f5d SDL: Fix compilation with SDL2 and MSVC2015.
d2f3bc39b4 DEVTOOLS: Fix path separator in MSBuild's global props output.
d3dba1b086 DEVTOOLS: Do not specify SCUMMVM_LIBS include dir twice for MSBuild.
24558307c2 DEVTOOLS: Do not hardcode runtime libraries for MSVC2015.
1c2dc2f89d DEVTOOLS: Do not ignore libcmt.lib for MSBuild output.
46ef80963f DEVTOOLS: Enable Edit&Continue on x64 for MSVC2015+.
5510fdc7e4 DEVTOOLS: Use libpng16.lib for libpng for MSVC.
7127fadc96 DEVTOOLS: Use DLL runtime for MSBuild output.
66a74cf3f3 DEVTOOLS: Check configuration and architecture specific directories for MSBuild.


Commit: 4ee3623f5d29155de38cd0bf9426531d7a40b323
    https://github.com/scummvm/scummvm/commit/4ee3623f5d29155de38cd0bf9426531d7a40b323
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-03-09T22:03:47+01:00

Commit Message:
SDL: Fix compilation with SDL2 and MSVC2015.

Changed paths:
    backends/platform/sdl/sdl-sys.h



diff --git a/backends/platform/sdl/sdl-sys.h b/backends/platform/sdl/sdl-sys.h
index 2197552..551605a 100644
--- a/backends/platform/sdl/sdl-sys.h
+++ b/backends/platform/sdl/sdl-sys.h
@@ -52,6 +52,21 @@ typedef struct { int FAKE; } FAKE_FILE;
 #define strncasecmp FAKE_strncasecmp
 #endif
 
+#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_exit)
+#undef exit
+#define exit FAKE_exit
+#endif
+
+#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_abort)
+#undef abort
+#define abort FAKE_abort
+#endif
+
+#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_system)
+#undef system
+#define system FAKE_system
+#endif
+
 // HACK: SDL might include windows.h which defines its own ARRAYSIZE.
 // However, we want to use the version from common/util.h. Thus, we make sure
 // that we actually have this definition after including the SDL headers.
@@ -146,6 +161,21 @@ typedef struct { int FAKE; } FAKE_FILE;
 #define strncasecmp    FORBIDDEN_SYMBOL_REPLACEMENT
 #endif
 
+#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_exit)
+#undef exit
+#define exit(a) FORBIDDEN_SYMBOL_REPLACEMENT
+#endif
+
+#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_abort)
+#undef abort
+#define abort() FORBIDDEN_SYMBOL_REPLACEMENT
+#endif
+
+#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_system)
+#undef system
+#define system(a) FORBIDDEN_SYMBOL_REPLACEMENT
+#endif
+
 // SDL 2 has major API changes. We redefine constants which got renamed to
 // ease the transition. This is sometimes dangerous because the values changed
 // too!


Commit: d2f3bc39b46073ce3c4b76093919a45b340f9233
    https://github.com/scummvm/scummvm/commit/d2f3bc39b46073ce3c4b76093919a45b340f9233
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-03-09T22:03:47+01:00

Commit Message:
DEVTOOLS: Fix path separator in MSBuild's global props output.

Changed paths:
    devtools/create_project/msbuild.cpp



diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index a326bd7..7a43130 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -374,7 +374,7 @@ void MSBuildProvider::outputGlobalPropFile(const BuildSetup &setup, std::ofstrea
 	              "\t\t<LibraryPath>$(" << LIBS_DEFINE << ")\\lib\\" << (bits == 32 ? "x86" : "x64") << ";$(LibraryPath)</LibraryPath>\n"
 	              "\t\t<IncludePath>$(" << LIBS_DEFINE << ")\\include;$(" << LIBS_DEFINE << ")\\include\\SDL;$(IncludePath)</IncludePath>\n"
 	              "\t\t<OutDir>$(Configuration)" << bits << "\\</OutDir>\n"
-	              "\t\t<IntDir>$(Configuration)" << bits << "/$(ProjectName)\\</IntDir>\n"
+	              "\t\t<IntDir>$(Configuration)" << bits << "\\$(ProjectName)\\</IntDir>\n"
 	              "\t</PropertyGroup>\n"
 	              "\t<ItemDefinitionGroup>\n"
 	              "\t\t<ClCompile>\n"


Commit: d3dba1b08671d4fcd71c1d927a9a8c371b7f3119
    https://github.com/scummvm/scummvm/commit/d3dba1b08671d4fcd71c1d927a9a8c371b7f3119
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-03-09T22:03:47+01:00

Commit Message:
DEVTOOLS: Do not specify SCUMMVM_LIBS include dir twice for MSBuild.

Changed paths:
    devtools/create_project/msbuild.cpp



diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index 7a43130..46f0993 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -380,7 +380,7 @@ void MSBuildProvider::outputGlobalPropFile(const BuildSetup &setup, std::ofstrea
 	              "\t\t<ClCompile>\n"
 	              "\t\t\t<DisableLanguageExtensions>true</DisableLanguageExtensions>\n"
 	              "\t\t\t<DisableSpecificWarnings>" << warnings << ";%(DisableSpecificWarnings)</DisableSpecificWarnings>\n"
-	              "\t\t\t<AdditionalIncludeDirectories>$(" << LIBS_DEFINE << ")\\include;.;" << prefix << ";" << prefix << "\\engines;" << (setup.tests ? prefix + "\\test\\cxxtest;" : "") << "$(TargetDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\n"
+	              "\t\t\t<AdditionalIncludeDirectories>.;" << prefix << ";" << prefix << "\\engines;" << (setup.tests ? prefix + "\\test\\cxxtest;" : "") << "$(TargetDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\n"
 	              "\t\t\t<PreprocessorDefinitions>" << definesList << "%(PreprocessorDefinitions)</PreprocessorDefinitions>\n"
 	              "\t\t\t<ExceptionHandling>" << ((setup.devTools || setup.tests) ? "Sync" : "") << "</ExceptionHandling>\n";
 


Commit: 24558307c25d46b1b28e1e61e516c741701a17f0
    https://github.com/scummvm/scummvm/commit/24558307c25d46b1b28e1e61e516c741701a17f0
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-03-09T22:03:47+01:00

Commit Message:
DEVTOOLS: Do not hardcode runtime libraries for MSVC2015.

Changed paths:
    devtools/create_project/msbuild.cpp



diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index 46f0993..9668022 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -319,12 +319,6 @@ void MSBuildProvider::outputProjectSettings(std::ofstream &project, const std::s
 		for (StringList::const_iterator i = setup.libraries.begin(); i != setup.libraries.end(); ++i)
 			libraries += *i + ".lib;";
 
-		if (_version == 14) {
-			std::string debug = isRelease ? "" : "d";
-			libraries += "libvcruntime" + debug + ".lib;";
-			libraries += "libucrt" + debug + ".lib;";
-		}
-
 		project << "\t\t<Link>\n"
 		           "\t\t\t<OutputFile>$(OutDir)" << ((setup.devTools || setup.tests) ? name : setup.projectName) << ".exe</OutputFile>\n"
 		           "\t\t\t<AdditionalDependencies>" << libraries << "%(AdditionalDependencies)</AdditionalDependencies>\n"


Commit: 1c2dc2f89d181edfdffa001c7055df73d0ff8e77
    https://github.com/scummvm/scummvm/commit/1c2dc2f89d181edfdffa001c7055df73d0ff8e77
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-03-09T22:03:47+01:00

Commit Message:
DEVTOOLS: Do not ignore libcmt.lib for MSBuild output.

This hints at broken library builds and thus should not be set for us.

Changed paths:
    devtools/create_project/msbuild.cpp



diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index 9668022..8a33b6b 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -457,8 +457,7 @@ void MSBuildProvider::createBuildProp(const BuildSetup &setup, bool isRelease, b
 		properties << "\t\t</ClCompile>\n"
 		              "\t\t<Link>\n"
 		              "\t\t\t<GenerateDebugInformation>true</GenerateDebugInformation>\n"
-		              "\t\t\t<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\n"
-		              "\t\t\t<IgnoreSpecificDefaultLibraries>libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\n";
+		              "\t\t\t<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\n";
 	}
 
 	properties << "\t\t</Link>\n"


Commit: 46ef80963f36b46aa7fd494b56c266f5d27cd48d
    https://github.com/scummvm/scummvm/commit/46ef80963f36b46aa7fd494b56c266f5d27cd48d
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-03-09T22:03:47+01:00

Commit Message:
DEVTOOLS: Enable Edit&Continue on x64 for MSVC2015+.

Changed paths:
    devtools/create_project/msbuild.cpp



diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index 8a33b6b..191135f 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -444,9 +444,15 @@ void MSBuildProvider::createBuildProp(const BuildSetup &setup, bool isRelease, b
 		              "\t\t\t<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\n"
 		              "\t\t\t<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\n"
 		              "\t\t\t<FunctionLevelLinking>true</FunctionLevelLinking>\n"
-		              "\t\t\t<TreatWarningAsError>false</TreatWarningAsError>\n"
-		              "\t\t\t<DebugInformationFormat>" << (isWin32 ? "EditAndContinue" : "ProgramDatabase") << "</DebugInformationFormat>\n" // For x64 format Edit and continue is not supported, thus we default to Program Database
-		              "\t\t\t<EnablePREfast>" << (configuration == "Analysis" ? "true" : "false") << "</EnablePREfast>\n";
+		              "\t\t\t<TreatWarningAsError>false</TreatWarningAsError>\n";
+		if (_version >= 14) {
+			// Since MSVC 2015 Edit and Continue is support for x64 too.
+			properties << "\t\t\t<DebugInformationFormat>" << "EditAndContinue" << "</DebugInformationFormat>\n";
+		} else {
+			// Older MSVC versions did not support Edit and Continue for x64, thus we do not use it.
+			properties << "\t\t\t<DebugInformationFormat>" << (isWin32 ? "EditAndContinue" : "ProgramDatabase") << "</DebugInformationFormat>\n";
+		}
+		properties << "\t\t\t<EnablePREfast>" << (configuration == "Analysis" ? "true" : "false") << "</EnablePREfast>\n";
 
 		if (configuration == "LLVM") {
 			// FIXME The LLVM cl wrapper does not seem to work properly with the $(TargetDir) path so we hard-code the build folder until the issue is resolved


Commit: 5510fdc7e47d0b2a1bd734bef812cdf819a2a4c2
    https://github.com/scummvm/scummvm/commit/5510fdc7e47d0b2a1bd734bef812cdf819a2a4c2
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-03-09T22:03:47+01:00

Commit Message:
DEVTOOLS: Use libpng16.lib for libpng for MSVC.

Modern libpng releases use this library name as output for their MSVC project files.

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 65b7601..aa450f1 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -939,7 +939,7 @@ const Feature s_features[] = {
 	{       "mad",         "USE_MAD", "libmad",           true, "libmad (MP3) support" },
 	{    "vorbis",      "USE_VORBIS", "libvorbisfile_static libvorbis_static libogg_static", true, "Ogg Vorbis support" },
 	{      "flac",        "USE_FLAC", "libFLAC_static win_utf8_io_static",   true, "FLAC support" },
-	{       "png",         "USE_PNG", "libpng",           true, "libpng support" },
+	{       "png",         "USE_PNG", "libpng16",         true, "libpng support" },
 	{      "faad",        "USE_FAAD", "libfaad",          false, "AAC support" },
 	{     "mpeg2",       "USE_MPEG2", "libmpeg2",         false, "MPEG-2 support" },
 	{    "theora",   "USE_THEORADEC", "libtheora_static", true, "Theora decoding support" },


Commit: 7127fadc96821148ca0c64bb8f47e597e3daecec
    https://github.com/scummvm/scummvm/commit/7127fadc96821148ca0c64bb8f47e597e3daecec
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-03-09T22:03:47+01:00

Commit Message:
DEVTOOLS: Use DLL runtime for MSBuild output.

Changed paths:
    devtools/create_project/msbuild.cpp



diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index 191135f..5714e2e 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -431,7 +431,7 @@ void MSBuildProvider::createBuildProp(const BuildSetup &setup, bool isRelease, b
 		              "\t\t\t<StringPooling>true</StringPooling>\n"
 		              "\t\t\t<BufferSecurityCheck>false</BufferSecurityCheck>\n"
 		              "\t\t\t<DebugInformationFormat></DebugInformationFormat>\n"
-		              "\t\t\t<RuntimeLibrary>MultiThreaded</RuntimeLibrary>\n"
+		              "\t\t\t<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\n"
 		              "\t\t\t<EnablePREfast>" << (configuration == "Analysis" ? "true" : "false") << "</EnablePREfast>\n"
 		              "\t\t</ClCompile>\n"
 		              "\t\t<Link>\n"
@@ -442,7 +442,7 @@ void MSBuildProvider::createBuildProp(const BuildSetup &setup, bool isRelease, b
 		              "\t\t\t<PreprocessorDefinitions>WIN32;" << (configuration == "LLVM" ? "_CRT_SECURE_NO_WARNINGS;" : "") << "%(PreprocessorDefinitions)</PreprocessorDefinitions>\n"
 		              "\t\t\t<MinimalRebuild>true</MinimalRebuild>\n"
 		              "\t\t\t<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\n"
-		              "\t\t\t<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\n"
+		              "\t\t\t<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\n"
 		              "\t\t\t<FunctionLevelLinking>true</FunctionLevelLinking>\n"
 		              "\t\t\t<TreatWarningAsError>false</TreatWarningAsError>\n";
 		if (_version >= 14) {


Commit: 66a74cf3f3767604ccdbf4c18c87cbe22cf4f6be
    https://github.com/scummvm/scummvm/commit/66a74cf3f3767604ccdbf4c18c87cbe22cf4f6be
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-03-09T22:03:47+01:00

Commit Message:
DEVTOOLS: Check configuration and architecture specific directories for MSBuild.

Changed paths:
    devtools/create_project/msbuild.cpp



diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index 5714e2e..0f9819c 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -364,8 +364,8 @@ void MSBuildProvider::outputGlobalPropFile(const BuildSetup &setup, std::ofstrea
 	              "<Project DefaultTargets=\"Build\" ToolsVersion=\"" << (_version >= 12 ? _version : 4) << ".0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n"
 	              "\t<PropertyGroup>\n"
 	              "\t\t<_PropertySheetDisplayName>" << setup.projectDescription << "_Global</_PropertySheetDisplayName>\n"
-	              "\t\t<ExecutablePath>$(" << LIBS_DEFINE << ")\\bin;$(ExecutablePath)</ExecutablePath>\n"
-	              "\t\t<LibraryPath>$(" << LIBS_DEFINE << ")\\lib\\" << (bits == 32 ? "x86" : "x64") << ";$(LibraryPath)</LibraryPath>\n"
+	              "\t\t<ExecutablePath>$(" << LIBS_DEFINE << ")\\bin;$(" << LIBS_DEFINE << ")\\bin\\" << (bits == 32 ? "x86" : "x64") << ";$(ExecutablePath)</ExecutablePath>\n"
+	              "\t\t<LibraryPath>$(" << LIBS_DEFINE << ")\\lib\\" << (bits == 32 ? "x86" : "x64") << ";$(" << LIBS_DEFINE << ")\\lib\\" << (bits == 32 ? "x86" : "x64") << "\\$(Configuration);$(LibraryPath)</LibraryPath>\n"
 	              "\t\t<IncludePath>$(" << LIBS_DEFINE << ")\\include;$(" << LIBS_DEFINE << ")\\include\\SDL;$(IncludePath)</IncludePath>\n"
 	              "\t\t<OutDir>$(Configuration)" << bits << "\\</OutDir>\n"
 	              "\t\t<IntDir>$(Configuration)" << bits << "\\$(ProjectName)\\</IntDir>\n"






More information about the Scummvm-git-logs mailing list