iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Statically link ffms2 on Windows 

It used to need to be dynamic due to that it was a nightmare to build,
with very specific toolchain requirements, but that's no longer the
case.
This commit is contained in:
Thomas Goyne 2016-02-04 16:38:49 -08:00
parent 9bbfdddde0
commit d1e5a2674b
7 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/Aegisub/Aegisub.targets
View File

@ -79,7 +79,7 @@
<!-- FFmpegSource support --> <!-- FFmpegSource support -->
<ItemDefinitionGroup Condition="'$(AegisubUseFfms)'=='true'"> <ItemDefinitionGroup Condition="'$(AegisubUseFfms)'=='true'">
<ClCompile> <ClCompile>
<PreprocessorDefinitions>WITH_FFMS2;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WITH_FFMS2;FFMS_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>

1
build/PortableInstaller/PortableInstaller.vcxproj
View File

@ -131,7 +131,6 @@
<OutputPath>csri\</OutputPath> <OutputPath>csri\</OutputPath>
</RarContents> </RarContents>
<RarContents Include="$(AegisubSourceBase)bin\devil.dll" Condition="'$(AegisubUseAvisynth)' == 'true'" /> <RarContents Include="$(AegisubSourceBase)bin\devil.dll" Condition="'$(AegisubUseAvisynth)' == 'true'" />
<RarContents Include="$(AegisubSourceBase)bin\ffms2_$(AegisubPlatformSuffix).dll" Condition="'$(AegisubUseFfms)' == 'true'" />
<RarContents Include="$(AegisubSourceBase)packages\win_installer\portable\config.json" /> <RarContents Include="$(AegisubSourceBase)packages\win_installer\portable\config.json" />
<RarContents Include="$(VCInstallDir)redist\$(PlatformName)\Microsoft.VC140.CRT\msvcp140.dll" /> <RarContents Include="$(VCInstallDir)redist\$(PlatformName)\Microsoft.VC140.CRT\msvcp140.dll" />
<RarContents Include="$(VCInstallDir)redist\$(PlatformName)\Microsoft.VC140.CRT\concrt140.dll" /> <RarContents Include="$(VCInstallDir)redist\$(PlatformName)\Microsoft.VC140.CRT\concrt140.dll" />

1
build/PortableInstaller/PortableInstaller.vcxproj.filters
View File

@ -101,7 +101,6 @@
<Filter>Automation\Include</Filter> <Filter>Automation\Include</Filter>
</RarContents> </RarContents>
<RarContents Include="$(AegisubSourceBase)bin\aegisub$(AegisubPlatformSuffix).exe" /> <RarContents Include="$(AegisubSourceBase)bin\aegisub$(AegisubPlatformSuffix).exe" />
<RarContents Include="$(AegisubSourceBase)bin\ffms2_$(AegisubPlatformSuffix).dll" />
<RarContents Include="$(AegisubSourceBase)packages\win_installer\portable\config.json" /> <RarContents Include="$(AegisubSourceBase)packages\win_installer\portable\config.json" />
<RarContents Include="$(VCInstallDir)redist\$(PlatformName)\Microsoft.VC110.MFC\mfc110u.dll"> <RarContents Include="$(VCInstallDir)redist\$(PlatformName)\Microsoft.VC110.MFC\mfc110u.dll">
<Filter>Runtime</Filter> <Filter>Runtime</Filter>

3
build/ffms2/ffms2.vcxproj
View File

@ -7,7 +7,7 @@
<!-- Aegisub project configuration --> <!-- Aegisub project configuration -->
<PropertyGroup Label="AegisubConfiguration"> <PropertyGroup Label="AegisubConfiguration">
<AegisubProjectType>dll</AegisubProjectType> <AegisubProjectType>lib</AegisubProjectType>
</PropertyGroup> </PropertyGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
@ -24,6 +24,7 @@
<PreprocessorDefinitions> <PreprocessorDefinitions>
WITH_SWRESAMPLE; WITH_SWRESAMPLE;
FFMS_EXPORTS; FFMS_EXPORTS;
FFMS_STATIC;
_CRT_SECURE_NO_WARNINGS; _CRT_SECURE_NO_WARNINGS;
_CRT_NONSTDC_NO_DEPRECATE; _CRT_NONSTDC_NO_DEPRECATE;
_SCL_SECURE_NO_WARNINGS; _SCL_SECURE_NO_WARNINGS;

2
packages/win_installer/fragment_codecs_32.iss
View File

@ -38,8 +38,6 @@
DestDir: {app}; Source: src\devil.dll; Flags: ignoreversion DestDir: {app}; Source: src\devil.dll; Flags: ignoreversion
DestDir: {app}; Source: src\avisynth.dll; Flags: ignoreversion DestDir: {app}; Source: src\avisynth.dll; Flags: ignoreversion
DestDir: {app}; Source: src\DirectShowSource.dll; Flags: ignoreversion DestDir: {app}; Source: src\DirectShowSource.dll; Flags: ignoreversion
; ffmpegsource
DestDir: {app}; Source: ..\..\bin\ffms2_32.dll; Flags: ignoreversion
; vsfilter ; vsfilter
DestDir: {app}\csri; Source: ..\..\bin\csri\xy-vsfilter-aegisub32.dll; Flags: ignoreversion DestDir: {app}\csri; Source: ..\..\bin\csri\xy-vsfilter-aegisub32.dll; Flags: ignoreversion

2
packages/win_installer/fragment_codecs_64.iss
View File

@ -34,8 +34,6 @@
[Files] [Files]
; ffmpegsource
DestDir: {app}; Source: ..\..\bin\ffms2_64.dll; Flags: ignoreversion
; vsfilter ; vsfilter
DestDir: {app}\csri; Source: ..\..\bin\csri\xy-vsfilter-aegisub64.dll; Flags: ignoreversion DestDir: {app}\csri; Source: ..\..\bin\csri\xy-vsfilter-aegisub64.dll; Flags: ignoreversion

2
vendor/ffms2 vendored

@ -1 +1 @@
Subproject commit 7477df0044bdaa9c869c1c42ef40c5d2b83e6469 Subproject commit 06bcf231cab00bfbf28f910c6ec3ca6680957cb6