Skip to content

Commit 632dcee

Browse files
jordanruddjordanrudd
committed
Another iteration for adding VersionInfo to dll
1 parent d7a7074 commit 632dcee

File tree

8 files changed

+3
-54
lines changed

8 files changed

+3
-54
lines changed

‎Build/Common.Build.settings

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@
8989
<CompileAsManaged Condition="'$(CompileAsManagedDefault)' != ''">true</CompileAsManaged>
9090
<AdditionalOptions Condition="'$(DevToolsVersion)'=='140' And '$(ApplicationType)'!='Android'"> /d2notypeopt %(AdditionalOptions)</AdditionalOptions>
9191
</ClCompile>
92+
<ResourceCompile>
93+
<AdditionalOptions>/DTARGET_NAME="$(TARGETNAME)" %(AdditionalOptions)</AdditionalOptions>
94+
</ResourceCompile>
9295
</ItemDefinitionGroup>
9396

9497
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -99,12 +102,6 @@
99102
<Link>
100103
<GenerateDebugInformation>true</GenerateDebugInformation>
101104
</Link>
102-
<ResourceCompile>
103-
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
104-
<PreprocessorDefinitions Condition="'$(DevToolsVersion)'=='140'">TOOLSET_VERSION_140;%(PreprocessorDefinitions)</PreprocessorDefinitions>
105-
<PreprocessorDefinitions Condition="'$(DevToolsVersion)'=='120'">TOOLSET_VERSION_120;%(PreprocessorDefinitions)</PreprocessorDefinitions>
106-
<PreprocessorDefinitions Condition="'$(DevToolsVersion)'=='110'">TOOLSET_VERSION_110;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107-
</ResourceCompile>
108105
</ItemDefinitionGroup>
109106

110107
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -114,12 +111,6 @@
114111
<Link>
115112
<GenerateDebugInformation>true</GenerateDebugInformation>
116113
</Link>
117-
<ResourceCompile>
118-
<PreprocessorDefinitions>_WIN64;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
119-
<PreprocessorDefinitions Condition="'$(DevToolsVersion)'=='140'">TOOLSET_VERSION_140;%(PreprocessorDefinitions)</PreprocessorDefinitions>
120-
<PreprocessorDefinitions Condition="'$(DevToolsVersion)'=='120'">TOOLSET_VERSION_120;%(PreprocessorDefinitions)</PreprocessorDefinitions>
121-
<PreprocessorDefinitions Condition="'$(DevToolsVersion)'=='110'">TOOLSET_VERSION_110;%(PreprocessorDefinitions)</PreprocessorDefinitions>
122-
</ResourceCompile>
123114
</ItemDefinitionGroup>
124115

125116
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -129,12 +120,6 @@
129120
<Link>
130121
<GenerateDebugInformation>true</GenerateDebugInformation>
131122
</Link>
132-
<ResourceCompile>
133-
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)%(PreprocessorDefinitions)</PreprocessorDefinitions>
134-
<PreprocessorDefinitions Condition="'$(DevToolsVersion)'=='140'">TOOLSET_VERSION_140;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135-
<PreprocessorDefinitions Condition="'$(DevToolsVersion)'=='120'">TOOLSET_VERSION_120;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136-
<PreprocessorDefinitions Condition="'$(DevToolsVersion)'=='110'">TOOLSET_VERSION_110;%(PreprocessorDefinitions)</PreprocessorDefinitions>
137-
</ResourceCompile>
138123
</ItemDefinitionGroup>
139124

140125
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -144,12 +129,6 @@
144129
<Link>
145130
<GenerateDebugInformation>true</GenerateDebugInformation>
146131
</Link>
147-
<ResourceCompile>
148-
<PreprocessorDefinitions>_WIN64;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
149-
<PreprocessorDefinitions Condition="'$(DevToolsVersion)'=='140'">TOOLSET_VERSION_140;%(PreprocessorDefinitions)</PreprocessorDefinitions>
150-
<PreprocessorDefinitions Condition="'$(DevToolsVersion)'=='120'">TOOLSET_VERSION_120;%(PreprocessorDefinitions)</PreprocessorDefinitions>
151-
<PreprocessorDefinitions Condition="'$(DevToolsVersion)'=='110'">TOOLSET_VERSION_110;%(PreprocessorDefinitions)</PreprocessorDefinitions>
152-
</ResourceCompile>
153132
</ItemDefinitionGroup>
154133

155134
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -159,12 +138,6 @@
159138
<Link>
160139
<GenerateDebugInformation>true</GenerateDebugInformation>
161140
</Link>
162-
<ResourceCompile>
163-
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
164-
<PreprocessorDefinitions Condition="'$(DevToolsVersion)'=='140'">TOOLSET_VERSION_140;%(PreprocessorDefinitions)</PreprocessorDefinitions>
165-
<PreprocessorDefinitions Condition="'$(DevToolsVersion)'=='120'">TOOLSET_VERSION_120;%(PreprocessorDefinitions)</PreprocessorDefinitions>
166-
<PreprocessorDefinitions Condition="'$(DevToolsVersion)'=='110'">TOOLSET_VERSION_110;%(PreprocessorDefinitions)</PreprocessorDefinitions>
167-
</ResourceCompile>
168141
</ItemDefinitionGroup>
169142

170143
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -174,12 +147,6 @@
174147
<Link>
175148
<GenerateDebugInformation>true</GenerateDebugInformation>
176149
</Link>
177-
<ResourceCompile>
178-
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
179-
<PreprocessorDefinitions Condition="'$(DevToolsVersion)'=='140'">TOOLSET_VERSION_140;%(PreprocessorDefinitions)</PreprocessorDefinitions>
180-
<PreprocessorDefinitions Condition="'$(DevToolsVersion)'=='120'">TOOLSET_VERSION_120;%(PreprocessorDefinitions)</PreprocessorDefinitions>
181-
<PreprocessorDefinitions Condition="'$(DevToolsVersion)'=='110'">TOOLSET_VERSION_110;%(PreprocessorDefinitions)</PreprocessorDefinitions>
182-
</ResourceCompile>
183150
</ItemDefinitionGroup>
184151

185152
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Win32' ">

‎Release/src/build/vs12.winrt/casablanca120.winrt.vcxproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@
5252
<LinkTimeCodeGeneration Condition="'$(Configuration)'=='Release'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
5353
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
5454
</Link>
55-
<ResourceCompile>
56-
<PreprocessorDefinitions>TARGET_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
57-
</ResourceCompile>
5855
</ItemDefinitionGroup>
5956
<Import Project="..\common.vcxitems" Label="Shared" Condition="Exists('..\common.vcxitems')" />
6057
<Import Project="..\winrt.vcxitems" Label="Shared" Condition="Exists('..\winrt.vcxitems')" />

‎Release/src/build/vs12.wod/casablanca120.wod.vcxproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@
4545
<AdditionalDependencies>Winhttp.lib;httpapi.lib;bcrypt.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
4646
<LinkTimeCodeGeneration Condition="'$(Configuration)'=='Release'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
4747
</Link>
48-
<ResourceCompile>
49-
<PreprocessorDefinitions>TARGET_WOD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
50-
</ResourceCompile>
5148
</ItemDefinitionGroup>
5249
<Import Project="..\common.vcxitems" Label="Shared" Condition="Exists('..\common.vcxitems')" />
5350
<Import Project="..\win32.vcxitems" Label="Shared" Condition="Exists('..\win32.vcxitems')" />

‎Release/src/build/vs12.wp81/casablanca120.wp81.vcxproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@
5252
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
5353
<LinkTimeCodeGeneration Condition="'$(Configuration)'=='Release'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
5454
</Link>
55-
<ResourceCompile>
56-
<PreprocessorDefinitions>TARGET_WP81;%(PreprocessorDefinitions)</PreprocessorDefinitions>
57-
</ResourceCompile>
5855
</ItemDefinitionGroup>
5956
<Import Project="..\common.vcxitems" Label="Shared" Condition="Exists('..\common.vcxitems')" />
6057
<Import Project="..\winrt.vcxitems" Label="Shared" Condition="Exists('..\winrt.vcxitems')" />

‎Release/src/build/vs12.wps81/casablanca120.wps81.vcxproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@
5151
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
5252
<LinkTimeCodeGeneration Condition="'$(Configuration)'=='Release'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
5353
</Link>
54-
<ResourceCompile>
55-
<PreprocessorDefinitions>TARGET_WPS81;%(PreprocessorDefinitions)</PreprocessorDefinitions>
56-
</ResourceCompile>
5754
</ItemDefinitionGroup>
5855
<Import Project="..\common.vcxitems" Label="Shared" Condition="Exists('..\common.vcxitems')" />
5956
<Import Project="..\winrt.vcxitems" Label="Shared" Condition="Exists('..\winrt.vcxitems')" />

‎Release/src/build/vs12.xp/casablanca120.xp.vcxproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@
6767
<AdditionalDependencies>Winhttp.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
6868
<LinkTimeCodeGeneration Condition="'$(Configuration)'=='Release'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
6969
</Link>
70-
<ResourceCompile>
71-
<PreprocessorDefinitions>TARGET_XP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
72-
</ResourceCompile>
7370
</ItemDefinitionGroup>
7471
<Import Project="..\common.vcxitems" Label="Shared" Condition="Exists('..\common.vcxitems')" />
7572
<Import Project="..\win32.vcxitems" Label="Shared" Condition="Exists('..\win32.vcxitems')" />

‎Release/src/build/vs14.wod/casablanca140.wod.vcxproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@
4343
<AdditionalDependencies>Winhttp.lib;httpapi.lib;bcrypt.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
4444
<LinkTimeCodeGeneration Condition="'$(Configuration)'=='Release'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
4545
</Link>
46-
<ResourceCompile>
47-
<PreprocessorDefinitions>TARGET_WOD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
48-
</ResourceCompile>
4946
</ItemDefinitionGroup>
5047
<Import Project="..\common.vcxitems" Label="Shared" Condition="Exists('..\common.vcxitems')" />
5148
<Import Project="..\win32.vcxitems" Label="Shared" Condition="Exists('..\win32.vcxitems')" />

‎Release/src/utilities/Resource.rc

-1.72 KB
Binary file not shown.

0 commit comments

Comments
 (0)