diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-05-04 13:58:12 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-05-04 13:58:12 +0400 |
| commit | f92640f079137301d6b0d1b080470587ccc39179 (patch) | |
| tree | cfd0ef6ba5a821c13c632a58f4858dba4fa1980d | |
| parent | 8e4ff2abe4202542d13b2f634d7dad92f961615b (diff) | |
-fixed all standalone filters project dependencies
-updated Changelog
-renamed buildffmpeg.sh and cleaned it up (Note: set your GCC version in the script (GCCVER) in order for it to work correctly and don't use paths with spaces since configure fails)
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1839 10f7b99b-c216-0410-bff0-8a66a9350fd8
| -rw-r--r-- | src/apps/mplayerc/ChangeLog | 3 | ||||
| -rw-r--r-- | src/filters/BaseClasses/baseclasses.vcproj | 2 | ||||
| -rw-r--r-- | src/filters/filters.sln | 31 | ||||
| -rw-r--r-- | src/filters/muxer/WavDest/wavdest.vcproj | 1 | ||||
| -rw-r--r-- | src/filters/transform/DeCSSFilter/decssfilter.vcproj | 2 | ||||
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg_x64/buildffmpeg.sh | 84 | ||||
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg_x64/buildmingwlibs.sh | 75 |
7 files changed, 114 insertions, 84 deletions
diff --git a/src/apps/mplayerc/ChangeLog b/src/apps/mplayerc/ChangeLog index 5fb1d6421..9c0685233 100644 --- a/src/apps/mplayerc/ChangeLog +++ b/src/apps/mplayerc/ChangeLog @@ -1,6 +1,8 @@ v1.x.x.x - unreleased
======================
NEW : Seamless playback support for multi files BRD
+ NEW : Support for Windows 7 taskbar and thumbnails features
+ NEW : VSFilter x64 is available
CHANGED: Updated Detours library to v2.1 build 216
CHANGED: Updated UnrarDll. It is now possible to use the 64bit unrardll with the 64bit MPC-HC
CHANGED: Updated MP4 splitter
@@ -10,6 +12,7 @@ v1.x.x.x - unreleased CHANGED: Updated LibOgg to v1.2.0
CHANGED: Updated LibVorbis to v1.3.1
FIXED : Name of MPC-HC in title bar (Bug #2826963)
+ FIXED : crash/hang after standby, hibernate, UAC or CTRL+ALT+DEL (ticket #12)
v1.3.1249.0 - 26 august 2009
======================
diff --git a/src/filters/BaseClasses/baseclasses.vcproj b/src/filters/BaseClasses/baseclasses.vcproj index eb092cb5f..3331c2fc3 100644 --- a/src/filters/BaseClasses/baseclasses.vcproj +++ b/src/filters/BaseClasses/baseclasses.vcproj @@ -44,6 +44,7 @@ />
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="."
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
@@ -111,6 +112,7 @@ />
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="."
PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
diff --git a/src/filters/filters.sln b/src/filters/filters.sln index 4b78ffd5d..95c640e6b 100644 --- a/src/filters/filters.sln +++ b/src/filters/filters.sln @@ -27,12 +27,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D2VSource", "source\d2vsour ProjectSection(ProjectDependencies) = postProject
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
+ {F50E74C2-5BE7-4C9B-B1E7-6CA19CFAD34E} = {F50E74C2-5BE7-4C9B-B1E7-6CA19CFAD34E}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FLICSource", "source\flicsource\flicsource.vcproj", "{431DD5B6-3F2F-47EE-A23F-514BC044B704}"
ProjectSection(ProjectDependencies) = postProject
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
+ {FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
@@ -57,6 +59,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BufferFilter", "transform\b EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DeCSSFilter", "transform\decssfilter\decssfilter.vcproj", "{F6B06383-3FFD-403B-9867-4AA82A20AA83}"
ProjectSection(ProjectDependencies) = postProject
+ {1A2DFD1A-3C6C-44D1-909D-294AF646B575} = {1A2DFD1A-3C6C-44D1-909D-294AF646B575}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
@@ -74,6 +77,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WavDest", "muxer\WavDest\wa EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VTSReader", "reader\vtsreader\vtsreader.vcproj", "{664E726B-EEEE-403A-AC15-345D9C9E1375}"
ProjectSection(ProjectDependencies) = postProject
+ {1A2DFD1A-3C6C-44D1-909D-294AF646B575} = {1A2DFD1A-3C6C-44D1-909D-294AF646B575}
{9F31D122-E84D-485A-A58D-09DAD01A56CE} = {9F31D122-E84D-485A-A58D-09DAD01A56CE}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
@@ -83,12 +87,15 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StreamDriveThru", "parser\streamdrivethru\streamdrivethru.vcproj", "{AE399B7E-2B2C-4A96-9016-C5C74B0A2FA0}"
ProjectSection(ProjectDependencies) = postProject
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
+ {FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DTSAC3Source", "source\dtsac3source\dtsac3source.vcproj", "{30D48874-899F-41C6-9B26-A40C96C91102}"
ProjectSection(ProjectDependencies) = postProject
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
+ {FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
+ {F50E74C2-5BE7-4C9B-B1E7-6CA19CFAD34E} = {F50E74C2-5BE7-4C9B-B1E7-6CA19CFAD34E}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
@@ -103,12 +110,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MatroskaSplitter", "parser\ {37768B3F-89BC-4C16-B2A8-767C5DA84C3F} = {37768B3F-89BC-4C16-B2A8-767C5DA84C3F}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{2FCD4B66-9CF9-4C8F-BC70-37CD20002D49} = {2FCD4B66-9CF9-4C8F-BC70-37CD20002D49}
+ {FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MatroskaMuxer", "muxer\matroskamuxer\MatroskaMuxer.vcproj", "{67827491-8162-4039-9132-F934ABC836A0}"
ProjectSection(ProjectDependencies) = postProject
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
+ {FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
@@ -117,6 +126,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RealMediaSplitter", "parser {54DDA60F-E528-4D07-A152-960A1E818680} = {54DDA60F-E528-4D07-A152-960A1E818680}
{37768B3F-89BC-4C16-B2A8-767C5DA84C3F} = {37768B3F-89BC-4C16-B2A8-767C5DA84C3F}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
+ {FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
@@ -128,6 +138,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AviSplitter", "parser\avisplitter\AviSplitter.vcproj", "{9738B023-FC46-48A2-953A-0035FD897678}"
ProjectSection(ProjectDependencies) = postProject
{37768B3F-89BC-4C16-B2A8-767C5DA84C3F} = {37768B3F-89BC-4C16-B2A8-767C5DA84C3F}
+ {FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
@@ -143,10 +154,13 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MpaDecFilter", "transform\mpadecfilter\MpaDecFilter.vcproj", "{4421516D-10A6-41C1-ADF3-099573BBB0C6}"
ProjectSection(ProjectDependencies) = postProject
{D8365C15-2166-4DB6-8A2D-1C8F0239EB18} = {D8365C15-2166-4DB6-8A2D-1C8F0239EB18}
+ {1A2DFD1A-3C6C-44D1-909D-294AF646B575} = {1A2DFD1A-3C6C-44D1-909D-294AF646B575}
{5CAF881C-9349-4EE2-9697-982C10795033} = {5CAF881C-9349-4EE2-9697-982C10795033}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{A7134255-DFF3-42F7-9BC2-FAC6E71CFFAE} = {A7134255-DFF3-42F7-9BC2-FAC6E71CFFAE}
+ {2FCD4B66-9CF9-4C8F-BC70-37CD20002D49} = {2FCD4B66-9CF9-4C8F-BC70-37CD20002D49}
{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
+ {FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
{62FE6D94-E17C-4A8E-8D3C-7A589A70D865} = {62FE6D94-E17C-4A8E-8D3C-7A589A70D865}
{438286B7-A9F4-411D-BCC5-948C40E37D8F} = {438286B7-A9F4-411D-BCC5-948C40E37D8F}
{FAE14DBE-B508-4AB3-929D-75C68E4EBBC1} = {FAE14DBE-B508-4AB3-929D-75C68E4EBBC1}
@@ -160,6 +174,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RoQSplitter", "parser\roqsp ProjectSection(ProjectDependencies) = postProject
{37768B3F-89BC-4C16-B2A8-767C5DA84C3F} = {37768B3F-89BC-4C16-B2A8-767C5DA84C3F}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
+ {FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
@@ -169,6 +184,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OggSplitter", "parser\oggsp ProjectSection(ProjectDependencies) = postProject
{37768B3F-89BC-4C16-B2A8-767C5DA84C3F} = {37768B3F-89BC-4C16-B2A8-767C5DA84C3F}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
+ {FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
@@ -178,6 +194,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NutSplitter", "parser\nutsp ProjectSection(ProjectDependencies) = postProject
{37768B3F-89BC-4C16-B2A8-767C5DA84C3F} = {37768B3F-89BC-4C16-B2A8-767C5DA84C3F}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
+ {FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
@@ -187,6 +204,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MpegSplitter", "parser\mpeg ProjectSection(ProjectDependencies) = postProject
{37768B3F-89BC-4C16-B2A8-767C5DA84C3F} = {37768B3F-89BC-4C16-B2A8-767C5DA84C3F}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
+ {FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
@@ -197,6 +215,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiracSplitter", "parser\dir {37768B3F-89BC-4C16-B2A8-767C5DA84C3F} = {37768B3F-89BC-4C16-B2A8-767C5DA84C3F}
{12BE3440-A1F3-4C48-A229-30CB619EA276} = {12BE3440-A1F3-4C48-A229-30CB619EA276}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
+ {FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
@@ -206,6 +225,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MpaSplitter", "parser\mpasp ProjectSection(ProjectDependencies) = postProject
{37768B3F-89BC-4C16-B2A8-767C5DA84C3F} = {37768B3F-89BC-4C16-B2A8-767C5DA84C3F}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
+ {FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
@@ -216,7 +236,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseVideoFilter", "transfor EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSMSplitter", "parser\dsmsplitter\DSMSplitter.vcproj", "{1E91F58C-0BAE-4021-8087-D1864D8EC066}"
ProjectSection(ProjectDependencies) = postProject
+ {37768B3F-89BC-4C16-B2A8-767C5DA84C3F} = {37768B3F-89BC-4C16-B2A8-767C5DA84C3F}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
+ {FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
@@ -228,6 +250,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSMMuxer", "muxer\DSMMuxer\DSMMuxer.vcproj", "{65361C7C-83D6-42E4-870C-4DC85AE641FE}"
ProjectSection(ProjectDependencies) = postProject
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
+ {FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
+ {DD9D2D92-2241-408A-859E-B85D444B7E3C} = {DD9D2D92-2241-408A-859E-B85D444B7E3C}
{DB5F93B2-54D0-4474-A588-D259BE36C832} = {DB5F93B2-54D0-4474-A588-D259BE36C832}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
@@ -235,6 +259,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SubtitleSource", "source\subtitlesource\subtitlesource.vcproj", "{8F998497-9C51-4FAA-83E4-1D85B22CBA13}"
ProjectSection(ProjectDependencies) = postProject
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
+ {D514EA4D-EAFB-47A9-A437-A582CA571251} = {D514EA4D-EAFB-47A9-A437-A582CA571251}
+ {5E56335F-0FB1-4EEA-B240-D8DC5E0608E4} = {5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}
+ {FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
@@ -276,6 +303,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SSFSplitter", "parser\ssfsp ProjectSection(ProjectDependencies) = postProject
{37768B3F-89BC-4C16-B2A8-767C5DA84C3F} = {37768B3F-89BC-4C16-B2A8-767C5DA84C3F}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
+ {FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
+ {DD9D2D92-2241-408A-859E-B85D444B7E3C} = {DD9D2D92-2241-408A-859E-B85D444B7E3C}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
EndProject
@@ -285,6 +314,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MPCVideoDec", "transform\mp {5CAF881C-9349-4EE2-9697-982C10795033} = {5CAF881C-9349-4EE2-9697-982C10795033}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{2FCD4B66-9CF9-4C8F-BC70-37CD20002D49} = {2FCD4B66-9CF9-4C8F-BC70-37CD20002D49}
+ {FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
{438286B7-A9F4-411D-BCC5-948C40E37D8F} = {438286B7-A9F4-411D-BCC5-948C40E37D8F}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
@@ -295,6 +325,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FlacSource", "source\flacso ProjectSection(ProjectDependencies) = postProject
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
+ {FC70988B-1AE5-4381-866D-4F405E28AC42} = {FC70988B-1AE5-4381-866D-4F405E28AC42}
{F50E74C2-5BE7-4C9B-B1E7-6CA19CFAD34E} = {F50E74C2-5BE7-4C9B-B1E7-6CA19CFAD34E}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection
diff --git a/src/filters/muxer/WavDest/wavdest.vcproj b/src/filters/muxer/WavDest/wavdest.vcproj index 16ef2daa1..dd1e054d7 100644 --- a/src/filters/muxer/WavDest/wavdest.vcproj +++ b/src/filters/muxer/WavDest/wavdest.vcproj @@ -288,6 +288,7 @@ AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"
PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL"
+ UsePrecompiledHeader="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/transform/DeCSSFilter/decssfilter.vcproj b/src/filters/transform/DeCSSFilter/decssfilter.vcproj index 0b083cf24..e9eb47097 100644 --- a/src/filters/transform/DeCSSFilter/decssfilter.vcproj +++ b/src/filters/transform/DeCSSFilter/decssfilter.vcproj @@ -46,6 +46,7 @@ AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"
PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL"
+ UsePrecompiledHeader="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -120,6 +121,7 @@ AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"
PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL"
+ UsePrecompiledHeader="0"
DebugInformationFormat="3"
/>
<Tool
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg_x64/buildffmpeg.sh b/src/filters/transform/MPCVideoDec/ffmpeg_x64/buildffmpeg.sh deleted file mode 100644 index adc1d4b19..000000000 --- a/src/filters/transform/MPCVideoDec/ffmpeg_x64/buildffmpeg.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash -e
-
-CC=x86_64-w64-mingw32-gcc
-HST=i686-pc-mingw32
-TGT=x86_64-w64-mingw32
-RT=root-$HST
-PF=`pwd`/$RT
-BD=`pwd`/build
-DIRS="$PF $PF/$TGT build $BD/mingw $BD/mingw/build-$HST $BD/ffmpeg"
-baseopts="--prefix=$PF --with-sysroot=$PF --target=$TGT"
-
-updatemingw="false"
-
-while opt=$1 && shift; do
- case "$opt" in
- "--help" )
- cat << EOF
- This build script will setup an entire buildroot environment consisting
- Ming64 and ffmpeg to build Mpc-hc x64 edition. Source code will be
- downloaded from SourceForge projects :
- - Crt and Headers from MingW x64
- (http://sourceforge.net/project/showfiles.php?group_id=202880)
- - Ffmpeg from Mpc-hc
- (http://sourceforge.net/projects/mpc-hc/)
-
- To use this script, you should have :
- - Download MingW64 chaintool for i686-mingw platform
- (http://sourceforge.net/project/showfiles.php?group_id=202880&package_id=245516&release_id=546049)
- - Download MSys, and configure it with MingW64 with postinstall script
- (http://sourceforge.net/project/showfiles.php?group_id=2435)
- - Patch MSys with latest release of CoreUtils and Bash
- - Install Subversion command line client from http://subversion.tigris.org, and add path in msys.bat
- - Start MSys and run this script
-
- $0 [ --help ] [ --updatemingw ]
-
- --help Causes all other arguments to be ignored and results in the display of
- this text.
-
- --updatemingw Get latest of Ming64, and rebuild library
-
-EOF
- exit
- ;;
-
- "--updatemingw" )
- updatemingw="true"
- compilewmingw="true"
- ;;
-
- "--compilemingw" )
- compilewmingw="true"
- ;;
-
- esac
-done
-
-for i in $DIRS; do
-[ -d $i ] || mkdir $i || updatemingw="true"
-done
-
-if [[ $updatemingw == "true" ]]; then
- echo "Downloading Ming64 crt and headers.." && cd $BD/mingw
- svn -q co https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/trunk .
- dest=$PF/$TGT/include
- [ -d $dest ] && echo $dest already exists || ( cp -prf mingw-w64-headers/include $dest && find $dest -name ".svn" | xargs rm -rf )
-fi
-
-if [[ $compilewmingw == "true" ]]; then
- echo "Compiling Ming64 crt and headers.." && cd $BD/mingw/build-$HST
- ../mingw-w64-crt/configure --prefix=$PF --with-sysroot=$PF --host=$TGT || exit 1
- # export CFLAGS="-fno-leading-underscore -mno-cygwin"
- make CFLAGS="-fno-leading-underscore -mno-cygwin" -s && make install || exit 1
- cp /mingw/lib/gcc/x86_64-w64-mingw32/4.5.0/libgcc.a $BD/../../../../../../lib64/libgcc.a
- cp $PF/x86_64-w64-mingw32/lib/libmingwex.a $BD/../../../../../../lib64/libmingwex.a
-fi
-
-
-#echo "Downloading ffmpeg for Mpc-hc" && cd $BD/ffmpeg
-#svn -q co https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk/src/filters/transform/mpcvideodec/ffmpeg .
-#
-#echo "Compiling ffmpeg for Mpc-hc..."
-#cd $BD/ffmpeg
-#make 64BIT=yes
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg_x64/buildmingwlibs.sh b/src/filters/transform/MPCVideoDec/ffmpeg_x64/buildmingwlibs.sh new file mode 100644 index 000000000..7587d04a2 --- /dev/null +++ b/src/filters/transform/MPCVideoDec/ffmpeg_x64/buildmingwlibs.sh @@ -0,0 +1,75 @@ +#!/bin/bash -e
+
+CC=x86_64-w64-mingw32-gcc
+HST=i686-pc-mingw32
+TGT=x86_64-w64-mingw32
+RT=root-$HST
+PF=`pwd`/$RT
+BD=`pwd`/build
+GCCVER=4.5.1
+
+updatemingw="false"
+
+while opt=$1 && shift; do
+ case "$opt" in
+ "--help" )
+ cat << EOF
+
+This build script will set up an entire building environment consisting of
+MinGW64 to build the needed mingw libs for mpc-hc64. The source code will be
+downloaded from the MinGW64 SourceForge project:
+ (http://sourceforge.net/project/showfiles.php?group_id=202880)
+
+To use this script, you should first:
+ - Download MinGW64 chaintool for the i686-mingw platform
+ (http://sourceforge.net/project/showfiles.php?group_id=202880&package_id=245516&release_id=546049)
+ - Download MSYS and configure MingW64 with the postinstall script
+ (or edit your "MSYS\etc\fstab" file and add your mingw path)
+ (http://sourceforge.net/project/showfiles.php?group_id=2435)
+ - Patch MSYS with latest release of CoreUtils and Bash
+ - Install Subversion command line client from http://subversion.tigris.org
+ and add it to a folder which is in your PATH
+ - Start MSYS and run this script
+
+ $0 [ --help ] [ --updatemingw ] [ --compilemingw ]
+
+ --help Causes all other arguments to be ignored and results in
+ the display of this text
+
+ --updatemingw Get the latest MinGW64 and rebuild library
+
+ --compilemingw Starts MinGW64 compilation
+EOF
+ exit
+ ;;
+
+ "--updatemingw" )
+ updatemingw="true"
+ compilewmingw="false"
+ ;;
+
+ "--compilemingw" )
+ compilewmingw="true"
+ ;;
+
+ esac
+done
+
+for i in "$PF" "$PF/$TGT" "build" "$BD/mingw" "$BD/mingw/build-$HST"; do
+ [ -d "$i" ] || mkdir "$i" || updatemingw="true"
+done
+
+if [[ $updatemingw == "true" ]]; then
+ echo "Downloading MinGW64 crt and headers..." && cd "$BD/mingw"
+ svn -q co https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/trunk .
+ dest="$PF/$TGT/include"
+ [ -d "$dest" ] && echo "$dest" already exists || ( cp -prf mingw-w64-headers/include "$dest" && find "$dest" -name ".svn" | xargs rm -rf )
+fi
+
+if [[ $compilewmingw == "true" ]]; then
+ echo "Compiling MinGW64 crt and headers..." && cd "$BD/mingw/build-$HST"
+ ../mingw-w64-crt/configure --prefix="$PF" --with-sysroot="$PF" --host="$TGT" || exit 1
+ make CFLAGS="-fno-leading-underscore -mno-cygwin" -s && make install || exit 1
+ cp "/mingw/lib/gcc/x86_64-w64-mingw32/$GCCVER/libgcc.a" "$BD/../../../../../../lib64/libgcc.a"
+ cp "$PF/x86_64-w64-mingw32/lib/libmingwex.a" "$BD/../../../../../../lib64/libmingwex.a"
+fi
|