Add Visual Studio 2013 support.

This commit is contained in:
Vaclav Slavik
2013-09-29 19:20:22 +02:00
parent 51bd1821a8
commit c8aaf9167a
5 changed files with 23 additions and 1 deletions

View File

@@ -5,3 +5,4 @@ submodule wxWidgets.bkl;
vs2008.generate-solution = false;
vs2010.generate-solution = false;
vs2012.generate-solution = false;
vs2013.generate-solution = false;

2
3rdparty/expat.bkl vendored
View File

@@ -4,11 +4,13 @@ srcdir expat/lib;
vs2008.generate-solution = false;
vs2010.generate-solution = false;
vs2012.generate-solution = false;
vs2013.generate-solution = false;
library WinSparkle_expat {
vs2008.projectfile = ../../expat$(SUFFIX).vcproj;
vs2010.projectfile = ../../expat$(SUFFIX).vcxproj;
vs2012.projectfile = ../../expat$(SUFFIX).vcxproj;
vs2013.projectfile = ../../expat$(SUFFIX).vcxproj;
defines += COMPILED_FROM_DSP;

View File

@@ -4,11 +4,13 @@ srcdir wxWidgets;
vs2008.generate-solution = false;
vs2010.generate-solution = false;
vs2012.generate-solution = false;
vs2013.generate-solution = false;
library WinSparkle_wx {
vs2008.projectfile = ../wx$(SUFFIX).vcproj;
vs2010.projectfile = ../wx$(SUFFIX).vcxproj;
vs2012.projectfile = ../wx$(SUFFIX).vcxproj;
vs2013.projectfile = ../wx$(SUFFIX).vcxproj;
defines += WXBUILDING;
includedirs += ../wxWidgets_setup_h include;

View File

@@ -1,5 +1,5 @@
toolsets = vs2008 vs2010 vs2012;
toolsets = vs2008 vs2010 vs2012 vs2013;
if ( $toolset == vs2008 )
SUFFIX = "";
@@ -7,10 +7,13 @@ if ( $toolset == vs2010 )
SUFFIX = "-2010";
if ( $toolset == vs2012 )
SUFFIX = "-2012";
if ( $toolset == vs2013 )
SUFFIX = "-2013";
vs2008.solutionfile = WinSparkle$(SUFFIX).sln;
vs2010.solutionfile = WinSparkle$(SUFFIX).sln;
vs2012.solutionfile = WinSparkle$(SUFFIX).sln;
vs2013.solutionfile = WinSparkle$(SUFFIX).sln;
// Common settings:
win32-crt-linkage = static;
@@ -21,6 +24,7 @@ defines += _CRT_SECURE_NO_WARNINGS;
// Build binaries compatible with Windows XP (SP3) -- it's still useful for
// installer stuff like WinSparkle.dll
vs2012.option.Configuration.PlatformToolset = v110_xp;
vs2013.option.Configuration.PlatformToolset = v120_xp;
if ( $(config) == Release ) {
vs2008.option.VCCLCompilerTool.Optimization = 1;
@@ -48,6 +52,16 @@ if ( $(config) == Release ) {
vs2012.option.Link.OptimizeReferences = true;
vs2012.option.Link.EnableCOMDATFolding = true;
vs2012.option.Link.LinkTimeCodeGeneration = UseLinkTimeCodeGeneration;
vs2013.option.Configuration.WholeProgramOptimization = true;
vs2013.option.ClCompile.Optimization = MinSpace;
vs2013.option.ClCompile.FavorSizeOrSpeed = Size;
vs2013.option.ClCompile.WholeProgramOptimization = true;
vs2013.option.ClCompile.StringPooling = true;
vs2013.option.ClCompile.FunctionLevelLinking = true;
vs2013.option.Link.OptimizeReferences = true;
vs2013.option.Link.EnableCOMDATFolding = true;
vs2013.option.Link.LinkTimeCodeGeneration = UseLinkTimeCodeGeneration;
}
// 3rd party library dependencies:
@@ -58,6 +72,7 @@ shared-library WinSparkle {
vs2008.projectfile = $(id)$(SUFFIX).vcproj;
vs2010.projectfile = $(id)$(SUFFIX).vcxproj;
vs2012.projectfile = $(id)$(SUFFIX).vcxproj;
vs2013.projectfile = $(id)$(SUFFIX).vcxproj;
defines += XML_STATIC;
includedirs += 3rdparty/expat/lib;

View File

@@ -2,6 +2,7 @@
vs2008.solutionfile = examples$(SUFFIX).sln;
vs2010.solutionfile = examples$(SUFFIX).sln;
vs2012.solutionfile = examples$(SUFFIX).sln;
vs2013.solutionfile = examples$(SUFFIX).sln;
includedirs += ../include;
@@ -11,6 +12,7 @@ program example_psdk {
vs2008.projectfile = $(id)$(SUFFIX).vcproj;
vs2010.projectfile = $(id)$(SUFFIX).vcxproj;
vs2012.projectfile = $(id)$(SUFFIX).vcxproj;
vs2013.projectfile = $(id)$(SUFFIX).vcxproj;
win32-subsystem = windows;