Skip to content

Commit 89be819

Browse files
obiltschnigobiltschnig
committed
Visual Studio 2013 support
1 parent 47f6ba6 commit 89be819

57 files changed

Lines changed: 3643 additions & 2 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ProGen/src/ProGen.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// ProGen.cpp
33
//
4-
// $Id: //poco/1.4/ProGen/src/ProGen.cpp#7 $
4+
// $Id: //poco/1.4/ProGen/src/ProGen.cpp#9 $
55
//
66
// Visual Studio project file generator.
77
//
@@ -650,6 +650,7 @@ class ProGenApp: public Application
650650
setProperty(*pProps, "configuration.compiler.defines", projectConfig, "vc.project.compiler.defines", platform, config);
651651
setProperty(*pProps, "configuration.compiler.disableWarnings", projectConfig, "vc.project.compiler.disableWarnings", platform, config);
652652
setProperty(*pProps, "configuration.linker.dependencies", projectConfig, "vc.project.linker.dependencies", platform, config, " ");
653+
setProperty(*pProps, "configuration.linker.libraries", projectConfig, "vc.project.linker.libraries", platform, config);
653654
setProperty(*pProps, "configuration.postbuild", projectConfig, "vc.project.postbuild", platform, config);
654655
std::string libSuffix = this->config().getString("progen.libsuffix." + config, "");
655656
Poco::StringTokenizer rawDependencies(pProps->getString("configuration.linker.dependencies"), " ", Poco::StringTokenizer::TOK_TRIM | Poco::StringTokenizer::TOK_IGNORE_EMPTY);
@@ -774,7 +775,7 @@ class ProGenApp: public Application
774775
{
775776
if (projectFile.exists())
776777
{
777-
logger().information("Fixing Visual Studio 2012 project file: " + vcxprojPath.toString());
778+
logger().information("Fixing Visual Studio 2013 project file: " + vcxprojPath.toString());
778779
Poco::AutoPtr<Poco::XML::Document> pProjectDoc = domParser.parse(vcxprojPath.toString());
779780
fix2013Project(pProjectDoc, configSet, pTemplateProps->getString("project.platform", platform), *pProps, *pTemplateProps);
780781
writeProject(pProjectDoc, vcxprojPath.toString());

‎ProGen/templates/vs120/Win32/executable/debug_shared.template‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<Configuration
2+
Name="debug_shared|Win32"
3+
OutputDirectory="bin\"
4+
IntermediateDirectory="obj\$(ConfigurationName)"
5+
ConfigurationType="1"
6+
CharacterSet="2"
7+
>
8+
<Tool
9+
Name="VCPreBuildEventTool"
10+
/>
11+
<Tool
12+
Name="VCCustomBuildTool"
13+
/>
14+
<Tool
15+
Name="VCXMLDataGeneratorTool"
16+
/>
17+
<Tool
18+
Name="VCWebServiceProxyGeneratorTool"
19+
/>
20+
<Tool
21+
Name="VCMIDLTool"
22+
/>
23+
<Tool
24+
Name="VCCLCompilerTool"
25+
Optimization="0"
26+
AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
27+
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;${configuration.compiler.defines}"
28+
StringPooling="true"
29+
MinimalRebuild="true"
30+
BasicRuntimeChecks="3"
31+
RuntimeLibrary="3"
32+
BufferSecurityCheck="true"
33+
TreatWChar_tAsBuiltInType="true"
34+
ForceConformanceInForLoopScope="true"
35+
RuntimeTypeInfo="true"
36+
UsePrecompiledHeader="0"
37+
WarningLevel="3"
38+
Detect64BitPortabilityProblems="false"
39+
DebugInformationFormat="4"
40+
CompileAs="0"
41+
DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
42+
/>
43+
<Tool
44+
Name="VCManagedResourceCompilerTool"
45+
/>
46+
<Tool
47+
Name="VCResourceCompilerTool"
48+
/>
49+
<Tool
50+
Name="VCPreLinkEventTool"
51+
/>
52+
<Tool
53+
Name="VCLinkerTool"
54+
AdditionalDependencies="${configuration.linker.dependencies}"
55+
OutputFile="bin\${project.target}d.exe"
56+
LinkIncremental="2"
57+
AdditionalLibraryDirectories="${project.pocobase}\lib;${configuration.linker.libraries}"
58+
SuppressStartupBanner="true"
59+
GenerateDebugInformation="true"
60+
ProgramDatabaseFile="bin\${project.target}d.pdb"
61+
SubSystem="1"
62+
TargetMachine="1"
63+
/>
64+
<Tool
65+
Name="VCALinkTool"
66+
/>
67+
<Tool
68+
Name="VCManifestTool"
69+
/>
70+
<Tool
71+
Name="VCXDCMakeTool"
72+
/>
73+
<Tool
74+
Name="VCBscMakeTool"
75+
/>
76+
<Tool
77+
Name="VCFxCopTool"
78+
/>
79+
<Tool
80+
Name="VCAppVerifierTool"
81+
/>
82+
<Tool
83+
Name="VCPostBuildEventTool"
84+
/>
85+
</Configuration>

‎ProGen/templates/vs120/Win32/executable/debug_static_md.template‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<Configuration
2+
Name="debug_static_md|Win32"
3+
OutputDirectory="bin\static_md\"
4+
IntermediateDirectory="obj\$(ConfigurationName)"
5+
ConfigurationType="1"
6+
CharacterSet="2"
7+
>
8+
<Tool
9+
Name="VCPreBuildEventTool"
10+
/>
11+
<Tool
12+
Name="VCCustomBuildTool"
13+
/>
14+
<Tool
15+
Name="VCXMLDataGeneratorTool"
16+
/>
17+
<Tool
18+
Name="VCWebServiceProxyGeneratorTool"
19+
/>
20+
<Tool
21+
Name="VCMIDLTool"
22+
/>
23+
<Tool
24+
Name="VCCLCompilerTool"
25+
Optimization="4"
26+
AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
27+
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;${configuration.compiler.defines}"
28+
StringPooling="true"
29+
MinimalRebuild="true"
30+
BasicRuntimeChecks="3"
31+
RuntimeLibrary="3"
32+
BufferSecurityCheck="true"
33+
TreatWChar_tAsBuiltInType="true"
34+
ForceConformanceInForLoopScope="true"
35+
RuntimeTypeInfo="true"
36+
UsePrecompiledHeader="0"
37+
WarningLevel="3"
38+
Detect64BitPortabilityProblems="false"
39+
DebugInformationFormat="4"
40+
CompileAs="0"
41+
DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
42+
/>
43+
<Tool
44+
Name="VCManagedResourceCompilerTool"
45+
/>
46+
<Tool
47+
Name="VCResourceCompilerTool"
48+
/>
49+
<Tool
50+
Name="VCPreLinkEventTool"
51+
/>
52+
<Tool
53+
Name="VCLinkerTool"
54+
AdditionalDependencies="iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
55+
OutputFile="bin\static_md\${project.target}d.exe"
56+
LinkIncremental="2"
57+
AdditionalLibraryDirectories="${project.pocobase}\lib;${configuration.linker.libraries}"
58+
SuppressStartupBanner="true"
59+
GenerateDebugInformation="true"
60+
ProgramDatabaseFile="bin\static_md\${project.target}d.pdb"
61+
SubSystem="1"
62+
TargetMachine="1"
63+
/>
64+
<Tool
65+
Name="VCALinkTool"
66+
/>
67+
<Tool
68+
Name="VCManifestTool"
69+
/>
70+
<Tool
71+
Name="VCXDCMakeTool"
72+
/>
73+
<Tool
74+
Name="VCBscMakeTool"
75+
/>
76+
<Tool
77+
Name="VCFxCopTool"
78+
/>
79+
<Tool
80+
Name="VCAppVerifierTool"
81+
/>
82+
<Tool
83+
Name="VCPostBuildEventTool"
84+
/>
85+
</Configuration>

‎ProGen/templates/vs120/Win32/executable/debug_static_mt.template‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<Configuration
2+
Name="debug_static_mt|Win32"
3+
OutputDirectory="bin\static_mt\"
4+
IntermediateDirectory="obj\$(ConfigurationName)"
5+
ConfigurationType="1"
6+
CharacterSet="2"
7+
>
8+
<Tool
9+
Name="VCPreBuildEventTool"
10+
/>
11+
<Tool
12+
Name="VCCustomBuildTool"
13+
/>
14+
<Tool
15+
Name="VCXMLDataGeneratorTool"
16+
/>
17+
<Tool
18+
Name="VCWebServiceProxyGeneratorTool"
19+
/>
20+
<Tool
21+
Name="VCMIDLTool"
22+
/>
23+
<Tool
24+
Name="VCCLCompilerTool"
25+
Optimization="4"
26+
AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
27+
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;${configuration.compiler.defines}"
28+
StringPooling="true"
29+
MinimalRebuild="true"
30+
BasicRuntimeChecks="3"
31+
RuntimeLibrary="1"
32+
BufferSecurityCheck="true"
33+
TreatWChar_tAsBuiltInType="true"
34+
ForceConformanceInForLoopScope="true"
35+
RuntimeTypeInfo="true"
36+
UsePrecompiledHeader="0"
37+
WarningLevel="3"
38+
Detect64BitPortabilityProblems="false"
39+
DebugInformationFormat="4"
40+
CompileAs="0"
41+
DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
42+
/>
43+
<Tool
44+
Name="VCManagedResourceCompilerTool"
45+
/>
46+
<Tool
47+
Name="VCResourceCompilerTool"
48+
/>
49+
<Tool
50+
Name="VCPreLinkEventTool"
51+
/>
52+
<Tool
53+
Name="VCLinkerTool"
54+
AdditionalDependencies="iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
55+
OutputFile="bin\static_mt\${project.target}d.exe"
56+
LinkIncremental="2"
57+
AdditionalLibraryDirectories="${project.pocobase}\lib;${configuration.linker.libraries}"
58+
SuppressStartupBanner="true"
59+
GenerateDebugInformation="true"
60+
ProgramDatabaseFile="bin\static_mt\${project.target}d.pdb"
61+
SubSystem="1"
62+
TargetMachine="1"
63+
/>
64+
<Tool
65+
Name="VCALinkTool"
66+
/>
67+
<Tool
68+
Name="VCManifestTool"
69+
/>
70+
<Tool
71+
Name="VCXDCMakeTool"
72+
/>
73+
<Tool
74+
Name="VCBscMakeTool"
75+
/>
76+
<Tool
77+
Name="VCFxCopTool"
78+
/>
79+
<Tool
80+
Name="VCAppVerifierTool"
81+
/>
82+
<Tool
83+
Name="VCPostBuildEventTool"
84+
/>
85+
</Configuration>

‎ProGen/templates/vs120/Win32/executable/project.properties‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
project.suffix = _vs120.vcproj
2+
project.targetSuffix.debug_shared = d
3+
project.targetSuffix.release_shared =
4+
project.targetSuffix.debug_static_md = d
5+
project.targetSuffix.release_static_md =
6+
project.targetSuffix.debug_static_mt = d
7+
project.targetSuffix.release_static_mt =
8+
project.postprocess = upgrade2008to2013
9+
project.finalSuffix = _vs120.vcxproj

‎ProGen/templates/vs120/Win32/executable/project.template‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="Windows-1252"?>
2+
<VisualStudioProject
3+
ProjectType="Visual C++"
4+
Version="9.00"
5+
Name="${project.name}"
6+
ProjectGUID="{${project.guid}}"
7+
RootNamespace="${project.name}"
8+
Keyword="Win32Proj"
9+
TargetFrameworkVersion="0"
10+
>
11+
<Platforms>
12+
<Platform
13+
Name="Win32"
14+
/>
15+
</Platforms>
16+
<ToolFiles>
17+
</ToolFiles>
18+
<Configurations>
19+
</Configurations>
20+
<References>
21+
</References>
22+
<Files>
23+
</Files>
24+
<Globals>
25+
</Globals>
26+
</VisualStudioProject>

0 commit comments

Comments
 (0)