mirror of https://github.com/odrling/Aegisub
Merge 3355 into 2.1.8.
Originally committed to SVN as r3356.
This commit is contained in:
parent
216bf20670
commit
424f84c3aa
|
@ -22,7 +22,7 @@
|
|||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets=".\suffix_debug32.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\ffms2_lib_include_dir.vsprops;.\compiler_options.vsprops;.\compiler_options_debug.vsprops;.\svn_rev_header_update.vsprops;.\delayload_ffms2_32.vsprops;.\delayload_perl_32.vsprops;.\delayload_portaudio_32.vsprops;.\delayload_openal_32.vsprops;.\delayload_libauto3.vsprops"
|
||||
InheritedPropertySheets=".\suffix_debug32.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\ffms2_lib_include_dir.vsprops;.\compiler_options.vsprops;.\compiler_options_debug.vsprops;.\svn_rev_header_update.vsprops;.\delayload_perl_32.vsprops;.\delayload_portaudio_32.vsprops;.\delayload_openal_32.vsprops;.\delayload_libauto3.vsprops"
|
||||
CharacterSet="1"
|
||||
>
|
||||
<Tool
|
||||
|
@ -154,7 +154,7 @@
|
|||
<Configuration
|
||||
Name="Release|Win32"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets=".\suffix_release32.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\ffms2_lib_include_dir.vsprops;.\compiler_options.vsprops;.\svn_rev_header_update.vsprops;.\delayload_ffms2_32.vsprops;.\delayload_perl_32.vsprops;.\delayload_portaudio_32.vsprops;.\delayload_openal_32.vsprops;.\delayload_libauto3.vsprops"
|
||||
InheritedPropertySheets=".\suffix_release32.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\ffms2_lib_include_dir.vsprops;.\compiler_options.vsprops;.\svn_rev_header_update.vsprops;.\delayload_perl_32.vsprops;.\delayload_portaudio_32.vsprops;.\delayload_openal_32.vsprops;.\delayload_libauto3.vsprops"
|
||||
CharacterSet="1"
|
||||
WholeProgramOptimization="1"
|
||||
>
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioPropertySheet
|
||||
ProjectType="Visual C++"
|
||||
Version="8.00"
|
||||
Name="delayload_ffms2_32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
DelayLoadDLLs="ffms2.dll"
|
||||
/>
|
||||
</VisualStudioPropertySheet>
|
Loading…
Reference in New Issue