Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in tip

fogcreek shellext: pass extra flags on to C/C++ and resource compilers

Changeset 5fb8cb474d54…

Parent c1caaf854310…

by David Golub

Changes to 2 files · Browse files at 5fb8cb474d54 Showing diff from parent c1caaf854310 Diff from another changeset...

Change 1 of 8 Show Entire File win32/​shellext/​THgShell.vcxproj Stacked
 
89
90
91
 
92
93
94
 
102
103
104
 
 
 
105
106
107
 
110
111
112
 
113
114
115
 
123
124
125
 
 
 
126
127
128
 
133
134
135
 
136
137
138
 
148
149
150
 
 
 
151
152
153
 
158
159
160
 
161
162
163
 
174
175
176
 
 
 
177
178
179
 
89
90
91
92
93
94
95
 
103
104
105
106
107
108
109
110
111
 
114
115
116
117
118
119
120
 
128
129
130
131
132
133
134
135
136
 
141
142
143
144
145
146
147
 
157
158
159
160
161
162
163
164
165
 
170
171
172
173
174
175
176
 
187
188
189
190
191
192
193
194
195
@@ -89,6 +89,7 @@
  <WarningLevel>Level3</WarningLevel>   <Optimization>Disabled</Optimization>   <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;THGSHELL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions>$(THG_EXTRA_CPPFLAGS) %(AdditionalOptions)</AdditionalOptions>   </ClCompile>   <Link>   <SubSystem>Windows</SubSystem> @@ -102,6 +103,9 @@
  <CustomBuildStep>   <Outputs>parentid.h;%(Outputs)</Outputs>   </CustomBuildStep> + <ResourceCompile> + <AdditionalOptions>$(THG_EXTRA_RCFLAGS) %(AdditionalOptions)</AdditionalOptions> + </ResourceCompile>   </ItemDefinitionGroup>   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">   <ClCompile> @@ -110,6 +114,7 @@
  <WarningLevel>Level3</WarningLevel>   <Optimization>Disabled</Optimization>   <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;THGSHELL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions>$(THG_EXTRA_CPPFLAGS) %(AdditionalOptions)</AdditionalOptions>   </ClCompile>   <Link>   <SubSystem>Windows</SubSystem> @@ -123,6 +128,9 @@
  <CustomBuildStep>   <Outputs>parentid.h;%(Outputs)</Outputs>   </CustomBuildStep> + <ResourceCompile> + <AdditionalOptions>$(THG_EXTRA_RCFLAGS) %(AdditionalOptions)</AdditionalOptions> + </ResourceCompile>   </ItemDefinitionGroup>   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">   <ClCompile> @@ -133,6 +141,7 @@
  <FunctionLevelLinking>true</FunctionLevelLinking>   <IntrinsicFunctions>true</IntrinsicFunctions>   <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;THGSHELL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions>$(THG_EXTRA_CPPFLAGS) %(AdditionalOptions)</AdditionalOptions>   </ClCompile>   <Link>   <SubSystem>Windows</SubSystem> @@ -148,6 +157,9 @@
  <CustomBuildStep>   <Outputs>parentid.h;%(Outputs)</Outputs>   </CustomBuildStep> + <ResourceCompile> + <AdditionalOptions>$(THG_EXTRA_RCFLAGS) %(AdditionalOptions)</AdditionalOptions> + </ResourceCompile>   </ItemDefinitionGroup>   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">   <ClCompile> @@ -158,6 +170,7 @@
  <FunctionLevelLinking>true</FunctionLevelLinking>   <IntrinsicFunctions>true</IntrinsicFunctions>   <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;THGSHELL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalOptions>$(THG_EXTRA_CPPFLAGS) %(AdditionalOptions)</AdditionalOptions>   </ClCompile>   <Link>   <SubSystem>Windows</SubSystem> @@ -174,6 +187,9 @@
  <Outputs>parentid.h;%(Outputs)</Outputs>   <Inputs>.hgdummy</Inputs>   </CustomBuildStep> + <ResourceCompile> + <AdditionalOptions>$(THG_EXTRA_RCFLAGS) %(AdditionalOptions)</AdditionalOptions> + </ResourceCompile>   </ItemDefinitionGroup>   <ItemGroup>   <ClCompile Include="CShellExtCMenu.cpp" />
Change 1 of 2 Show Entire File win32/​shellext/​shellext.rc Stacked
 
32
33
34
35
36
37
38
 
56
57
58
59
 
 
 
 
 
60
61
62
 
32
33
34
 
35
36
37
 
55
56
57
 
58
59
60
61
62
63
64
65
@@ -32,7 +32,6 @@
  TOSTR2(THG_VERSION_THIRD) "-" \   TOSTR2(THG_PARENT_ID)   -  VS_VERSION_INFO VERSIONINFO   FILEVERSION THG_VERSION_BINARY   PRODUCTVERSION THG_VERSION_BINARY @@ -56,7 +55,11 @@
  VALUE "FileVersion", THG_VERSION_STRING   VALUE "InternalName", "shellext"   VALUE "LegalCopyright", "Copyright (C) 2010 Steve Borho and others" - VALUE "OriginalFilename", TOSTR2(THG_SHELL_FNAME) +#ifdef _WIN64 + VALUE "OriginalFilename", "THgShellx64.dll" +#else + VALUE "OriginalFilename", "THgShellx86.dll" +#endif   VALUE "ProductName", "TortoiseHg " TOSTR2(THG_PRODUCT_ID)   VALUE "ProductVersion", THG_VERSION_STRING   END