From c5ab7942e3a9299e6aa62b408bdb8d6e56f5d77c Mon Sep 17 00:00:00 2001 From: xhmikosr Date: Wed, 1 Aug 2012 23:19:00 +0300 Subject: fix line endings --- docs/Compilation.txt | 120 +++++++++--------- src/filters/muxer/DSMMuxer/DSMMuxer.rc | 2 +- src/filters/muxer/MatroskaMuxer/MatroskaMuxer.rc | 2 +- src/filters/muxer/WavDest/WavDest.rc | 2 +- src/filters/parser/AviSplitter/AviSplitter.rc | 2 +- src/filters/parser/DSMSplitter/DSMSplitter.rc | 2 +- src/filters/parser/FLVSplitter/FLVSplitter.rc | 2 +- src/filters/parser/MP4Splitter/MP4Splitter.rc | 2 +- .../parser/MatroskaSplitter/MatroskaSplitter.rc | 2 +- src/filters/parser/MpaSplitter/MpaSplitter.rc | 2 +- src/filters/parser/MpegSplitter/MpegSplitter.rc | 2 +- src/filters/parser/OggSplitter/OggSplitter.rc | 2 +- .../parser/RealMediaSplitter/RealMediaSplitter.rc | 2 +- .../parser/StreamDriveThru/StreamDriveThru.rc | 2 +- src/filters/reader/CDDAReader/CDDAReader.rc | 2 +- src/filters/reader/CDXAReader/CDXAReader.rc | 2 +- src/filters/reader/UDPReader/UDPReader.rc | 2 +- src/filters/reader/VTSReader/VTSReader.rc | 2 +- .../renderer/MpcAudioRenderer/MpcAudioRenderer.rc | 2 +- src/filters/source/D2VSource/D2VSource.rc | 2 +- src/filters/source/DTSAC3Source/DTSAC3Source.rc | 2 +- src/filters/source/FLACSource/FLACSource.rc | 2 +- src/filters/source/FLICSource/FLICSource.rc | 2 +- .../source/ShoutcastSource/ShoutcastSource.rc | 2 +- .../source/SubtitleSource/SubtitleSource.rc | 2 +- .../switcher/AudioSwitcher/AudioSwitcher.rc | 2 +- .../transform/AVI2AC3Filter/AVI2AC3Filter.rc | 2 +- src/filters/transform/BufferFilter/BufferFilter.rc | 2 +- src/filters/transform/DeCSSFilter/DeCSSFilter.rc | 2 +- .../transform/MPCVideoDec/MPCVideoDecFilter.rc | 2 +- src/filters/transform/MpaDecFilter/MpaDecFilter.rc | 2 +- .../transform/Mpeg2DecFilter/Mpeg2DecFilter.rc | 2 +- src/filters/transform/VSFilter/res/VSFilter.rc2 | 2 +- version.sh | 138 ++++++++++----------- 34 files changed, 161 insertions(+), 161 deletions(-) diff --git a/docs/Compilation.txt b/docs/Compilation.txt index 3b4057cf2..80b015350 100644 --- a/docs/Compilation.txt +++ b/docs/Compilation.txt @@ -1,61 +1,61 @@ -For up to date instructions on how to compile mpc-hc visit the wiki page: - -http://sourceforge.net/apps/trac/mpc-hc/wiki/How_to_compile_the_MPC - - -Part A: Preparing the Visual Studio environment - - Visual Studio 2010 - 1. Install Visual C++ 2010, part of Visual Studio 2010 Professional (Express won't work, other editions work fine) - 2. Install Visual Studio 2010 Service Pack 1 -> http://www.microsoft.com/downloads/en/details.aspx?FamilyID=75568aa6-8107-475d-948a-ef22627e57a5&displaylang=en - 3. Install the DirectX SDK (June 2010) -> http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=3021d52b-514e-41d3-ad02-438a3ba730ba - - -Part B: Preparing the GCC environment - NOTES: - * If you installed the MSYS/MinGW package in an other directory you will have to use that path in the following steps. - * If you don't use TortoiseSVN then the revision number will be a hard-coded one, like 1.6.3.0. - - 1. Download and extract MSYS_MinGW-w64_GCC_471_x86-x64.7z to "C:\MSYS" -> http://xhmikosr.1f0.de/tools/MSYS_MinGW-w64_GCC_471_x86-x64.7z - For the components and their version see: http://xhmikosr.1f0.de/tools/MSYS_MinGW-w64_GCC_471_x86-x64_components.txt - 2. Edit the "fstab" file in "C:\MSYS\etc" to specify your MinGW path. - Add this to it: C:\MSYS\mingw \mingw - Note the tab-space between "mingw" and "\mingw" - 3. Create a file named "build.user.bat" in "C:\mpc-hc" containing the following entries, adapted for your system: - -@ECHO OFF -SET "MPCHC_MSYS=C:\MSYS" -SET "MPCHC_MINGW32=%MPCHC_MSYS%\mingw" -SET "MPCHC_MINGW64=%MPCHC_MINGW32%" -REM Git is optional to set if you chose to add git in PATH when installing it -SET "%MPCHC_GIT%=C:\Program Files (x86)\Git" - - -Part C: Downloading and compiling the MPC-HC source - +For up to date instructions on how to compile mpc-hc visit the wiki page: + +http://sourceforge.net/apps/trac/mpc-hc/wiki/How_to_compile_the_MPC + + +Part A: Preparing the Visual Studio environment + + Visual Studio 2010 + 1. Install Visual C++ 2010, part of Visual Studio 2010 Professional (Express won't work, other editions work fine) + 2. Install Visual Studio 2010 Service Pack 1 -> http://www.microsoft.com/downloads/en/details.aspx?FamilyID=75568aa6-8107-475d-948a-ef22627e57a5&displaylang=en + 3. Install the DirectX SDK (June 2010) -> http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=3021d52b-514e-41d3-ad02-438a3ba730ba + + +Part B: Preparing the GCC environment + NOTES: + * If you installed the MSYS/MinGW package in an other directory you will have to use that path in the following steps. + * If you don't use TortoiseSVN then the revision number will be a hard-coded one, like 1.6.3.0. + + 1. Download and extract MSYS_MinGW-w64_GCC_471_x86-x64.7z to "C:\MSYS" -> http://xhmikosr.1f0.de/tools/MSYS_MinGW-w64_GCC_471_x86-x64.7z + For the components and their version see: http://xhmikosr.1f0.de/tools/MSYS_MinGW-w64_GCC_471_x86-x64_components.txt + 2. Edit the "fstab" file in "C:\MSYS\etc" to specify your MinGW path. + Add this to it: C:\MSYS\mingw \mingw + Note the tab-space between "mingw" and "\mingw" + 3. Create a file named "build.user.bat" in "C:\mpc-hc" containing the following entries, adapted for your system: + +@ECHO OFF +SET "MPCHC_MSYS=C:\MSYS" +SET "MPCHC_MINGW32=%MPCHC_MSYS%\mingw" +SET "MPCHC_MINGW64=%MPCHC_MINGW32%" +REM Git is optional to set if you chose to add git in PATH when installing it +SET "%MPCHC_GIT%=C:\Program Files (x86)\Git" + + +Part C: Downloading and compiling the MPC-HC source + 1. Use Git to checkout MPC-HC's master branch to "C:\mpc-hc" (or anywhere else you like) - Repository URL: https://github.com/mpc-hc/mpc-hc.git - Grab it from http://msysgit.googlecode.com/files/Git-1.7.11-preview20120710.exe -2. Open the solution file "C:\mpc-hc\mpc-hc.sln" - Change the solution's configuration to "Release" (in the toolbar). -3. Press F7 to build the solution. -4. You now have "mpc-hc.exe" under "C:\mpc-hc\bin\mpc-hc_x86" -5. Open the solution file "C:\mpc-hc\mpciconlib.sln" -6. Press F7 to build the solution. -7. You now have "mpciconlib.dll" under "C:\mpc-hc\bin\mpc-hc_x86" -8. Open the solution file "C:\mpc-hc\mpcresources.sln" - In Visual Studio go to Build->Batch Build->Press Select All->Press Build -9. You now have "mpcresources.XX.dll" under "C:\mpc-hc\bin\mpc-hc_x86\Lang" - -Alternatively, you can use "build.bat" which can build everything for you -(run: build.bat help for more info) - - -Part D: Building the installer - -Download Inno Setup Unicode v5.5.1 or newer from: http://www.jrsoftware.org/isdl.php -Install everything and then go to "C:\mpc-hc\distrib", open "mpc-hc_setup.iss" with Inno Setup, -read the first comments in the script and compile it. -Notes: -* "build.bat" can build the installer by using the "installer" or the "packages" switch. -* Use Inno Setup's built-in IDE if you want to edit the iss file. + Repository URL: https://github.com/mpc-hc/mpc-hc.git + Grab it from http://msysgit.googlecode.com/files/Git-1.7.11-preview20120710.exe +2. Open the solution file "C:\mpc-hc\mpc-hc.sln" + Change the solution's configuration to "Release" (in the toolbar). +3. Press F7 to build the solution. +4. You now have "mpc-hc.exe" under "C:\mpc-hc\bin\mpc-hc_x86" +5. Open the solution file "C:\mpc-hc\mpciconlib.sln" +6. Press F7 to build the solution. +7. You now have "mpciconlib.dll" under "C:\mpc-hc\bin\mpc-hc_x86" +8. Open the solution file "C:\mpc-hc\mpcresources.sln" + In Visual Studio go to Build->Batch Build->Press Select All->Press Build +9. You now have "mpcresources.XX.dll" under "C:\mpc-hc\bin\mpc-hc_x86\Lang" + +Alternatively, you can use "build.bat" which can build everything for you +(run: build.bat help for more info) + + +Part D: Building the installer + +Download Inno Setup Unicode v5.5.1 or newer from: http://www.jrsoftware.org/isdl.php +Install everything and then go to "C:\mpc-hc\distrib", open "mpc-hc_setup.iss" with Inno Setup, +read the first comments in the script and compile it. +Notes: +* "build.bat" can build the installer by using the "installer" or the "packages" switch. +* Use Inno Setup's built-in IDE if you want to edit the iss file. diff --git a/src/filters/muxer/DSMMuxer/DSMMuxer.rc b/src/filters/muxer/DSMMuxer/DSMMuxer.rc index e00d352db..027067f31 100644 --- a/src/filters/muxer/DSMMuxer/DSMMuxer.rc +++ b/src/filters/muxer/DSMMuxer/DSMMuxer.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.rc b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.rc index ef93c9200..0dfb811e4 100644 --- a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.rc +++ b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/muxer/WavDest/WavDest.rc b/src/filters/muxer/WavDest/WavDest.rc index c835e6e4f..d35a64d35 100644 --- a/src/filters/muxer/WavDest/WavDest.rc +++ b/src/filters/muxer/WavDest/WavDest.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/parser/AviSplitter/AviSplitter.rc b/src/filters/parser/AviSplitter/AviSplitter.rc index ff1abbd67..9f334cc32 100644 --- a/src/filters/parser/AviSplitter/AviSplitter.rc +++ b/src/filters/parser/AviSplitter/AviSplitter.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/parser/DSMSplitter/DSMSplitter.rc b/src/filters/parser/DSMSplitter/DSMSplitter.rc index 4bf1582ae..28fde48a7 100644 --- a/src/filters/parser/DSMSplitter/DSMSplitter.rc +++ b/src/filters/parser/DSMSplitter/DSMSplitter.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/parser/FLVSplitter/FLVSplitter.rc b/src/filters/parser/FLVSplitter/FLVSplitter.rc index f6eb9f130..0b4fb58df 100644 --- a/src/filters/parser/FLVSplitter/FLVSplitter.rc +++ b/src/filters/parser/FLVSplitter/FLVSplitter.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/parser/MP4Splitter/MP4Splitter.rc b/src/filters/parser/MP4Splitter/MP4Splitter.rc index df08e04ed..eab1c858d 100644 --- a/src/filters/parser/MP4Splitter/MP4Splitter.rc +++ b/src/filters/parser/MP4Splitter/MP4Splitter.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.rc b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.rc index b5cf1fafe..39babad6a 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.rc +++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/parser/MpaSplitter/MpaSplitter.rc b/src/filters/parser/MpaSplitter/MpaSplitter.rc index 7c97c0ee6..6cfd5332c 100644 --- a/src/filters/parser/MpaSplitter/MpaSplitter.rc +++ b/src/filters/parser/MpaSplitter/MpaSplitter.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.rc b/src/filters/parser/MpegSplitter/MpegSplitter.rc index 731f757fa..d5d47e6d5 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitter.rc +++ b/src/filters/parser/MpegSplitter/MpegSplitter.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/parser/OggSplitter/OggSplitter.rc b/src/filters/parser/OggSplitter/OggSplitter.rc index b1d0542d3..f168680ea 100644 --- a/src/filters/parser/OggSplitter/OggSplitter.rc +++ b/src/filters/parser/OggSplitter/OggSplitter.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.rc b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.rc index b5ba30f91..25f8bf7b3 100644 --- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.rc +++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/parser/StreamDriveThru/StreamDriveThru.rc b/src/filters/parser/StreamDriveThru/StreamDriveThru.rc index 488c8f1bc..49b283597 100644 --- a/src/filters/parser/StreamDriveThru/StreamDriveThru.rc +++ b/src/filters/parser/StreamDriveThru/StreamDriveThru.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/reader/CDDAReader/CDDAReader.rc b/src/filters/reader/CDDAReader/CDDAReader.rc index d2eb6964b..9dbaf65e7 100644 --- a/src/filters/reader/CDDAReader/CDDAReader.rc +++ b/src/filters/reader/CDDAReader/CDDAReader.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/reader/CDXAReader/CDXAReader.rc b/src/filters/reader/CDXAReader/CDXAReader.rc index c414e4ce2..2facecdd7 100644 --- a/src/filters/reader/CDXAReader/CDXAReader.rc +++ b/src/filters/reader/CDXAReader/CDXAReader.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/reader/UDPReader/UDPReader.rc b/src/filters/reader/UDPReader/UDPReader.rc index 451b6eed2..a279ba006 100644 --- a/src/filters/reader/UDPReader/UDPReader.rc +++ b/src/filters/reader/UDPReader/UDPReader.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/reader/VTSReader/VTSReader.rc b/src/filters/reader/VTSReader/VTSReader.rc index 72758970d..3d53e1ec7 100644 --- a/src/filters/reader/VTSReader/VTSReader.rc +++ b/src/filters/reader/VTSReader/VTSReader.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.rc b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.rc index ba81d0a6e..fd71850bc 100644 --- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.rc +++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/source/D2VSource/D2VSource.rc b/src/filters/source/D2VSource/D2VSource.rc index ef921da7d..3d29dc5b3 100644 --- a/src/filters/source/D2VSource/D2VSource.rc +++ b/src/filters/source/D2VSource/D2VSource.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/source/DTSAC3Source/DTSAC3Source.rc b/src/filters/source/DTSAC3Source/DTSAC3Source.rc index 5248339da..cf0c60a3c 100644 --- a/src/filters/source/DTSAC3Source/DTSAC3Source.rc +++ b/src/filters/source/DTSAC3Source/DTSAC3Source.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/source/FLACSource/FLACSource.rc b/src/filters/source/FLACSource/FLACSource.rc index 6fbda23af..1a9e2d4d1 100644 --- a/src/filters/source/FLACSource/FLACSource.rc +++ b/src/filters/source/FLACSource/FLACSource.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/source/FLICSource/FLICSource.rc b/src/filters/source/FLICSource/FLICSource.rc index dca99124f..268886dc4 100644 --- a/src/filters/source/FLICSource/FLICSource.rc +++ b/src/filters/source/FLICSource/FLICSource.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/source/ShoutcastSource/ShoutcastSource.rc b/src/filters/source/ShoutcastSource/ShoutcastSource.rc index fa41f038f..c9c1829b8 100644 --- a/src/filters/source/ShoutcastSource/ShoutcastSource.rc +++ b/src/filters/source/ShoutcastSource/ShoutcastSource.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/source/SubtitleSource/SubtitleSource.rc b/src/filters/source/SubtitleSource/SubtitleSource.rc index 140a32b0e..09bde0958 100644 --- a/src/filters/source/SubtitleSource/SubtitleSource.rc +++ b/src/filters/source/SubtitleSource/SubtitleSource.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/switcher/AudioSwitcher/AudioSwitcher.rc b/src/filters/switcher/AudioSwitcher/AudioSwitcher.rc index 1b5f29d92..1b2fd030f 100644 --- a/src/filters/switcher/AudioSwitcher/AudioSwitcher.rc +++ b/src/filters/switcher/AudioSwitcher/AudioSwitcher.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.rc b/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.rc index feb56afc5..4f08df7c3 100644 --- a/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.rc +++ b/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/transform/BufferFilter/BufferFilter.rc b/src/filters/transform/BufferFilter/BufferFilter.rc index c5a9f91d9..bd588a885 100644 --- a/src/filters/transform/BufferFilter/BufferFilter.rc +++ b/src/filters/transform/BufferFilter/BufferFilter.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/transform/DeCSSFilter/DeCSSFilter.rc b/src/filters/transform/DeCSSFilter/DeCSSFilter.rc index bad5361b9..7534937a5 100644 --- a/src/filters/transform/DeCSSFilter/DeCSSFilter.rc +++ b/src/filters/transform/DeCSSFilter/DeCSSFilter.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.rc b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.rc index 03733cbd6..267339704 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.rc +++ b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.rc b/src/filters/transform/MpaDecFilter/MpaDecFilter.rc index b90ed5bfd..a3ced1b27 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecFilter.rc +++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.rc b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.rc index 0b9270b40..80e75b9d5 100644 --- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.rc +++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/transform/VSFilter/res/VSFilter.rc2 b/src/filters/transform/VSFilter/res/VSFilter.rc2 index 2d01cebbe..6febc73ea 100644 --- a/src/filters/transform/VSFilter/res/VSFilter.rc2 +++ b/src/filters/transform/VSFilter/res/VSFilter.rc2 @@ -10,7 +10,7 @@ ///////////////////////////////////////////////////////////////////////////// // Add manually edited resources here... #include "resource.h" -#include "version.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/version.sh b/version.sh index a67def0a6..53e29cddc 100644 --- a/version.sh +++ b/version.sh @@ -1,80 +1,80 @@ -#!/bin/sh -# (C) 2012 see Authors.txt -# -# This file is part of MPC-HC. -# -# MPC-HC is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# MPC-HC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -[ -n "$1" ] && cd $1 -# This is the last svn changeset, the number and hash can be automatically -# calculated, but it is slow to do that. So it is better to have it hardcoded. -# We'll need to update this with the last svn data before committing this script -SVNREV=5597 -SVNHASH="f669833b77e6515dc5f0a682c5bf665f9a81b2ec" - +#!/bin/sh +# (C) 2012 see Authors.txt +# +# This file is part of MPC-HC. +# +# MPC-HC is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# MPC-HC is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +[ -n "$1" ] && cd $1 +# This is the last svn changeset, the number and hash can be automatically +# calculated, but it is slow to do that. So it is better to have it hardcoded. +# We'll need to update this with the last svn data before committing this script +SVNREV=5597 +SVNHASH="f669833b77e6515dc5f0a682c5bf665f9a81b2ec" + if [ ! -d ".git" ] ; then # If the folder ".git" doesn't exist we use hardcoded values HASH=0000000 - VER=0 -else + VER=0 +else # Get the current branch name BRANCH=`git branch | grep "^\*" | awk '{print $2}'` - # If we are on the master branch - if [ "$BRANCH" == "master" ] ; then - BASE="HEAD" - # If we are on another branch that isn't master, we want extra info like on + # If we are on the master branch + if [ "$BRANCH" == "master" ] ; then + BASE="HEAD" + # If we are on another branch that isn't master, we want extra info like on # which commit from master it is based on and what its hash is. This assumes we - # won't ever branch from a changeset from before the move to git - else - # Get where the branch is based on master - BASE=`git merge-base master HEAD` - - VERSION_INFO+="#define MPCHC_BRANCH _T(\"$BRANCH\")\n" - fi - - # Count how many changesets we have since the last svn changeset - VER=`git rev-list $SVNHASH..$BASE | wc -l` - # Now add it with to last svn revision number - VER=$(($VER+$SVNREV)) - - # Get the abbreviated hash of the current changeset - HASH=`git log -n1 --format=%h` - -fi - + # won't ever branch from a changeset from before the move to git + else + # Get where the branch is based on master + BASE=`git merge-base master HEAD` + + VERSION_INFO+="#define MPCHC_BRANCH _T(\"$BRANCH\")\n" + fi + + # Count how many changesets we have since the last svn changeset + VER=`git rev-list $SVNHASH..$BASE | wc -l` + # Now add it with to last svn revision number + VER=$(($VER+$SVNREV)) + + # Get the abbreviated hash of the current changeset + HASH=`git log -n1 --format=%h` + +fi + VERSION_INFO+="#define MPCHC_HASH _T(\"$HASH\")\n" -VERSION_INFO+="#define MPC_VERSION_REV $VER" - +VERSION_INFO+="#define MPC_VERSION_REV $VER" + if [ "$BRANCH" ] ; then echo -e "On branch: $BRANCH" fi -echo -e "Hash: $HASH" +echo -e "Hash: $HASH" if [ "$BRANCH" ] && git status | grep -q "modified:" ; then - echo -e "Revision: $VER (Local modifications found)" -else - echo -e "Revision: $VER" -fi - -if [ -f ./include/version_rev.h ] ; then - VERSION_INFO_OLD=`<./include/version_rev.h` -fi - -# Only write the files if the version information has changed -if [ "$(echo $VERSION_INFO | sed -e 's/\\n/ /g')" != "$(echo $VERSION_INFO_OLD)" ] ; then - # Write the version information to version_rev.h - echo -e $VERSION_INFO > ./include/version_rev.h - - # Update the revision number in the manifest file - sed -e "s/\\\$WCREV\\\$/${VER}/" ./src/mpc-hc/res/mpc-hc.exe.manifest.conf > ./src/mpc-hc/res/mpc-hc.exe.manifest -fi + echo -e "Revision: $VER (Local modifications found)" +else + echo -e "Revision: $VER" +fi + +if [ -f ./include/version_rev.h ] ; then + VERSION_INFO_OLD=`<./include/version_rev.h` +fi + +# Only write the files if the version information has changed +if [ "$(echo $VERSION_INFO | sed -e 's/\\n/ /g')" != "$(echo $VERSION_INFO_OLD)" ] ; then + # Write the version information to version_rev.h + echo -e $VERSION_INFO > ./include/version_rev.h + + # Update the revision number in the manifest file + sed -e "s/\\\$WCREV\\\$/${VER}/" ./src/mpc-hc/res/mpc-hc.exe.manifest.conf > ./src/mpc-hc/res/mpc-hc.exe.manifest +fi -- cgit v1.2.3