Skip to content

Commit 68140dc

Browse files
SibrasSibras
committed
project: Fix manifest collision.
Fixes #107
1 parent 992b2cb commit 68140dc

4 files changed

+25
-1
lines changed

‎SMP/ffmpeg.vcxproj

+8
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@
179179
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
180180
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
181181
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
182+
<EmbedManifest>false</EmbedManifest>
182183
</PropertyGroup>
183184
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
184185
<TargetName>ffmpegd</TargetName>
@@ -187,6 +188,7 @@
187188
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
188189
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
189190
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
191+
<EmbedManifest>false</EmbedManifest>
190192
</PropertyGroup>
191193
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
192194
<TargetName>ffmpegd</TargetName>
@@ -195,6 +197,7 @@
195197
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
196198
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
197199
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
200+
<EmbedManifest>false</EmbedManifest>
198201
</PropertyGroup>
199202
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
200203
<TargetName>ffmpegd</TargetName>
@@ -203,6 +206,7 @@
203206
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
204207
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
205208
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
209+
<EmbedManifest>false</EmbedManifest>
206210
</PropertyGroup>
207211
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
208212
<TargetName>ffmpeg</TargetName>
@@ -211,6 +215,7 @@
211215
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
212216
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
213217
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
218+
<EmbedManifest>false</EmbedManifest>
214219
</PropertyGroup>
215220
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
216221
<TargetName>ffmpeg</TargetName>
@@ -219,6 +224,7 @@
219224
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
220225
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
221226
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
227+
<EmbedManifest>false</EmbedManifest>
222228
</PropertyGroup>
223229
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
224230
<TargetName>ffmpeg</TargetName>
@@ -227,6 +233,7 @@
227233
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
228234
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
229235
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
236+
<EmbedManifest>false</EmbedManifest>
230237
</PropertyGroup>
231238
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
232239
<TargetName>ffmpeg</TargetName>
@@ -235,6 +242,7 @@
235242
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
236243
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
237244
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
245+
<EmbedManifest>false</EmbedManifest>
238246
</PropertyGroup>
239247
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
240248
<ClCompile>

‎SMP/ffplay.vcxproj

+8
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@
168168
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
169169
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
170170
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
171+
<EmbedManifest>false</EmbedManifest>
171172
</PropertyGroup>
172173
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
173174
<TargetName>ffplayd</TargetName>
@@ -176,6 +177,7 @@
176177
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
177178
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
178179
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
180+
<EmbedManifest>false</EmbedManifest>
179181
</PropertyGroup>
180182
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
181183
<TargetName>ffplayd</TargetName>
@@ -184,6 +186,7 @@
184186
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
185187
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
186188
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
189+
<EmbedManifest>false</EmbedManifest>
187190
</PropertyGroup>
188191
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
189192
<TargetName>ffplayd</TargetName>
@@ -192,6 +195,7 @@
192195
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
193196
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
194197
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
198+
<EmbedManifest>false</EmbedManifest>
195199
</PropertyGroup>
196200
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
197201
<TargetName>ffplay</TargetName>
@@ -200,6 +204,7 @@
200204
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
201205
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
202206
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
207+
<EmbedManifest>false</EmbedManifest>
203208
</PropertyGroup>
204209
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
205210
<TargetName>ffplay</TargetName>
@@ -208,6 +213,7 @@
208213
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
209214
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
210215
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
216+
<EmbedManifest>false</EmbedManifest>
211217
</PropertyGroup>
212218
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
213219
<TargetName>ffplay</TargetName>
@@ -216,6 +222,7 @@
216222
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
217223
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
218224
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
225+
<EmbedManifest>false</EmbedManifest>
219226
</PropertyGroup>
220227
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
221228
<TargetName>ffplay</TargetName>
@@ -224,6 +231,7 @@
224231
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
225232
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
226233
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
234+
<EmbedManifest>false</EmbedManifest>
227235
</PropertyGroup>
228236
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
229237
<ClCompile>

‎SMP/ffprobe.vcxproj

+8
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@
167167
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
168168
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
169169
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
170+
<EmbedManifest>false</EmbedManifest>
170171
</PropertyGroup>
171172
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
172173
<TargetName>ffprobed</TargetName>
@@ -175,6 +176,7 @@
175176
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
176177
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
177178
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
179+
<EmbedManifest>false</EmbedManifest>
178180
</PropertyGroup>
179181
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
180182
<TargetName>ffprobed</TargetName>
@@ -183,6 +185,7 @@
183185
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
184186
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
185187
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
188+
<EmbedManifest>false</EmbedManifest>
186189
</PropertyGroup>
187190
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
188191
<TargetName>ffprobed</TargetName>
@@ -191,6 +194,7 @@
191194
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
192195
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
193196
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
197+
<EmbedManifest>false</EmbedManifest>
194198
</PropertyGroup>
195199
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
196200
<TargetName>ffprobe</TargetName>
@@ -199,6 +203,7 @@
199203
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
200204
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
201205
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
206+
<EmbedManifest>false</EmbedManifest>
202207
</PropertyGroup>
203208
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
204209
<TargetName>ffprobe</TargetName>
@@ -207,6 +212,7 @@
207212
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
208213
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
209214
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
215+
<EmbedManifest>false</EmbedManifest>
210216
</PropertyGroup>
211217
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
212218
<TargetName>ffprobe</TargetName>
@@ -215,6 +221,7 @@
215221
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
216222
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
217223
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
224+
<EmbedManifest>false</EmbedManifest>
218225
</PropertyGroup>
219226
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
220227
<TargetName>ffprobe</TargetName>
@@ -223,6 +230,7 @@
223230
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
224231
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
225232
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
233+
<EmbedManifest>false</EmbedManifest>
226234
</PropertyGroup>
227235
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
228236
<ClCompile>

‎SMP/project_get_dependencies.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ REM Check if secure OAuth is available
134134
IF "%GITHUBTOKEN%" == "" (
135135
powershell -nologo -noprofile -command "$currentMaxTls = [Math]::Max([Net.ServicePointManager]::SecurityProtocol.value__,[Net.SecurityProtocolType]::Tls.value__);$newTlsTypes = [enum]::GetValues('Net.SecurityProtocolType') | ?{ $_ -gt $currentMaxTls };ForEach ($newTls in $newTlsTypes) { [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor $newTls };try { Invoke-RestMethod -Uri %UPSTREAMAPIURL%/%REPONAME%/releases/latest > latest.json } catch {exit 1}"
136136
) ELSE (
137-
powershell -nologo -noprofile -command "$currentMaxTls = [Math]::Max([Net.ServicePointManager]::SecurityProtocol.value__,[Net.SecurityProtocolType]::Tls.value__);$newTlsTypes = [enum]::GetValues('Net.SecurityProtocolType') | ?{ $_ -gt $currentMaxTls };ForEach ($newTls in $newTlsTypes) { [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor $newTls };try { Invoke-RestMethod -Uri %UPSTREAMAPIURL%/%REPONAME%/releases/latest -Headers @{'Authorization' = 'token %GITHUBTOKEN%'} > latest.json } catch {Write-Host $_; exit 1}"
137+
powershell -nologo -noprofile -command "$currentMaxTls = [Math]::Max([Net.ServicePointManager]::SecurityProtocol.value__,[Net.SecurityProtocolType]::Tls.value__);$newTlsTypes = [enum]::GetValues('Net.SecurityProtocolType') | ?{ $_ -gt $currentMaxTls };ForEach ($newTls in $newTlsTypes) { [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor $newTls };try { Invoke-RestMethod -Uri %UPSTREAMAPIURL%/%REPONAME%/releases/latest -Headers @{'Authorization' = 'token %GITHUBTOKEN%'} > latest.json } catch {exit 1}"
138138
)
139139
IF ERRORLEVEL 1 ( ECHO Failed getting latest %REPONAME% release & EXIT /B 1 )
140140
REM Get tag for latest release

0 commit comments

Comments
 (0)