[Scummvm-cvs-logs] scummvm master -> 9d36991e16e7e806bd376b10200e10bb76a03225

digitall dgturner at iee.org
Fri Aug 16 08:21:58 CEST 2013


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:
c67508b42d DEVTOOLS: Enable builtin theme in MSVC 2005 and 2008 in create_project.
9d36991e16 CREATE_PROJECT: Enable built-in theme for MSVC builds again.


Commit: c67508b42d4d19ff58e766e63a0f5796436b6c65
    https://github.com/scummvm/scummvm/commit/c67508b42d4d19ff58e766e63a0f5796436b6c65
Author: D G Turner (digitall at scummvm.org)
Date: 2013-08-15T23:20:51-07:00

Commit Message:
DEVTOOLS: Enable builtin theme in MSVC 2005 and 2008 in create_project.

This reverts commit b830f68bacd18f51f4dd912ce3b54ec47d63f31d as the
builtin theme is less than 64K again.

Changed paths:
    devtools/create_project/visualstudio.cpp



diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp
index 17e378f..23225d3 100644
--- a/devtools/create_project/visualstudio.cpp
+++ b/devtools/create_project/visualstudio.cpp
@@ -286,7 +286,7 @@ void VisualStudioProvider::createBuildProp(const BuildSetup &setup, bool isRelea
 	if (isRelease) {
 		properties << "\t\tEnableIntrinsicFunctions=\"true\"\n"
 		              "\t\tWholeProgramOptimization=\"true\"\n"
-		              "\t\tPreprocessorDefinitions=\"WIN32;DISABLE_GUI_BUILTIN_THEME;RELEASE_BUILD\"\n"
+		              "\t\tPreprocessorDefinitions=\"WIN32;RELEASE_BUILD\"\n"
 		              "\t\tStringPooling=\"true\"\n"
 		              "\t\tBufferSecurityCheck=\"false\"\n"
 		              "\t\tDebugInformationFormat=\"0\"\n"
@@ -300,7 +300,7 @@ void VisualStudioProvider::createBuildProp(const BuildSetup &setup, bool isRelea
 		              "\t\tSetChecksum=\"true\"\n";
 	} else {
 		properties << "\t\tOptimization=\"0\"\n"
-		              "\t\tPreprocessorDefinitions=\"WIN32;DISABLE_GUI_BUILTIN_THEME\"\n"
+		              "\t\tPreprocessorDefinitions=\"WIN32\"\n"
 		              "\t\tMinimalRebuild=\"true\"\n"
 		              "\t\tBasicRuntimeChecks=\"3\"\n"
 		              "\t\tRuntimeLibrary=\"1\"\n"


Commit: 9d36991e16e7e806bd376b10200e10bb76a03225
    https://github.com/scummvm/scummvm/commit/9d36991e16e7e806bd376b10200e10bb76a03225
Author: D G Turner (digitall at scummvm.org)
Date: 2013-08-15T23:22:26-07:00

Commit Message:
CREATE_PROJECT: Enable built-in theme for MSVC builds again.

This reverts commit d089658fb84f67652e9569bc03c76bcc65e7b881.

Changed paths:
    devtools/create_project/msbuild.cpp



diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index 23bf1bc..60aa35b 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -405,7 +405,7 @@ void MSBuildProvider::createBuildProp(const BuildSetup &setup, bool isRelease, b
 	if (isRelease) {
 		properties << "\t\t\t<IntrinsicFunctions>true</IntrinsicFunctions>\n"
 		              "\t\t\t<WholeProgramOptimization>true</WholeProgramOptimization>\n"
-		              "\t\t\t<PreprocessorDefinitions>WIN32;DISABLE_GUI_BUILTIN_THEME;RELEASE_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>\n"
+		              "\t\t\t<PreprocessorDefinitions>WIN32;RELEASE_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>\n"
 		              "\t\t\t<StringPooling>true</StringPooling>\n"
 		              "\t\t\t<BufferSecurityCheck>false</BufferSecurityCheck>\n"
 		              "\t\t\t<DebugInformationFormat></DebugInformationFormat>\n"
@@ -417,7 +417,7 @@ void MSBuildProvider::createBuildProp(const BuildSetup &setup, bool isRelease, b
 		              "\t\t\t<SetChecksum>true</SetChecksum>\n";
 	} else {
 		properties << "\t\t\t<Optimization>Disabled</Optimization>\n"
-		              "\t\t\t<PreprocessorDefinitions>WIN32;DISABLE_GUI_BUILTIN_THEME;%(PreprocessorDefinitions)</PreprocessorDefinitions>\n"
+		              "\t\t\t<PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>\n"
 		              "\t\t\t<MinimalRebuild>true</MinimalRebuild>\n"
 		              "\t\t\t<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\n"
 		              "\t\t\t<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\n"






More information about the Scummvm-git-logs mailing list