diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-12-11 00:45:47 +0300 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-12-11 00:45:47 +0300 |
| commit | 370423a2f6cb42886b80f8ec395a816cd3b5a7a3 (patch) | |
| tree | d828c66b90f29572a38665074a31fc0a0d970d4e | |
| parent | 0f75cd565862dc42e86f90037fa063e8854dfbcb (diff) | |
various version related changes:
-prefix VERSION_MAJOR,MINOR,REV AND PATCH with "MPC_"
-defined the needed stuff in version.h and I used those everywhere so it's easier to change the copyright or the version scheme in the future
-add version.h in the project files
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2762 10f7b99b-c216-0410-bff0-8a66a9350fd8
66 files changed, 243 insertions, 206 deletions
diff --git a/distrib/mpc-hc_setup.iss b/distrib/mpc-hc_setup.iss index 77fc81b2d..93451bee1 100644 --- a/distrib/mpc-hc_setup.iss +++ b/distrib/mpc-hc_setup.iss @@ -18,11 +18,12 @@ ;From now on you won't need to change anything
-;workaround since ISPP doesn't work with relative paths
+;workaround since ISPP doesn't work with relative paths and is buggy
+#define ISPP_IS_BUGGY
#include "Installer\..\..\include\Version.h"
#define app_name "Media Player Classic - Home Cinema"
-#define app_version str(VERSION_MAJOR) + "." + str(VERSION_MINOR) + "." + str(VERSION_REV) + "." + str(VERSION_PATCH)
+#define app_version str(MPC_VERSION_MAJOR) + "." + str(MPC_VERSION_MINOR) + "." + str(MPC_VERSION_REV) + "." + str(MPC_VERSION_PATCH)
#define app_url "http://mpc-hc.sourceforge.net/"
diff --git a/include/SubWCRev.h b/include/SubWCRev.h index 143488342..4681f7479 100644 --- a/include/SubWCRev.h +++ b/include/SubWCRev.h @@ -1 +1 @@ -#define VERSION_REV $WCREV$
+#define MPC_VERSION_REV $WCREV$
diff --git a/include/Version.h b/include/Version.h index eebe33c27..7f40828e9 100644 --- a/include/Version.h +++ b/include/Version.h @@ -1,3 +1,13 @@ +// Notes:
+// * Do not use /* */ since ISPP is buggy and it will throw an error.
+// * NO_VERSION_REV_NEEDED is defined in those cases where we don't need the revision
+// number, but only the major/minor version so the compiler does not rebuild everything.
+// It's used in mpcresources and mpciconlib projects.
+// * ISPP_IS_BUGGY is defined in the installer script only and it's just a workaround
+// for ISPP being buggy and throwing an error.
+// * DIRECTX_SDK_DATE is the date of the DirectX SDK used for compilation and it's used
+// in the error message in mpc-hc and in the installer when the DX runtime is out of date.
+
#pragma once
#ifndef NO_VERSION_REV_NEEDED
@@ -7,10 +17,18 @@ #define DO_MAKE_STR(x) #x
#define MAKE_STR(x) DO_MAKE_STR(x)
-#define VERSION_MAJOR 1
-#define VERSION_MINOR 4
-#define VERSION_PATCH 0
+#define MPC_VERSION_MAJOR 1
+#define MPC_VERSION_MINOR 4
+#define MPC_VERSION_PATCH 0
+
+#define MPC_COMP_NAME "MPC-HC Team"
+#define MPC_COPYRIGHT "Copyright (C) 2002-2010 see AUTHORS file"
+
+#ifndef ISPP_IS_BUGGY
+#define MPC_VERSION MPC_VERSION_MAJOR,MPC_VERSION_MINOR,MPC_VERSION_REV,MPC_VERSION_PATCH
+#define MPC_VERSION_STR MAKE_STR(MPC_VERSION_MAJOR) ", " MAKE_STR(MPC_VERSION_MINOR) ", " MAKE_STR(MPC_VERSION_REV) ", " MAKE_STR(MPC_VERSION_PATCH)
+#define MPC_VERSION_SHORT MPC_VERSION_MAJOR,MPC_VERSION_MINOR,0,0
+#define MPC_VERSION_SHORT_STR MAKE_STR(MPC_VERSION_MAJOR) ", " MAKE_STR(MPC_VERSION_MINOR) ", 0, 0"
+#endif
-// The date of the DirectX SDK used for compilation used in the error message
-// in mpc-hc and in the installer when the DirectX runtime is out of date
-#define DIRECTX_SDK_DATE "June 2010"
+#define DIRECTX_SDK_DATE "June 2010"
diff --git a/src/apps/mplayerc/MiniDump.cpp b/src/apps/mplayerc/MiniDump.cpp index 7e7801050..f52e11747 100644 --- a/src/apps/mplayerc/MiniDump.cpp +++ b/src/apps/mplayerc/MiniDump.cpp @@ -121,7 +121,7 @@ LONG WINAPI CMiniDump::UnhandledExceptionFilter( _EXCEPTION_POINTERS *lpTopLevel _TCHAR szVersion[ 40 ];
GetModuleFileName( NULL, szDumpPath, _MAX_PATH );
- _stprintf_s( szVersion, countof(szVersion), _T(".%d.%d.%d.%d"), VERSION_MAJOR, VERSION_MINOR, VERSION_REV, VERSION_PATCH );
+ _stprintf_s( szVersion, countof(szVersion), _T(".%d.%d.%d.%d"), MPC_VERSION );
_tcscat_s( szDumpPath, _MAX_PATH, szVersion );
_tcscat_s( szDumpPath, _MAX_PATH, _T(".dmp") );
diff --git a/src/apps/mplayerc/mpciconlib/mpciconlib.h b/src/apps/mplayerc/mpciconlib/mpciconlib.h index f79b67623..4079cd3a1 100644 --- a/src/apps/mplayerc/mpciconlib/mpciconlib.h +++ b/src/apps/mplayerc/mpciconlib/mpciconlib.h @@ -40,9 +40,6 @@ #define IDI_OTHER_ICON 33
#define IDI_DVDA_ICON 34
#define IDI_DVDF_ICON 35
-#ifndef WINVER
-#define WINVER 0x0600
-#endif
#define IDI_NONE -1
diff --git a/src/apps/mplayerc/mpciconlib/mpciconlib.rc b/src/apps/mplayerc/mpciconlib/mpciconlib.rc index 09c31c1a2..b7463e923 100644 --- a/src/apps/mplayerc/mpciconlib/mpciconlib.rc +++ b/src/apps/mplayerc/mpciconlib/mpciconlib.rc @@ -98,8 +98,8 @@ IDI_DVDF_ICON ICON "icons\\dvdf.ico" //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,0,0
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,0,0
+ FILEVERSION MPC_VERSION_SHORT
+ PRODUCTVERSION MPC_VERSION_SHORT
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -115,14 +115,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "Media Player Classic - Home Cinema Icon Library"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "Media Player Classic - Home Cinema Icon Library"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", 0, 0 "
+ VALUE "FileVersion", MPC_VERSION_SHORT_STR
VALUE "InternalName", "mpciconlib"
- VALUE "LegalCopyright", "2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "mpciconlib.dll"
VALUE "ProductName", "Media Player Classic - Home Cinema Icon Library"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", 0, 0 "
+ VALUE "ProductVersion", MPC_VERSION_SHORT_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/apps/mplayerc/mpciconlib/mpciconlib.vcproj b/src/apps/mplayerc/mpciconlib/mpciconlib.vcproj index c56641796..50c340180 100644 --- a/src/apps/mplayerc/mpciconlib/mpciconlib.vcproj +++ b/src/apps/mplayerc/mpciconlib/mpciconlib.vcproj @@ -186,6 +186,10 @@ RelativePath=".\mpciconlib.h"
>
</File>
+ <File
+ RelativePath="..\..\..\..\include\Version.h"
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
diff --git a/src/apps/mplayerc/mpciconlib/mpciconlib.vcxproj b/src/apps/mplayerc/mpciconlib/mpciconlib.vcxproj index a85cdb7b2..465117a1d 100644 --- a/src/apps/mplayerc/mpciconlib/mpciconlib.vcxproj +++ b/src/apps/mplayerc/mpciconlib/mpciconlib.vcxproj @@ -87,6 +87,7 @@ <ClCompile Include="mpciconlib.cpp" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\..\include\Version.h" />
<ClInclude Include="mpciconlib.h" />
</ItemGroup>
<ItemGroup>
diff --git a/src/apps/mplayerc/mpciconlib/mpciconlib.vcxproj.filters b/src/apps/mplayerc/mpciconlib/mpciconlib.vcxproj.filters index bf18b6a2c..4bd7107fc 100644 --- a/src/apps/mplayerc/mpciconlib/mpciconlib.vcxproj.filters +++ b/src/apps/mplayerc/mpciconlib/mpciconlib.vcxproj.filters @@ -26,6 +26,9 @@ <ClInclude Include="mpciconlib.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\..\include\Version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="mpciconlib.rc">
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.br.rc b/src/apps/mplayerc/mpcresources/mplayerc.br.rc Binary files differindex 65fdde007..0cf48a074 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.br.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.br.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.by.rc b/src/apps/mplayerc/mpcresources/mplayerc.by.rc Binary files differindex cb1fd43eb..0cebfca6f 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.by.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.by.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.ca.rc b/src/apps/mplayerc/mpcresources/mplayerc.ca.rc Binary files differindex 8c0c85f0e..316134e94 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.ca.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.ca.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.cz.rc b/src/apps/mplayerc/mpcresources/mplayerc.cz.rc Binary files differindex 3a2308d5f..15f8e1e2a 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.cz.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.cz.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.de.rc b/src/apps/mplayerc/mpcresources/mplayerc.de.rc Binary files differindex f8feb00a9..fa4f46d83 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.de.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.de.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.es.rc b/src/apps/mplayerc/mpcresources/mplayerc.es.rc Binary files differindex ad1bf99af..a271408d0 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.es.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.es.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.fr.rc b/src/apps/mplayerc/mpcresources/mplayerc.fr.rc Binary files differindex b81182052..55e2454d5 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.fr.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.fr.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.hu.rc b/src/apps/mplayerc/mpcresources/mplayerc.hu.rc Binary files differindex 86d502aa1..085a81381 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.hu.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.hu.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.hy.rc b/src/apps/mplayerc/mpcresources/mplayerc.hy.rc Binary files differindex 9eab8fcbd..3be871615 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.hy.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.hy.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.it.rc b/src/apps/mplayerc/mpcresources/mplayerc.it.rc Binary files differindex ca647d59f..727be2a54 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.it.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.it.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.ja.rc b/src/apps/mplayerc/mpcresources/mplayerc.ja.rc Binary files differindex 2a790f80f..224c28c85 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.ja.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.ja.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.kr.rc b/src/apps/mplayerc/mpcresources/mplayerc.kr.rc Binary files differindex c29613482..ef42f59c2 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.kr.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.kr.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.nl.rc b/src/apps/mplayerc/mpcresources/mplayerc.nl.rc Binary files differindex 085fa7f64..690d5faf3 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.nl.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.nl.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.pl.rc b/src/apps/mplayerc/mpcresources/mplayerc.pl.rc Binary files differindex 15ea5a8a5..50c986cf1 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.pl.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.pl.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.ru.rc b/src/apps/mplayerc/mpcresources/mplayerc.ru.rc Binary files differindex 7eedf2ec2..bf037e2a5 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.ru.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.ru.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.sc.rc b/src/apps/mplayerc/mpcresources/mplayerc.sc.rc Binary files differindex 4139b865b..8dd6e5d35 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.sc.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.sc.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.sk.rc b/src/apps/mplayerc/mpcresources/mplayerc.sk.rc Binary files differindex 21842099e..aa25e7423 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.sk.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.sk.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.sv.rc b/src/apps/mplayerc/mpcresources/mplayerc.sv.rc Binary files differindex 9bfe46e94..a81614d7e 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.sv.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.sv.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.tc.rc b/src/apps/mplayerc/mpcresources/mplayerc.tc.rc Binary files differindex a4807fd17..7044430a2 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.tc.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.tc.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.tr.rc b/src/apps/mplayerc/mpcresources/mplayerc.tr.rc Binary files differindex 0fbfcd1df..7a830b5d0 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.tr.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.tr.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.ua.rc b/src/apps/mplayerc/mpcresources/mplayerc.ua.rc Binary files differindex f8571782d..47b1c4da9 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.ua.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.ua.rc diff --git a/src/apps/mplayerc/mplayerc.cpp b/src/apps/mplayerc/mplayerc.cpp index 20089c0a0..381e20f4b 100644 --- a/src/apps/mplayerc/mplayerc.cpp +++ b/src/apps/mplayerc/mplayerc.cpp @@ -2021,9 +2021,9 @@ void CMPlayerCApp::SetLanguage (int nLanguage) strSatVersion = Version.GetFileVersionEx();
CString needVersion = L"";
- needVersion += MAKE_STR(VERSION_MAJOR);
+ needVersion += MAKE_STR(MPC_VERSION_MAJOR);
needVersion += L".";
- needVersion += MAKE_STR(VERSION_MINOR);
+ needVersion += MAKE_STR(MPC_VERSION_MINOR);
needVersion += L".0.0";
if ( strSatVersion == needVersion )
diff --git a/src/apps/mplayerc/mplayerc.vcproj b/src/apps/mplayerc/mplayerc.vcproj index 2705dff98..f1369a381 100644 --- a/src/apps/mplayerc/mplayerc.vcproj +++ b/src/apps/mplayerc/mplayerc.vcproj @@ -1362,6 +1362,10 @@ >
</File>
<File
+ RelativePath="..\..\..\include\Version.h"
+ >
+ </File>
+ <File
RelativePath=".\VMROSD.h"
>
</File>
diff --git a/src/apps/mplayerc/mplayerc.vcxproj b/src/apps/mplayerc/mplayerc.vcxproj index a7b5b3d46..3ef5b3a7c 100644 --- a/src/apps/mplayerc/mplayerc.vcxproj +++ b/src/apps/mplayerc/mplayerc.vcxproj @@ -385,6 +385,7 @@ update_version.bat <ClCompile Include="WebServerSocket.cpp" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\include\Version.h" />
<ClInclude Include="AppSettings.h" />
<ClInclude Include="AuthDlg.h" />
<ClInclude Include="BaseGraph.h" />
diff --git a/src/apps/mplayerc/mplayerc.vcxproj.filters b/src/apps/mplayerc/mplayerc.vcxproj.filters index 2558d951d..8ee7786f5 100644 --- a/src/apps/mplayerc/mplayerc.vcxproj.filters +++ b/src/apps/mplayerc/mplayerc.vcxproj.filters @@ -671,6 +671,9 @@ <ClInclude Include="AppSettings.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\include\Version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="res\ani.avi">
diff --git a/src/apps/mplayerc/res/mplayerc.rc2 b/src/apps/mplayerc/res/mplayerc.rc2 index cd757aae3..a09af5d96 100644 --- a/src/apps/mplayerc/res/mplayerc.rc2 +++ b/src/apps/mplayerc/res/mplayerc.rc2 @@ -128,8 +128,8 @@ IDR_HTML_PLAYER HTML "res\\web\\player.html" //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x1fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -145,14 +145,18 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "Based on the original Media Player Classic v6.4.9.0 (C) Gabest"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "Media Player Classic - Home Cinema"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "mpc-hc"
- VALUE "LegalCopyright", "2002-2010 see: http://mpc-hc.svn.sourceforge.net/viewvc/mpc-hc/trunk/src/apps/mplayerc/Authors.txt"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
+ #ifdef _WIN64
+ VALUE "OriginalFilename", "mpc-hc64.exe"
+ #else
VALUE "OriginalFilename", "mpc-hc.exe"
+ #endif
VALUE "ProductName", "Media Player Classic - Home Cinema"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/muxer/DSMMuxer/DSMMuxer.rc b/src/filters/muxer/DSMMuxer/DSMMuxer.rc index 95edf54cb..f08901895 100644 --- a/src/filters/muxer/DSMMuxer/DSMMuxer.rc +++ b/src/filters/muxer/DSMMuxer/DSMMuxer.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "DirectShow Media Muxer"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "DirectShow Media Muxer"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "DSMMuxer.ax"
VALUE "ProductName", "DirectShow Media Muxer"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.rc b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.rc index 714fb3ace..9e3a6a8b3 100644 --- a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.rc +++ b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "Matroska Muxer"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "Matroska Muxer"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "MatroskaMuxer.ax"
VALUE "ProductName", "Matroska Muxer"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/parser/AviSplitter/AviSplitter.rc b/src/filters/parser/AviSplitter/AviSplitter.rc index 44004e2f4..edf5bb497 100644 --- a/src/filters/parser/AviSplitter/AviSplitter.rc +++ b/src/filters/parser/AviSplitter/AviSplitter.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "Avi Splitter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "Avi Splitter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "AviSplitter.ax"
VALUE "ProductName", "Avi Splitter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/parser/DSMSplitter/DSMSplitter.rc b/src/filters/parser/DSMSplitter/DSMSplitter.rc index 73aadae54..96dee32fe 100644 --- a/src/filters/parser/DSMSplitter/DSMSplitter.rc +++ b/src/filters/parser/DSMSplitter/DSMSplitter.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "DSM Splitter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "DSM Splitter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "DSMSplitter.ax"
VALUE "ProductName", "DSM Splitter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/parser/FLVSplitter/FLVSplitter.rc b/src/filters/parser/FLVSplitter/FLVSplitter.rc index 31fd5a9e1..077103a3f 100644 --- a/src/filters/parser/FLVSplitter/FLVSplitter.rc +++ b/src/filters/parser/FLVSplitter/FLVSplitter.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "FLV Splitter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "FLV Splitter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "FLVSplitter.ax"
VALUE "ProductName", "FLV Splitter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/parser/MP4Splitter/MP4Splitter.rc b/src/filters/parser/MP4Splitter/MP4Splitter.rc index 57d41cc91..3ff67d39e 100644 --- a/src/filters/parser/MP4Splitter/MP4Splitter.rc +++ b/src/filters/parser/MP4Splitter/MP4Splitter.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -45,14 +45,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "MP4 Splitter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "MP4 Splitter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "MP4Splitter.ax"
VALUE "ProductName", "MP4 Splitter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.rc b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.rc index 9033e5df4..117cff311 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.rc +++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "Matroska Splitter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "Matroska Splitter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "MatroskaSplitter.ax"
VALUE "ProductName", "Matroska Splitter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/parser/MpaSplitter/MpaSplitter.rc b/src/filters/parser/MpaSplitter/MpaSplitter.rc index aae6ff393..a15a43c19 100644 --- a/src/filters/parser/MpaSplitter/MpaSplitter.rc +++ b/src/filters/parser/MpaSplitter/MpaSplitter.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "Mpa Splitter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "Mpa Splitter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "MpaSplitter.ax"
VALUE "ProductName", "Mpa Splitter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.rc b/src/filters/parser/MpegSplitter/MpegSplitter.rc index debca67ba..a992532cd 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitter.rc +++ b/src/filters/parser/MpegSplitter/MpegSplitter.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "Mpeg Splitter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "Mpeg Splitter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "MpegSplitter.ax"
VALUE "ProductName", "Mpeg Splitter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/parser/OggSplitter/OggSplitter.rc b/src/filters/parser/OggSplitter/OggSplitter.rc index e9fc6a906..63545b608 100644 --- a/src/filters/parser/OggSplitter/OggSplitter.rc +++ b/src/filters/parser/OggSplitter/OggSplitter.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "Ogg Splitter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "Ogg Splitter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "OggSplitter.ax"
VALUE "ProductName", "Ogg Splitter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.rc b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.rc index f34e26440..a4144cf2e 100644 --- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.rc +++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "RealMedia Splitter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "RealMedia Splitter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "RealMediaSplitter.ax"
VALUE "ProductName", "RealMedia Splitter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/parser/SSFSplitter/SSFSplitter.rc b/src/filters/parser/SSFSplitter/SSFSplitter.rc index 89d9ae751..3509a1e78 100644 --- a/src/filters/parser/SSFSplitter/SSFSplitter.rc +++ b/src/filters/parser/SSFSplitter/SSFSplitter.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "SSF Splitter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "SSF Splitter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "SSFSplitter.ax"
VALUE "ProductName", "SSF Splitter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/parser/StreamDriveThru/StreamDriveThru.rc b/src/filters/parser/StreamDriveThru/StreamDriveThru.rc index d98a5931b..ab16a002c 100644 --- a/src/filters/parser/StreamDriveThru/StreamDriveThru.rc +++ b/src/filters/parser/StreamDriveThru/StreamDriveThru.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "StreamDriverThru Filter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "StreamDriverThru Filter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "StreamDriverThru.ax"
VALUE "ProductName", "StreamDriverThru Filter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/reader/CDDAReader/CDDAReader.rc b/src/filters/reader/CDDAReader/CDDAReader.rc index 9f983e9e8..a78269018 100644 --- a/src/filters/reader/CDDAReader/CDDAReader.rc +++ b/src/filters/reader/CDDAReader/CDDAReader.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "CDDA Reader Filter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "CDDA Reader Filter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "CDDAReader.ax"
VALUE "ProductName", "CDDA Reader Filter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/reader/CDXAReader/CDXAReader.rc b/src/filters/reader/CDXAReader/CDXAReader.rc index ec22ebb36..78179b158 100644 --- a/src/filters/reader/CDXAReader/CDXAReader.rc +++ b/src/filters/reader/CDXAReader/CDXAReader.rc @@ -52,8 +52,8 @@ END //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -69,14 +69,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "CDXA Reader Filter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "CDXA Reader Filter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "CDXAReader.ax"
VALUE "ProductName", "CDXA Reader Filter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/reader/UDPReader/UDPReader.rc b/src/filters/reader/UDPReader/UDPReader.rc index f5473ef33..b83520507 100644 --- a/src/filters/reader/UDPReader/UDPReader.rc +++ b/src/filters/reader/UDPReader/UDPReader.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x37L
#ifdef _DEBUG
FILEFLAGS 0x21L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "UDP Reader Filter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "UDP Reader Filter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "UDPReader.ax"
VALUE "ProductName", "UDP Reader Filter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/reader/VTSReader/VTSReader.rc b/src/filters/reader/VTSReader/VTSReader.rc index 91ed09d28..cf2430c54 100644 --- a/src/filters/reader/VTSReader/VTSReader.rc +++ b/src/filters/reader/VTSReader/VTSReader.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x37L
#ifdef _DEBUG
FILEFLAGS 0x21L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "VTS Reader Filter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "VTS Reader Filter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "VTSReader.ax"
VALUE "ProductName", "VTS Reader Filter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.rc b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.rc index 50d072c01..835389da7 100644 --- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.rc +++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.rc @@ -52,8 +52,8 @@ END //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -69,14 +69,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "Audio Renderer, based on SoundTouch"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "MpcAudioRenderer Filter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "MpcAudioRendererFilter.ax"
VALUE "ProductName", "MpcAudioRenderer Filter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/source/D2VSource/D2VSource.rc b/src/filters/source/D2VSource/D2VSource.rc index bd5280263..d8a2d6675 100644 --- a/src/filters/source/D2VSource/D2VSource.rc +++ b/src/filters/source/D2VSource/D2VSource.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "D2V Source Filter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "D2V Source Filter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "D2VSource.ax"
VALUE "ProductName", "D2V Source Filter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/source/DTSAC3Source/DTSAC3Source.rc b/src/filters/source/DTSAC3Source/DTSAC3Source.rc index 051febfc4..007797a59 100644 --- a/src/filters/source/DTSAC3Source/DTSAC3Source.rc +++ b/src/filters/source/DTSAC3Source/DTSAC3Source.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "DTS/AC3 Source Filter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "DTS/AC3 Source Filter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "DTSAC3Source.ax"
VALUE "ProductName", "DTS/AC3 Source Filter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/source/FLICSource/FLICSource.rc b/src/filters/source/FLICSource/FLICSource.rc index 5d6c369c4..b9c34b2d9 100644 --- a/src/filters/source/FLICSource/FLICSource.rc +++ b/src/filters/source/FLICSource/FLICSource.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "FLICSource Filter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "FLICSource Filter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "FLICSource.ax"
VALUE "ProductName", "FLICSource Filter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/source/FlacSource/FlacSource.rc b/src/filters/source/FlacSource/FlacSource.rc index 412a5c492..20f940318 100644 --- a/src/filters/source/FlacSource/FlacSource.rc +++ b/src/filters/source/FlacSource/FlacSource.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "Flac Source Filter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "Flac Source Filter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "FlacSource.ax"
VALUE "ProductName", "Flac Source Filter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/source/ShoutcastSource/ShoutcastSource.rc b/src/filters/source/ShoutcastSource/ShoutcastSource.rc index c1400ecab..b945fc4ab 100644 --- a/src/filters/source/ShoutcastSource/ShoutcastSource.rc +++ b/src/filters/source/ShoutcastSource/ShoutcastSource.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "Shoutcast Source Filter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "Shoutcast Source Filter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "ShoutcastSource.ax"
VALUE "ProductName", "Shoutcast Source Filter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/source/SubtitleSource/SubtitleSource.rc b/src/filters/source/SubtitleSource/SubtitleSource.rc index ef0fa5598..1718220ab 100644 --- a/src/filters/source/SubtitleSource/SubtitleSource.rc +++ b/src/filters/source/SubtitleSource/SubtitleSource.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "SubtitleSource Filter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "SubtitleSource Filter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "SubtitleSource.ax"
VALUE "ProductName", "SubtitleSource Filter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.rc b/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.rc index cde816c23..3028f6312 100644 --- a/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.rc +++ b/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,14 +43,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "AVI <-> AC3/DTS Converter"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "AVI2AC3Filter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "AVI2AC3Filter.ax"
VALUE "ProductName", "AVI2AC3Filter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.rc b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.rc index a2fb2c994..63b27d809 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.rc +++ b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.rc @@ -60,8 +60,8 @@ END //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -77,14 +77,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "H.264/VC-1 DXVA video decoder"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "MPCVideoDec Filter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "MPCVideoDecFilter.ax"
VALUE "ProductName", "MPCVideoDec Filter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.rc b/src/filters/transform/MpaDecFilter/MpaDecFilter.rc index bbe686eef..fcf970f56 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecFilter.rc +++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.rc @@ -52,8 +52,8 @@ END //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -69,14 +69,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "Mpeg Audio Decoder for DirectShow, based on libmad"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "MpaDecFilter Filter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "MpaDecFilter.ax"
VALUE "ProductName", "MpaDecFilter Filter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.rc b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.rc index ef89af9b7..497c74847 100644 --- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.rc +++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.rc @@ -52,8 +52,8 @@ END //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -69,14 +69,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "MPEG-2 Decoder Filter for DirectShow"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", " Mpeg2Dec Filter"
- VALUE "LegalCopyright", "Copyright (C) 2002-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "Mpeg2DecFilter.ax"
VALUE "ProductName", " Mpeg2Dec Filter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
diff --git a/src/filters/transform/VSFilter/DirectVobSubPropPage.cpp b/src/filters/transform/VSFilter/DirectVobSubPropPage.cpp index dbdc1088e..4b4713a64 100644 --- a/src/filters/transform/VSFilter/DirectVobSubPropPage.cpp +++ b/src/filters/transform/VSFilter/DirectVobSubPropPage.cpp @@ -801,9 +801,9 @@ bool CDVSAboutPPage::OnMessage(UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_INITDIALOG:
{
#ifdef _VSMOD
- SetDlgItemTextA( m_Dlg, IDC_VERSION, "DirectVobSub 2.40."MAKE_STR(VERSION_REV)"."MAKE_STR(VERSION_PATCH)" "MAKE_STR(VERSION_ARCH)", MOD\nCopyright 2001-2010 MPC-HC & VSFilterMod Teams" );
+ SetDlgItemTextA( m_Dlg, IDC_VERSION, "DirectVobSub 2.40."MAKE_STR(MPC_VERSION_REV)"."MAKE_STR(MPC_VERSION_PATCH)" "MAKE_STR(VERSION_ARCH)", MOD\nCopyright 2001-2010 MPC-HC & VSFilterMod Teams" );
#else
- SetDlgItemTextA( m_Dlg, IDC_VERSION, "DirectVobSub 2.40."MAKE_STR(VERSION_REV)"."MAKE_STR(VERSION_PATCH)" "MAKE_STR(VERSION_ARCH)"\nCopyright 2001-2010 MPC-HC Team" );
+ SetDlgItemTextA( m_Dlg, IDC_VERSION, "DirectVobSub 2.40."MAKE_STR(MPC_VERSION_REV)"."MAKE_STR(MPC_VERSION_PATCH)" "MAKE_STR(VERSION_ARCH)"\nCopyright 2001-2010 MPC-HC Team" );
#endif
}
break;
diff --git a/src/filters/transform/VSFilter/VSFilter.rc b/src/filters/transform/VSFilter/VSFilter.rc index 5c9d6e355..9b8a07f47 100644 --- a/src/filters/transform/VSFilter/VSFilter.rc +++ b/src/filters/transform/VSFilter/VSFilter.rc @@ -47,8 +47,8 @@ END //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_PATCH
+ FILEVERSION MPC_VERSION
+ PRODUCTVERSION MPC_VERSION
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -64,14 +64,14 @@ BEGIN BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://sourceforge.net/projects/mpc-hc/"
- VALUE "CompanyName", "MPC-HC Team"
+ VALUE "CompanyName", MPC_COMP_NAME
VALUE "FileDescription", "VobSub & TextSub filter for DirectShow/VirtualDub/Avisynth"
- VALUE "FileVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "FileVersion", MPC_VERSION_STR
VALUE "InternalName", "VSFilter"
- VALUE "LegalCopyright", "Copyright (C) 2001-2010 see AUTHORS file"
+ VALUE "LegalCopyright", MPC_COPYRIGHT
VALUE "OriginalFilename", "VSFilter.dll"
VALUE "ProductName", "VSFilter"
- VALUE "ProductVersion", MAKE_STR(VERSION_MAJOR) ", " MAKE_STR(VERSION_MINOR) ", " MAKE_STR(VERSION_REV) ", " MAKE_STR(VERSION_PATCH)
+ VALUE "ProductVersion", MPC_VERSION_STR
END
END
BLOCK "VarFileInfo"
@@ -570,7 +570,8 @@ END //
// Generated from the TEXTINCLUDE 3 resource.
//
-
+
+
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
diff --git a/update_version.bat b/update_version.bat index c643b8b98..984053890 100644 --- a/update_version.bat +++ b/update_version.bat @@ -6,6 +6,6 @@ IF %ERRORLEVEL% NEQ 0 GOTO :NoSubWCRev GOTO :EOF
:NoSubWCRev
-ECHO:NoSubWCRev, will use VERSION_REV=0
-ECHO:#define VERSION_REV 0 >include\Version_rev.h
+ECHO:NoSubWCRev, will use MPC_VERSION_REV=0
+ECHO:#define MPC_VERSION_REV 0 >include\Version_rev.h
COPY /Y src\apps\mplayerc\res\mpc-hc.exe.manifest.template src\apps\mplayerc\res\mpc-hc.exe.manifest
|