diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-10-01 14:29:33 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-10-01 14:29:33 +0400 |
| commit | 5067b0b48d4d15b24669c8032b28e90e45202801 (patch) | |
| tree | d39e51c7ac00e7b42701baf82fedb7dc12856923 /src/apps/VSConv | |
| parent | 907cde437174371aac6741c1d435a0088d66f459 (diff) | |
legacy branch: merge changes from trunk 2635-2642,2645,2658-2660, updated apps project files
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/branches/legacy@2661 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/apps/VSConv')
| -rw-r--r-- | src/apps/VSConv/VSConv.rc | 56 | ||||
| -rw-r--r-- | src/apps/VSConv/VSConv_2010.sln | 4 |
2 files changed, 6 insertions, 54 deletions
diff --git a/src/apps/VSConv/VSConv.rc b/src/apps/VSConv/VSConv.rc index a1bc970df..94b9ef9a4 100644 --- a/src/apps/VSConv/VSConv.rc +++ b/src/apps/VSConv/VSConv.rc @@ -13,50 +13,14 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Hungarian resources
+// English (U.S.) resources
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HUN)
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
-LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
-#pragma code_page(1250)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
#endif //_WIN32
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""afxres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
- "#define _AFX_NO_OLE_RESOURCES\r\n"
- "#define _AFX_NO_TRACKER_RESOURCES\r\n"
- "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
- "\r\n"
- "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
- "LANGUAGE 9, 1\r\n"
- "#pragma code_page(1252)\r\n"
- "#include ""res\\VSConv.rc2"" // non-Microsoft Visual C++ edited resources\r\n"
- "#include ""afxres.rc"" // Standard components\r\n"
- "#endif\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
@@ -69,18 +33,6 @@ IDR_MAINFRAME ICON "res\\VSConv_2010.ico" #else
IDR_MAINFRAME ICON "res\\VSConv.ico"
#endif
-#endif // Hungarian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/src/apps/VSConv/VSConv_2010.sln b/src/apps/VSConv/VSConv_2010.sln index 49e00b897..a3eb0c1e2 100644 --- a/src/apps/VSConv/VSConv_2010.sln +++ b/src/apps/VSConv/VSConv_2010.sln @@ -1,8 +1,8 @@ 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}"
+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}"
+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
|