Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/mpc-hc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src/apps
diff options
context:
space:
mode:
authorXhmikosR <xhmikosr@users.sourceforge.net>2010-09-25 15:07:02 +0400
committerXhmikosR <xhmikosr@users.sourceforge.net>2010-09-25 15:07:02 +0400
commit7cab39fd0e4c98cfa4ab3bd676a55ad1dafa577e (patch)
treecc7dc60cedd8c2ab86825c0519c20c4c75a7c638 /src/apps
parentb98950311e0d4876f08001aee30e95710260324e (diff)
legacy branch: vsconv can now be compiled with VS2008/VS2010
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/branches/legacy@2628 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/apps')
-rw-r--r--src/apps/VSRip/stdafx.h10
-rw-r--r--src/apps/vsconv/Resource.h1
-rw-r--r--src/apps/vsconv/res/vsconv.manifest21
-rw-r--r--src/apps/vsconv/res/vsconv.rc2
-rw-r--r--src/apps/vsconv/stdafx.cpp1
-rw-r--r--src/apps/vsconv/stdafx.h9
-rw-r--r--src/apps/vsconv/vsconv.cpp1
-rw-r--r--src/apps/vsconv/vsconv.h3
-rw-r--r--src/apps/vsconv/vsconv.vcproj26
-rw-r--r--src/apps/vsconv/vsconv.vcxproj151
-rw-r--r--src/apps/vsconv/vsconv.vcxproj.filters55
-rw-r--r--src/apps/vsconv/vsconvDlg.cpp1
-rw-r--r--src/apps/vsconv/vsconvDlg.h1
-rw-r--r--src/apps/vsconv/vsconv_2010.sln53
14 files changed, 295 insertions, 40 deletions
diff --git a/src/apps/VSRip/stdafx.h b/src/apps/VSRip/stdafx.h
index 2efc10c67..14875f780 100644
--- a/src/apps/VSRip/stdafx.h
+++ b/src/apps/VSRip/stdafx.h
@@ -24,7 +24,7 @@
#pragma once
#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
+#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
#endif
#ifndef WINVER
@@ -36,12 +36,12 @@
// turns off MFC's hiding of some common and often safely ignored warning messages
#define _AFX_ALL_WARNINGS
-#include <afxwin.h> // MFC core and standard components
-#include <afxext.h> // MFC extensions
-#include <afxdisp.h> // MFC Automation classes
+#include <afxwin.h> // MFC core and standard components
+#include <afxext.h> // MFC extensions
+#include <afxdisp.h> // MFC Automation classes
#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h> // MFC support for Windows Common Controls
+#include <afxcmn.h> // MFC support for Windows Common Controls
#endif // _AFX_NO_AFXCMN_SUPPORT
#include <streams.h>
diff --git a/src/apps/vsconv/Resource.h b/src/apps/vsconv/Resource.h
index 02e43e2fe..ab4f465eb 100644
--- a/src/apps/vsconv/Resource.h
+++ b/src/apps/vsconv/Resource.h
@@ -2,7 +2,6 @@
// Microsoft Visual C++ generated include file.
// Used by vsconv.rc
//
-#define IDR_MANIFEST 1
#define IDM_ABOUTBOX 0x0010
#define IDS_ABOUTBOX 101
#define IDD_VSCONV_DIALOG 102
diff --git a/src/apps/vsconv/res/vsconv.manifest b/src/apps/vsconv/res/vsconv.manifest
index 21733e27c..92f16fe81 100644
--- a/src/apps/vsconv/res/vsconv.manifest
+++ b/src/apps/vsconv/res/vsconv.manifest
@@ -1,22 +1,33 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <assemblyIdentity
+ <!--assemblyIdentity
version="1.0.0.0"
- processorArchitecture="X86"
+ processorArchitecture="*"
name="Microsoft.Windows.vsconv"
type="win32"
- />
- <description>Your app description here</description>
+ /-->
+ <description>vsconv</description>
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
- processorArchitecture="X86"
+ processorArchitecture="*"
publicKeyToken="6595b64144ccf1df"
language="*"
/>
</dependentAssembly>
</dependency>
+ <!-- Identify the application security requirements -->
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel
+ level="asInvoker"
+ uiAccess="false"
+ />
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
</assembly>
diff --git a/src/apps/vsconv/res/vsconv.rc b/src/apps/vsconv/res/vsconv.rc
index 9aa9e4364..792468c7d 100644
--- a/src/apps/vsconv/res/vsconv.rc
+++ b/src/apps/vsconv/res/vsconv.rc
@@ -160,7 +160,7 @@ END
// RT_MANIFEST
//
-IDR_MANIFEST RT_MANIFEST "res\\vsconv.manifest"
+IDR_MANIFEST RT_MANIFEST "vsconv.manifest"
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/src/apps/vsconv/stdafx.cpp b/src/apps/vsconv/stdafx.cpp
index b40a03cf9..330aa272d 100644
--- a/src/apps/vsconv/stdafx.cpp
+++ b/src/apps/vsconv/stdafx.cpp
@@ -2,6 +2,7 @@
* $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This file is part of vsconv.
*
diff --git a/src/apps/vsconv/stdafx.h b/src/apps/vsconv/stdafx.h
index 1b6626a8c..a55358e5a 100644
--- a/src/apps/vsconv/stdafx.h
+++ b/src/apps/vsconv/stdafx.h
@@ -2,6 +2,7 @@
* $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This file is part of vsconv.
*
@@ -26,10 +27,8 @@
#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
#endif
-// Modify the following defines if you have to target a platform prior to the ones specified below.
-// Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER // Allow use of features specific to Windows 95 and Windows NT 4 or later.
-#define WINVER 0x0600 // Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
+#ifndef WINVER
+#define WINVER 0x0600
#endif
#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
@@ -40,8 +39,6 @@
#include <afxwin.h> // MFC core and standard components
#include <afxext.h> // MFC extensions
#include <afxdisp.h> // MFC Automation classes
-#include <afxdlgs.h>
-#include <atlbase.h>
#ifndef _AFX_NO_AFXCMN_SUPPORT
#include <afxcmn.h> // MFC support for Windows Common Controls
diff --git a/src/apps/vsconv/vsconv.cpp b/src/apps/vsconv/vsconv.cpp
index 58e0b5586..0d69ae918 100644
--- a/src/apps/vsconv/vsconv.cpp
+++ b/src/apps/vsconv/vsconv.cpp
@@ -2,6 +2,7 @@
* $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This file is part of vsconv.
*
diff --git a/src/apps/vsconv/vsconv.h b/src/apps/vsconv/vsconv.h
index 5c5b5e9a5..ff07cdce8 100644
--- a/src/apps/vsconv/vsconv.h
+++ b/src/apps/vsconv/vsconv.h
@@ -2,6 +2,7 @@
* $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This file is part of vsconv.
*
@@ -47,4 +48,4 @@ public:
DECLARE_MESSAGE_MAP()
};
-extern CvsconvApp theApp; \ No newline at end of file
+extern CvsconvApp theApp;
diff --git a/src/apps/vsconv/vsconv.vcproj b/src/apps/vsconv/vsconv.vcproj
index a72de0a63..9f8d8af9e 100644
--- a/src/apps/vsconv/vsconv.vcproj
+++ b/src/apps/vsconv/vsconv.vcproj
@@ -18,10 +18,10 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)bin\$(Configuration)_$(Platform)\"
+ OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)_$(PlatformName)\"
ConfigurationType="1"
InheritedPropertySheets="..\..\common.vsprops;..\..\debug.vsprops"
- UseOfMFC="2"
+ UseOfMFC="1"
CharacterSet="1"
>
<Tool
@@ -43,13 +43,8 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories="..\..\..\include\atl;..\..\filters\BaseClasses"
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- TreatWChar_tAsBuiltInType="false"
UsePrecompiledHeader="2"
DebugInformationFormat="4"
/>
@@ -81,6 +76,7 @@
/>
<Tool
Name="VCManifestTool"
+ AdditionalManifestFiles="res/vsconv.manifest"
/>
<Tool
Name="VCXDCMakeTool"
@@ -100,7 +96,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)bin\$(Configuration)_$(Platform)\"
+ OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)_$(PlatformName)\"
ConfigurationType="1"
InheritedPropertySheets="..\..\common.vsprops;..\..\release.vsprops"
UseOfMFC="1"
@@ -125,16 +121,8 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- OmitFramePointers="true"
AdditionalIncludeDirectories="..\..\..\include\atl;..\..\filters\BaseClasses"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG"
- StringPooling="true"
- MinimalRebuild="false"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- TreatWChar_tAsBuiltInType="false"
UsePrecompiledHeader="2"
DebugInformationFormat="3"
/>
@@ -166,6 +154,7 @@
/>
<Tool
Name="VCManifestTool"
+ AdditionalManifestFiles="res/vsconv.manifest"
/>
<Tool
Name="VCXDCMakeTool"
@@ -181,7 +170,6 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="..\..\..\bin\upx.exe --best --compress-icons=0 &quot;$(TargetPath)&quot;"
/>
</Configuration>
</Configurations>
@@ -251,10 +239,6 @@
>
</File>
<File
- RelativePath=".\res\vsconv.manifest"
- >
- </File>
- <File
RelativePath=".\res\vsconv.rc"
>
</File>
diff --git a/src/apps/vsconv/vsconv.vcxproj b/src/apps/vsconv/vsconv.vcxproj
new file mode 100644
index 000000000..fe31e7866
--- /dev/null
+++ b/src/apps/vsconv/vsconv.vcxproj
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{F655A8A5-A73E-4EE0-89B4-2758055B3768}</ProjectGuid>
+ <RootNamespace>vsconv</RootNamespace>
+ <Keyword>MFCProj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>Static</UseOfMfc>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>Static</UseOfMfc>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\common.props" />
+ <Import Project="..\..\release.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\common.props" />
+ <Import Project="..\..\debug.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin10\$(Configuration)_$(Platform)\</OutDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin10\$(Configuration)_$(Platform)\</OutDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>false</MkTypLibCompatible>
+ </Midl>
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\..\include\atl;..\..\filters\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>res/vsconv.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>false</MkTypLibCompatible>
+ </Midl>
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\..\include\atl;..\..\filters\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>res/vsconv.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="stdafx.cpp">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="vsconv.cpp" />
+ <ClCompile Include="vsconvDlg.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="Resource.h" />
+ <ClInclude Include="stdafx.h" />
+ <ClInclude Include="vsconv.h" />
+ <ClInclude Include="vsconvDlg.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="res\vsconv.ico" />
+ <None Include="res\vsconv.rc2" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="res\vsconv.rc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\filters\BaseClasses\BaseClasses.vcxproj">
+ <Project>{e8a3f6fa-ae1c-4c8e-a0b6-9c8480324eaa}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\SubPic\SubPic.vcxproj">
+ <Project>{d514ea4d-eafb-47a9-a437-a582ca571251}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\subtitles\subtitles.vcxproj">
+ <Project>{5e56335f-0fb1-4eea-b240-d8dc5e0608e4}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project> \ No newline at end of file
diff --git a/src/apps/vsconv/vsconv.vcxproj.filters b/src/apps/vsconv/vsconv.vcxproj.filters
new file mode 100644
index 000000000..6b813ad10
--- /dev/null
+++ b/src/apps/vsconv/vsconv.vcxproj.filters
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{ec560900-0d86-4c5c-bfc4-9cfdb3a4b3a1}</UniqueIdentifier>
+ <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{97215e44-364d-4272-83fc-47c0232674e3}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{6c60f017-2023-4f2f-b6e1-ad0f841d816b}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="stdafx.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="vsconv.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="vsconvDlg.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="Resource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="stdafx.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="vsconv.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="vsconvDlg.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="res\vsconv.ico">
+ <Filter>Resource Files</Filter>
+ </None>
+ <None Include="res\vsconv.rc2">
+ <Filter>Resource Files</Filter>
+ </None>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="res\vsconv.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+</Project> \ No newline at end of file
diff --git a/src/apps/vsconv/vsconvDlg.cpp b/src/apps/vsconv/vsconvDlg.cpp
index d3c4ea703..9cee2a72d 100644
--- a/src/apps/vsconv/vsconvDlg.cpp
+++ b/src/apps/vsconv/vsconvDlg.cpp
@@ -2,6 +2,7 @@
* $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This file is part of vsconv.
*
diff --git a/src/apps/vsconv/vsconvDlg.h b/src/apps/vsconv/vsconvDlg.h
index beb2c6b1a..72ffd0ba2 100644
--- a/src/apps/vsconv/vsconvDlg.h
+++ b/src/apps/vsconv/vsconvDlg.h
@@ -2,6 +2,7 @@
* $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This file is part of vsconv.
*
diff --git a/src/apps/vsconv/vsconv_2010.sln b/src/apps/vsconv/vsconv_2010.sln
new file mode 100644
index 000000000..627d8c0db
--- /dev/null
+++ b/src/apps/vsconv/vsconv_2010.sln
@@ -0,0 +1,53 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsconv", "vsconv.vcxproj", "{F655A8A5-A73E-4EE0-89B4-2758055B3768}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "subtitles", "..\..\subtitles\subtitles.vcxproj", "{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseClasses", "..\..\filters\BaseClasses\BaseClasses.vcxproj", "{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SubPic", "..\..\SubPic\SubPic.vcxproj", "{D514EA4D-EAFB-47A9-A437-A582CA571251}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {F655A8A5-A73E-4EE0-89B4-2758055B3768}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F655A8A5-A73E-4EE0-89B4-2758055B3768}.Debug|Win32.Build.0 = Debug|Win32
+ {F655A8A5-A73E-4EE0-89B4-2758055B3768}.Debug|x64.ActiveCfg = Debug|Win32
+ {F655A8A5-A73E-4EE0-89B4-2758055B3768}.Release|Win32.ActiveCfg = Release|Win32
+ {F655A8A5-A73E-4EE0-89B4-2758055B3768}.Release|Win32.Build.0 = Release|Win32
+ {F655A8A5-A73E-4EE0-89B4-2758055B3768}.Release|x64.ActiveCfg = Release|Win32
+ {5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug|Win32.ActiveCfg = Debug|Win32
+ {5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug|Win32.Build.0 = Debug|Win32
+ {5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug|x64.ActiveCfg = Debug|x64
+ {5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug|x64.Build.0 = Debug|x64
+ {5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release|Win32.ActiveCfg = Release|Win32
+ {5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release|Win32.Build.0 = Release|Win32
+ {5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release|x64.ActiveCfg = Release|x64
+ {5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release|x64.Build.0 = Release|x64
+ {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|Win32.Build.0 = Debug|Win32
+ {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|x64.ActiveCfg = Debug|x64
+ {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|x64.Build.0 = Debug|x64
+ {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|Win32.ActiveCfg = Release|Win32
+ {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|Win32.Build.0 = Release|Win32
+ {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|x64.ActiveCfg = Release|x64
+ {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|x64.Build.0 = Release|x64
+ {D514EA4D-EAFB-47A9-A437-A582CA571251}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D514EA4D-EAFB-47A9-A437-A582CA571251}.Debug|Win32.Build.0 = Debug|Win32
+ {D514EA4D-EAFB-47A9-A437-A582CA571251}.Debug|x64.ActiveCfg = Debug|x64
+ {D514EA4D-EAFB-47A9-A437-A582CA571251}.Debug|x64.Build.0 = Debug|x64
+ {D514EA4D-EAFB-47A9-A437-A582CA571251}.Release|Win32.ActiveCfg = Release|Win32
+ {D514EA4D-EAFB-47A9-A437-A582CA571251}.Release|Win32.Build.0 = Release|Win32
+ {D514EA4D-EAFB-47A9-A437-A582CA571251}.Release|x64.ActiveCfg = Release|x64
+ {D514EA4D-EAFB-47A9-A437-A582CA571251}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal