diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-01-15 04:25:04 +0300 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-01-15 04:25:04 +0300 |
| commit | a10493b2eedbed40b0ca028d7b512dabca84556a (patch) | |
| tree | bdb488d4a9dffdc788a92f97eb9461b07a90b792 /src/apps/mplayerc | |
| parent | 001cf8d4a8999557a10d28ef1ecf3223c6d973a9 (diff) | |
legacy branch: merge r2845-r2855 from trunk
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/branches/legacy@2856 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/apps/mplayerc')
63 files changed, 220 insertions, 1304 deletions
diff --git a/src/apps/mplayerc/ChildView.cpp b/src/apps/mplayerc/ChildView.cpp index 0349125e9..2ede8103d 100644 --- a/src/apps/mplayerc/ChildView.cpp +++ b/src/apps/mplayerc/ChildView.cpp @@ -268,13 +268,7 @@ LRESULT CChildView::OnNcHitTest(CPoint point) UINT nHitTest = CWnd::OnNcHitTest(point);
CMainFrame* pFrame = ((CMainFrame*)GetParentFrame());
- bool fLeftMouseBtnUnassigned = true;
- AppSettings& s = AfxGetAppSettings();
- POSITION pos = s.wmcmds.GetHeadPosition();
- while(pos && fLeftMouseBtnUnassigned)
- if(s.wmcmds.GetNext(pos).mouse == wmcmd::LDOWN) {
- fLeftMouseBtnUnassigned = false;
- }
+ bool fLeftMouseBtnUnassigned = !assignedToCmd(wmcmd::LDOWN);
if(!pFrame->m_fFullScreen && (pFrame->IsCaptionMenuHidden() || fLeftMouseBtnUnassigned)) {
CRect rcClient, rcFrame;
GetWindowRect(&rcFrame);
@@ -315,13 +309,7 @@ LRESULT CChildView::OnNcHitTest(CPoint point) void CChildView::OnNcLButtonDown(UINT nHitTest, CPoint point)
{
CMainFrame* pFrame = ((CMainFrame*)GetParentFrame());
- bool fLeftMouseBtnUnassigned = true;
- AppSettings& s = AfxGetAppSettings();
- POSITION pos = s.wmcmds.GetHeadPosition();
- while(pos && fLeftMouseBtnUnassigned)
- if(s.wmcmds.GetNext(pos).mouse == wmcmd::LDOWN) {
- fLeftMouseBtnUnassigned = false;
- }
+ bool fLeftMouseBtnUnassigned = !assignedToCmd(wmcmd::LDOWN);
if(!pFrame->m_fFullScreen && (pFrame->IsCaptionMenuHidden() || fLeftMouseBtnUnassigned)) {
BYTE bFlag = 0;
switch(nHitTest) {
diff --git a/src/apps/mplayerc/FGFilter.cpp b/src/apps/mplayerc/FGFilter.cpp index 1dd22af4c..1310fafe2 100644 --- a/src/apps/mplayerc/FGFilter.cpp +++ b/src/apps/mplayerc/FGFilter.cpp @@ -107,29 +107,7 @@ CFGFilterRegistry::CFGFilterRegistry(IMoniker* pMoniker, UINT64 merit) m_DisplayName = m_name = str;
CoTaskMemFree(str), str = NULL;
- CComPtr<IPropertyBag> pPB;
- if(SUCCEEDED(m_pMoniker->BindToStorage(0, 0, IID_IPropertyBag, (void**)&pPB))) {
- CComVariant var;
- if(SUCCEEDED(pPB->Read(CComBSTR(_T("FriendlyName")), &var, NULL))) {
- m_name = var.bstrVal;
- var.Clear();
- }
-
- if(SUCCEEDED(pPB->Read(CComBSTR(_T("CLSID")), &var, NULL))) {
- CLSIDFromString(var.bstrVal, &m_clsid);
- var.Clear();
- }
-
- if(SUCCEEDED(pPB->Read(CComBSTR(_T("FilterData")), &var, NULL))) {
- BSTR* pstr;
- if(SUCCEEDED(SafeArrayAccessData(var.parray, (void**)&pstr))) {
- ExtractFilterData((BYTE*)pstr, var.parray->cbElements*(var.parray->rgsabound[0].cElements));
- SafeArrayUnaccessData(var.parray);
- }
-
- var.Clear();
- }
- }
+ QueryProperties();
if(merit != MERIT64_DO_USE) {
m_merit.val = merit;
@@ -152,6 +130,16 @@ CFGFilterRegistry::CFGFilterRegistry(CStringW DisplayName, UINT64 merit) return;
}
+ QueryProperties();
+
+ if(merit != MERIT64_DO_USE) {
+ m_merit.val = merit;
+ }
+}
+
+void CFGFilterRegistry::QueryProperties()
+{
+ ASSERT(m_pMoniker);
CComPtr<IPropertyBag> pPB;
if(SUCCEEDED(m_pMoniker->BindToStorage(0, 0, IID_IPropertyBag, (void**)&pPB))) {
CComVariant var;
@@ -175,10 +163,6 @@ CFGFilterRegistry::CFGFilterRegistry(CStringW DisplayName, UINT64 merit) var.Clear();
}
}
-
- if(merit != MERIT64_DO_USE) {
- m_merit.val = merit;
- }
}
CFGFilterRegistry::CFGFilterRegistry(const CLSID& clsid, UINT64 merit)
diff --git a/src/apps/mplayerc/FGFilter.h b/src/apps/mplayerc/FGFilter.h index b87494a4e..9c66dc441 100644 --- a/src/apps/mplayerc/FGFilter.h +++ b/src/apps/mplayerc/FGFilter.h @@ -94,6 +94,8 @@ public: }
HRESULT Create(IBaseFilter** ppBF, CInterfaceList<IUnknown, &IID_IUnknown>& pUnks);
+private:
+ void QueryProperties();
};
template<class T>
diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp index d73e4ac6e..0bcf136d8 100644 --- a/src/apps/mplayerc/MainFrm.cpp +++ b/src/apps/mplayerc/MainFrm.cpp @@ -1176,13 +1176,7 @@ BOOL CMainFrame::PreTranslateMessage(MSG* pMsg) return FALSE;
*/
if(pMsg->wParam == VK_ESCAPE) {
- bool fEscapeNotAssigned = true;
- AppSettings& s = AfxGetAppSettings();
- POSITION pos = s.wmcmds.GetHeadPosition();
- while(pos && fEscapeNotAssigned)
- if(s.wmcmds.GetNext(pos).key == VK_ESCAPE) {
- fEscapeNotAssigned = false;
- }
+ bool fEscapeNotAssigned = !assignedToCmd(VK_ESCAPE, false);
if(fEscapeNotAssigned) {
if(m_iMediaLoadState == MLS_LOADED && m_fFullScreen) {
@@ -2749,14 +2743,10 @@ BOOL CMainFrame::OnButton(UINT id, UINT nFlags, CPoint point) BOOL ret = FALSE;
- AppSettings& s = AfxGetAppSettings();
- POSITION pos = s.wmcmds.GetHeadPosition();
- while(pos) {
- wmcmd& wc = s.wmcmds.GetNext(pos);
- if(wc.mouse == id) {
- SendMessage(WM_COMMAND, wc.cmd);
- ret = true;
- }
+ WORD cmd = assignedToCmd(id);
+ if(cmd) {
+ SendMessage(WM_COMMAND, cmd);
+ ret = TRUE;
}
return ret;
@@ -2782,13 +2772,7 @@ void CMainFrame::OnLButtonDown(UINT nFlags, CPoint point) }
if(!fClicked) {
- bool fLeftMouseBtnUnassigned = true;
- AppSettings& s = AfxGetAppSettings();
- POSITION pos = s.wmcmds.GetHeadPosition();
- while(pos && fLeftMouseBtnUnassigned)
- if(s.wmcmds.GetNext(pos).mouse == wmcmd::LDOWN) {
- fLeftMouseBtnUnassigned = false;
- }
+ bool fLeftMouseBtnUnassigned = !assignedToCmd(wmcmd::LDOWN);
if(!m_fFullScreen && (IsCaptionMenuHidden() || fLeftMouseBtnUnassigned)) {
PostMessage(WM_NCLBUTTONDOWN, HTCAPTION, MAKELPARAM(point.x, point.y));
@@ -4322,10 +4306,6 @@ void CMainFrame::OnFileOpendevice() return;
}
- //COpenCapDeviceDlg capdlg;
- //if(capdlg.DoModal() != IDOK)
- // return;
-
SendMessage(WM_COMMAND, ID_FILE_CLOSEMEDIA);
SetForegroundWindow();
@@ -5059,7 +5039,6 @@ void CMainFrame::OnFileSaveImage() path.StripPath();
prefix.Format(_T("%s_snapshot_%s"), path, GetVidPos());
} else if(GetPlaybackMode() == PM_DVD) {
- prefix = _T("snapshot_dvd");
prefix.Format(_T("snapshot_dvd_%s"), GetVidPos());
}
psrc.Combine(s.strSnapShotPath, MakeSnapshotFileName(prefix));
diff --git a/src/apps/mplayerc/MainFrm.h b/src/apps/mplayerc/MainFrm.h index eb3fd46e5..14195def5 100644 --- a/src/apps/mplayerc/MainFrm.h +++ b/src/apps/mplayerc/MainFrm.h @@ -38,7 +38,6 @@ #include "EditListEditor.h"
#include "PPageSheet.h"
#include "PPageFileInfoSheet.h"
-#include "OpenCapDeviceDlg.h"
#include "FileDropTarget.h"
diff --git a/src/apps/mplayerc/OpenCapDeviceDlg.cpp b/src/apps/mplayerc/OpenCapDeviceDlg.cpp deleted file mode 100644 index 3c1575414..000000000 --- a/src/apps/mplayerc/OpenCapDeviceDlg.cpp +++ /dev/null @@ -1,497 +0,0 @@ -/*
- * $Id$
- *
- * (C) 2003-2006 Gabest
- * (C) 2006-2010 see AUTHORS
- *
- * This file is part of mplayerc.
- *
- * Mplayerc 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.
- *
- * Mplayerc 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "stdafx.h"
-#include "mplayerc.h"
-#include "OpenCapDeviceDlg.h"
-#include "../../DSUtil/DSUtil.h"
-
-
-static struct cc_t {
- long code;
- AnalogVideoStandard standard;
- const TCHAR* str;
-} s_countrycodes[] = {
- {1, AnalogVideo_NTSC_M, _T("USA")},
- /* {1, AnalogVideo_NTSC_M, _T("Anguilla")},
- {1, AnalogVideo_NTSC_M, _T("Antigua")},
- {1, AnalogVideo_NTSC_M, _T("Bahamas")},
- {1, AnalogVideo_NTSC_M, _T("Barbados")},
- {1, AnalogVideo_NTSC_M, _T("Bermuda")},
- {1, AnalogVideo_NTSC_M, _T("British Virgin Islands")},
- {1, AnalogVideo_NTSC_M, _T("Canada")},
- {1, AnalogVideo_NTSC_M, _T("Cayman Islands")},
- {1, AnalogVideo_NTSC_M, _T("Dominica")},
- {1, AnalogVideo_NTSC_M, _T("Dominican Republic")},
- {1, AnalogVideo_NTSC_M, _T("Grenada")},
- {1, AnalogVideo_NTSC_M, _T("Jamaica")},
- {1, AnalogVideo_NTSC_M, _T("Montserrat")},
- {1, AnalogVideo_NTSC_M, _T("Nevis")},
- {1, AnalogVideo_NTSC_M, _T("St. Kitts")},
- {1, AnalogVideo_NTSC_M, _T("St. Vincent and the Grenadines")},
- {1, AnalogVideo_NTSC_M, _T("Trinidad and Tobago")},
- {1, AnalogVideo_NTSC_M, _T("Turks and Caicos Islands")},
- {1, AnalogVideo_NTSC_M, _T("Barbuda")},
- {1, AnalogVideo_NTSC_M, _T("Puerto Rico")},
- {1, AnalogVideo_NTSC_M, _T("Saint Lucia")},
- {1, AnalogVideo_NTSC_M, _T("United States Virgin Islands")},
- */ {2, AnalogVideo_NTSC_M, _T("Canada")},
- {7, AnalogVideo_SECAM_D, _T("Russia")},
- /* {7, AnalogVideo_SECAM_D, _T("Kazakhstan")},
- {7, AnalogVideo_SECAM_D, _T("Kyrgyzstan")},
- {7, AnalogVideo_SECAM_D, _T("Tajikistan")},
- {7, AnalogVideo_SECAM_D, _T("Turkmenistan")},
- {7, AnalogVideo_SECAM_D, _T("Uzbekistan")},
- */ {20, AnalogVideo_SECAM_B, _T("Egypt")},
- {27, AnalogVideo_PAL_I, _T("South Africa")},
- {30, AnalogVideo_SECAM_B, _T("Greece")},
- {31, AnalogVideo_PAL_B, _T("Netherlands")},
- {32, AnalogVideo_PAL_B, _T("Belgium")},
- {33, AnalogVideo_SECAM_L, _T("France")},
- {34, AnalogVideo_PAL_B, _T("Spain")},
- {36, AnalogVideo_PAL_B, _T("Hungary")},
- {39, AnalogVideo_PAL_B, _T("Italy")},
- {39, AnalogVideo_PAL_B, _T("Vatican City")},
- {40, AnalogVideo_PAL_D, _T("Romania")},
- {41, AnalogVideo_PAL_B, _T("Switzerland")},
- {41, AnalogVideo_PAL_B, _T("Liechtenstein")},
- {43, AnalogVideo_PAL_B, _T("Austria")},
- {44, AnalogVideo_PAL_I, _T("United Kingdom")},
- {45, AnalogVideo_PAL_B, _T("Denmark")},
- {46, AnalogVideo_PAL_B, _T("Sweden")},
- {47, AnalogVideo_PAL_B, _T("Norway")},
- {48, AnalogVideo_PAL_B, _T("Poland")},
- {49, AnalogVideo_PAL_B, _T("Germany")},
- {51, AnalogVideo_NTSC_M, _T("Peru")},
- {52, AnalogVideo_NTSC_M, _T("Mexico")},
- {53, AnalogVideo_NTSC_M, _T("Cuba")},
- {53, AnalogVideo_NTSC_M, _T("Guantanamo Bay")},
- {54, AnalogVideo_PAL_N, _T("Argentina")},
- {55, AnalogVideo_PAL_M, _T("Brazil")},
- {56, AnalogVideo_NTSC_M, _T("Chile")},
- {57, AnalogVideo_NTSC_M, _T("Colombia")},
- {58, AnalogVideo_NTSC_M, _T("Bolivarian Republic of Venezuela")},
- {60, AnalogVideo_PAL_B, _T("Malaysia")},
- {61, AnalogVideo_PAL_B, _T("Australia")},
- // {61, AnalogVideo_NTSC_M, _T("Cocos-Keeling Islands")},
- {62, AnalogVideo_PAL_B, _T("Indonesia")},
- {63, AnalogVideo_NTSC_M, _T("Philippines")},
- {64, AnalogVideo_PAL_B, _T("New Zealand")},
- {65, AnalogVideo_PAL_B, _T("Singapore")},
- {66, AnalogVideo_PAL_B, _T("Thailand")},
- {81, AnalogVideo_NTSC_M_J, _T("Japan")},
- {82, AnalogVideo_NTSC_M, _T("Korea (South)")},
- {84, AnalogVideo_NTSC_M, _T("Vietnam")},
- {86, AnalogVideo_PAL_D, _T("China")},
- {90, AnalogVideo_PAL_B, _T("Turkey")},
- {91, AnalogVideo_PAL_B, _T("India")},
- {92, AnalogVideo_PAL_B, _T("Pakistan")},
- {93, AnalogVideo_PAL_B, _T("Afghanistan")},
- {94, AnalogVideo_PAL_B, _T("Sri Lanka")},
- {95, AnalogVideo_NTSC_M, _T("Myanmar")},
- {98, AnalogVideo_SECAM_B, _T("Iran")},
- {212, AnalogVideo_SECAM_B, _T("Morocco")},
- {213, AnalogVideo_PAL_B, _T("Algeria")},
- {216, AnalogVideo_SECAM_B, _T("Tunisia")},
- {218, AnalogVideo_SECAM_B, _T("Libya")},
- {220, AnalogVideo_SECAM_K, _T("Gambia")},
- {221, AnalogVideo_SECAM_K, _T("Senegal Republic")},
- {222, AnalogVideo_SECAM_B, _T("Mauritania")},
- {223, AnalogVideo_SECAM_K, _T("Mali")},
- {224, AnalogVideo_SECAM_K, _T("Guinea")},
- {225, AnalogVideo_SECAM_K, _T("Cote D'Ivoire")},
- {226, AnalogVideo_SECAM_K, _T("Burkina Faso")},
- {227, AnalogVideo_SECAM_K, _T("Niger")},
- {228, AnalogVideo_SECAM_K, _T("Togo")},
- {229, AnalogVideo_SECAM_K, _T("Benin")},
- {230, AnalogVideo_SECAM_B, _T("Mauritius")},
- {231, AnalogVideo_PAL_B, _T("Liberia")},
- {232, AnalogVideo_PAL_B, _T("Sierra Leone")},
- {233, AnalogVideo_PAL_B, _T("Ghana")},
- {234, AnalogVideo_PAL_B, _T("Nigeria")},
- {235, AnalogVideo_PAL_B, _T("Chad")},
- {236, AnalogVideo_PAL_B, _T("Central African Republic")},
- {237, AnalogVideo_PAL_B, _T("Cameroon")},
- {238, AnalogVideo_NTSC_M, _T("Cape Verde Islands")},
- {239, AnalogVideo_PAL_B, _T("Sao Tome and Principe")},
- {240, AnalogVideo_SECAM_B, _T("Equatorial Guinea")},
- {241, AnalogVideo_SECAM_K, _T("Gabon")},
- {242, AnalogVideo_SECAM_D, _T("Congo")},
- {243, AnalogVideo_SECAM_K, _T("Congo(DRC)")},
- {244, AnalogVideo_PAL_I, _T("Angola")},
- {245, AnalogVideo_NTSC_M, _T("Guinea-Bissau")},
- {246, AnalogVideo_NTSC_M, _T("Diego Garcia")},
- {247, AnalogVideo_NTSC_M, _T("Ascension Island")},
- {248, AnalogVideo_PAL_B, _T("Seychelles Islands")},
- {249, AnalogVideo_PAL_B, _T("Sudan")},
- {250, AnalogVideo_PAL_B, _T("Rwanda")},
- {251, AnalogVideo_PAL_B, _T("Ethiopia")},
- {252, AnalogVideo_PAL_B, _T("Somalia")},
- {253, AnalogVideo_SECAM_K, _T("Djibouti")},
- {254, AnalogVideo_PAL_B, _T("Kenya")},
- {255, AnalogVideo_PAL_B, _T("Tanzania")},
- {256, AnalogVideo_PAL_B, _T("Uganda")},
- {257, AnalogVideo_SECAM_K, _T("Burundi")},
- {258, AnalogVideo_PAL_B, _T("Mozambique")},
- {260, AnalogVideo_PAL_B, _T("Zambia")},
- {261, AnalogVideo_SECAM_K, _T("Madagascar")},
- {262, AnalogVideo_SECAM_K, _T("Reunion Island")},
- {263, AnalogVideo_PAL_B, _T("Zimbabwe")},
- {264, AnalogVideo_PAL_I, _T("Namibia")},
- {265, AnalogVideo_NTSC_M, _T("Malawi")},
- {266, AnalogVideo_PAL_I, _T("Lesotho")},
- {267, AnalogVideo_SECAM_K, _T("Botswana")},
- {268, AnalogVideo_PAL_B, _T("Swaziland")},
- {269, AnalogVideo_SECAM_K, _T("Mayotte Island")},
- // {269, AnalogVideo_NTSC_M, _T("Comoros")},
- {290, AnalogVideo_NTSC_M, _T("St. Helena")},
- {291, AnalogVideo_NTSC_M, _T("Eritrea")},
- {297, AnalogVideo_NTSC_M, _T("Aruba")},
- {298, AnalogVideo_PAL_B, _T("Faroe Islands")},
- {299, AnalogVideo_NTSC_M, _T("Greenland")},
- {350, AnalogVideo_PAL_B, _T("Gibraltar")},
- {351, AnalogVideo_PAL_B, _T("Portugal")},
- {352, AnalogVideo_PAL_B, _T("Luxembourg")},
- {353, AnalogVideo_PAL_I, _T("Ireland")},
- {354, AnalogVideo_PAL_B, _T("Iceland")},
- {355, AnalogVideo_PAL_B, _T("Albania")},
- {356, AnalogVideo_PAL_B, _T("Malta")},
- {357, AnalogVideo_PAL_B, _T("Cyprus")},
- {358, AnalogVideo_PAL_B, _T("Finland")},
- {359, AnalogVideo_SECAM_D, _T("Bulgaria")},
- {370, AnalogVideo_PAL_B, _T("Lithuania")},
- {371, AnalogVideo_SECAM_D, _T("Latvia")},
- {372, AnalogVideo_PAL_B, _T("Estonia")},
- {373, AnalogVideo_SECAM_D, _T("Moldova")},
- {374, AnalogVideo_SECAM_D, _T("Armenia")},
- {375, AnalogVideo_SECAM_D, _T("Belarus")},
- {376, AnalogVideo_NTSC_M, _T("Andorra")},
- {377, AnalogVideo_SECAM_G, _T("Monaco")},
- {378, AnalogVideo_PAL_B, _T("San Marino")},
- {380, AnalogVideo_SECAM_D, _T("Ukraine")},
- {381, AnalogVideo_PAL_B, _T("Serbia and Montenegro")},
- {385, AnalogVideo_PAL_B, _T("Croatia")},
- {386, AnalogVideo_PAL_B, _T("Slovenia")},
- {387, AnalogVideo_PAL_B, _T("Bosnia and Herzegovina")},
- {389, AnalogVideo_PAL_B, _T("F.Y.R.O.M. (Former Yugoslav Republic of Macedonia)")},
- {420, AnalogVideo_PAL_D, _T("Czech Republic")},
- {421, AnalogVideo_PAL_B, _T("Slovak Republic")},
- {500, AnalogVideo_PAL_I, _T("Falkland Islands (Islas Malvinas)")},
- {501, AnalogVideo_NTSC_M, _T("Belize")},
- {502, AnalogVideo_NTSC_M, _T("Guatemala")},
- {503, AnalogVideo_NTSC_M, _T("El Salvador")},
- {504, AnalogVideo_NTSC_M, _T("Honduras")},
- {505, AnalogVideo_NTSC_M, _T("Nicaragua")},
- {506, AnalogVideo_NTSC_M, _T("Costa Rica")},
- {507, AnalogVideo_NTSC_M, _T("Panama")},
- {508, AnalogVideo_SECAM_K, _T("St. Pierre and Miquelon")},
- {509, AnalogVideo_NTSC_M, _T("Haiti")},
- {590, AnalogVideo_SECAM_K, _T("Guadeloupe")},
- // {590, AnalogVideo_NTSC_M, _T("French Antilles")},
- {591, AnalogVideo_PAL_N, _T("Bolivia")},
- {592, AnalogVideo_SECAM_K, _T("Guyana")},
- {593, AnalogVideo_NTSC_M, _T("Ecuador")},
- {594, AnalogVideo_SECAM_K, _T("French Guiana")},
- {595, AnalogVideo_PAL_N, _T("Paraguay")},
- {596, AnalogVideo_SECAM_K, _T("Martinique")},
- {597, AnalogVideo_NTSC_M, _T("Suriname")},
- {598, AnalogVideo_PAL_N, _T("Uruguay")},
- {599, AnalogVideo_NTSC_M, _T("Netherlands Antilles")},
- {670, AnalogVideo_NTSC_M, _T("Saipan Island")},
- // {670, AnalogVideo_NTSC_M, _T("Rota Island")},
- // {670, AnalogVideo_NTSC_M, _T("Tinian Island")},
- {671, AnalogVideo_NTSC_M, _T("Guam")},
- {672, AnalogVideo_NTSC_M, _T("Christmas Island")},
- {672, AnalogVideo_NTSC_M, _T("Australian Antarctic Territory")},
- // {672, AnalogVideo_PAL_B, _T("Norfolk Island")},
- {673, AnalogVideo_PAL_B, _T("Brunei")},
- {674, AnalogVideo_NTSC_M, _T("Nauru")},
- {675, AnalogVideo_PAL_B, _T("Papua New Guinea")},
- {676, AnalogVideo_NTSC_M, _T("Tonga")},
- {677, AnalogVideo_NTSC_M, _T("Solomon Islands")},
- {678, AnalogVideo_NTSC_M, _T("Vanuatu")},
- {679, AnalogVideo_NTSC_M, _T("Fiji Islands")},
- {680, AnalogVideo_NTSC_M, _T("Palau")},
- {681, AnalogVideo_SECAM_K, _T("Wallis and Futuna Islands")},
- {682, AnalogVideo_PAL_B, _T("Cook Islands")},
- {683, AnalogVideo_NTSC_M, _T("Niue")},
- {684, AnalogVideo_NTSC_M, _T("Territory of American Samoa")},
- {685, AnalogVideo_PAL_B, _T("Samoa")},
- {686, AnalogVideo_PAL_B, _T("Kiribati Republic")},
- {687, AnalogVideo_SECAM_K, _T("New Caledonia")},
- {688, AnalogVideo_NTSC_M, _T("Tuvalu")},
- {689, AnalogVideo_SECAM_K, _T("French Polynesia")},
- {690, AnalogVideo_NTSC_M, _T("Tokelau")},
- {691, AnalogVideo_NTSC_M, _T("Micronesia")},
- {692, AnalogVideo_NTSC_M, _T("Marshall Islands")},
- {850, AnalogVideo_SECAM_D, _T("Korea (North)")},
- {852, AnalogVideo_PAL_I, _T("Hong Kong SAR")},
- {853, AnalogVideo_PAL_I, _T("Macao SAR")},
- {855, AnalogVideo_PAL_B, _T("Cambodia")},
- {856, AnalogVideo_PAL_B, _T("Laos")},
- {871, AnalogVideo_NTSC_M, _T("INMARSAT (Atlantic-East)")},
- {872, AnalogVideo_NTSC_M, _T("INMARSAT (Pacific)")},
- {873, AnalogVideo_NTSC_M, _T("INMARSAT (Indian)")},
- {874, AnalogVideo_NTSC_M, _T("INMARSAT (Atlantic-West)")},
- {880, AnalogVideo_PAL_B, _T("Bangladesh")},
- {886, AnalogVideo_NTSC_M, _T("Taiwan")},
- {960, AnalogVideo_PAL_B, _T("Maldives")},
- {961, AnalogVideo_SECAM_B, _T("Lebanon")},
- {962, AnalogVideo_PAL_B, _T("Jordan")},
- {963, AnalogVideo_SECAM_B, _T("Syria")},
- {964, AnalogVideo_SECAM_B, _T("Iraq")},
- {965, AnalogVideo_PAL_B, _T("Kuwait")},
- {966, AnalogVideo_SECAM_B, _T("Saudi Arabia")},
- {967, AnalogVideo_PAL_B, _T("Yemen")},
- {968, AnalogVideo_PAL_B, _T("Oman")},
- {971, AnalogVideo_PAL_B, _T("United Arab Emirates")},
- {972, AnalogVideo_PAL_B, _T("Israel")},
- {973, AnalogVideo_PAL_B, _T("Bahrain")},
- {974, AnalogVideo_PAL_B, _T("Qatar")},
- {975, AnalogVideo_NTSC_M, _T("Bhutan")},
- {976, AnalogVideo_SECAM_D, _T("Mongolia")},
- {977, AnalogVideo_PAL_B, _T("Nepal")},
- {994, AnalogVideo_SECAM_D, _T("Azerbaijan")},
- {995, AnalogVideo_SECAM_D,_T("Georgia")},
-};
-
-// COpenCapDeviceDlg dialog
-
-//IMPLEMENT_DYNAMIC(COpenCapDeviceDlg, CResizableDialog)
-COpenCapDeviceDlg::COpenCapDeviceDlg(CWnd* pParent /*=NULL*/)
- : CResizableDialog(COpenCapDeviceDlg::IDD, pParent)
- , m_vidstr(_T(""))
- , m_audstr(_T(""))
- , m_country(1)
-{
-}
-
-COpenCapDeviceDlg::~COpenCapDeviceDlg()
-{
-}
-
-void COpenCapDeviceDlg::DoDataExchange(CDataExchange* pDX)
-{
- __super::DoDataExchange(pDX);
- DDX_Control(pDX, IDC_COMBO1, m_vidctrl);
- DDX_Control(pDX, IDC_COMBO2, m_audctrl);
- DDX_Control(pDX, IDC_COMBO9, m_countryctrl);
-}
-
-BEGIN_MESSAGE_MAP(COpenCapDeviceDlg, CResizableDialog)
- ON_BN_CLICKED(IDOK, OnBnClickedOk)
-END_MESSAGE_MAP()
-
-
-// COpenCapDeviceDlg message handlers
-
-BOOL COpenCapDeviceDlg::OnInitDialog()
-{
- __super::OnInitDialog();
-
- AppSettings& s = AfxGetAppSettings();
-
- AddAnchor(m_vidctrl, TOP_LEFT, TOP_RIGHT);
- AddAnchor(m_audctrl, TOP_LEFT, TOP_RIGHT);
- AddAnchor(m_countryctrl, TOP_LEFT, TOP_RIGHT);
- AddAnchor(IDOK, TOP_CENTER);
- AddAnchor(IDCANCEL, TOP_CENTER);
-
- CRect r;
- GetWindowRect(r);
- CSize size = r.Size();
- SetMinTrackSize(size);
- size.cx = 1000;
- SetMaxTrackSize(size);
-
- CString dummy = _T("dummy");
- CString vidstr = s.strAnalogVideo;
- CString audstr = s.strAnalogAudio;
- int country = s.iAnalogCountry;
-
- int iSel = vidstr == dummy ? 0 : -1;
-
- BeginEnumSysDev(CLSID_VideoInputDeviceCategory, pMoniker) {
- CComPtr<IPropertyBag> pPB;
- pMoniker->BindToStorage(0, 0, IID_IPropertyBag, (void**)&pPB);
-
- CComVariant var;
- pPB->Read(CComBSTR(_T("FriendlyName")), &var, NULL);
- int i = m_vidctrl.AddString(CString(var.bstrVal));
-
- LPOLESTR strName = NULL;
- if(SUCCEEDED(pMoniker->GetDisplayName(NULL, NULL, &strName))) {
- m_vidnames.Add(CString(strName));
- if(vidstr == CString(strName)) {
- iSel = i;
- }
- CoTaskMemFree(strName);
- }
- }
- EndEnumSysDev
-
- if(m_vidctrl.GetCount()) {
- m_vidctrl.SetCurSel(iSel);
- }
-
- iSel = audstr == dummy ? 0 : -1;
-
- BeginEnumSysDev(CLSID_AudioInputDeviceCategory, pMoniker) {
- CComPtr<IPropertyBag> pPB;
- pMoniker->BindToStorage(0, 0, IID_IPropertyBag, (void**)&pPB);
-
- CComVariant var;
- pPB->Read(CComBSTR(_T("FriendlyName")), &var, NULL);
- int i = m_audctrl.AddString(CString(var.bstrVal));
-
- LPOLESTR strName = NULL;
- if(SUCCEEDED(pMoniker->GetDisplayName(NULL, NULL, &strName))) {
- m_audnames.Add(CString(strName));
- if(audstr == CString(strName)) {
- iSel = i;
- }
- CoTaskMemFree(strName);
- }
- }
- EndEnumSysDev
-
- {
- int i = m_audctrl.AddString(_T("<Video Capture Device>"));
- m_audnames.Add(_T(""));
- if(audstr.IsEmpty()) {
- iSel = i;
- }
- }
-
- if(m_audctrl.GetCount()) {
- m_audctrl.SetCurSel(iSel);
- }
-
- iSel = 0;
-
- for(int j = 0; j < countof(s_countrycodes); j++) {
- CString standard;
- switch(s_countrycodes[j].standard) {
- case AnalogVideo_NTSC_M:
- standard = _T("NTSC M");
- break;
- case AnalogVideo_NTSC_M_J:
- standard = _T("NTSC M J");
- break;
- case AnalogVideo_NTSC_433:
- standard = _T("NTSC 433");
- break;
- case AnalogVideo_PAL_B:
- standard = _T("PAL B");
- break;
- case AnalogVideo_PAL_D:
- standard = _T("PAL D");
- break;
- case AnalogVideo_PAL_G:
- standard = _T("PAL G");
- break;
- case AnalogVideo_PAL_H:
- standard = _T("PAL H");
- break;
- case AnalogVideo_PAL_I:
- standard = _T("PAL I");
- break;
- case AnalogVideo_PAL_M:
- standard = _T("PAL M");
- break;
- case AnalogVideo_PAL_N:
- standard = _T("PAL N");
- break;
- case AnalogVideo_PAL_60:
- standard = _T("PAL 60");
- break;
- case AnalogVideo_SECAM_B:
- standard = _T("SECAM B");
- break;
- case AnalogVideo_SECAM_D:
- standard = _T("SECAM D");
- break;
- case AnalogVideo_SECAM_G:
- standard = _T("SECAM G");
- break;
- case AnalogVideo_SECAM_H:
- standard = _T("SECAM H");
- break;
- case AnalogVideo_SECAM_K:
- standard = _T("SECAM K");
- break;
- case AnalogVideo_SECAM_K1:
- standard = _T("SECAM K1");
- break;
- case AnalogVideo_SECAM_L:
- standard = _T("SECAM L");
- break;
- case AnalogVideo_SECAM_L1:
- standard = _T("SECAM L1");
- break;
- case AnalogVideo_PAL_N_COMBO:
- standard = _T("PAL N COMBO");
- break;
- }
-
- CString str;
- str.Format(_T("%d - %s - %s"), s_countrycodes[j].code, s_countrycodes[j].str, standard);
-
- int i = m_countryctrl.AddString(str);
- m_countryctrl.SetItemDataPtr(i, &s_countrycodes[j]);
- if(country == s_countrycodes[j].code) {
- iSel = i;
- }
- }
-
- if(m_countryctrl.GetCount()) {
- m_countryctrl.SetCurSel(iSel);
- }
-
- return TRUE; // return TRUE unless you set the focus to a control
- // EXCEPTION: OCX Property Pages should return FALSE
-}
-
-void COpenCapDeviceDlg::OnBnClickedOk()
-{
- UpdateData();
-
- AppSettings& s = AfxGetAppSettings();
-
- if(m_vidctrl.GetCurSel() >= 0) {
- m_vidstr = m_vidnames[m_vidctrl.GetCurSel()];
- s.strAnalogVideo = m_vidstr;
- }
-
- if(m_audctrl.GetCurSel() >= 0) {
- m_audstr = m_audnames[m_audctrl.GetCurSel()];
- s.strAnalogAudio = m_audstr;
- }
-
- if(m_countryctrl.GetCurSel() >= 0) {
- m_country = ((cc_t*)m_countryctrl.GetItemDataPtr(m_countryctrl.GetCurSel()))->code;
- s.iAnalogCountry = m_country;
- }
-
- OnOK();
-}
diff --git a/src/apps/mplayerc/OpenCapDeviceDlg.h b/src/apps/mplayerc/OpenCapDeviceDlg.h deleted file mode 100644 index 3039ac4c2..000000000 --- a/src/apps/mplayerc/OpenCapDeviceDlg.h +++ /dev/null @@ -1,61 +0,0 @@ -/*
- * $Id$
- *
- * (C) 2003-2006 Gabest
- * (C) 2006-2010 see AUTHORS
- *
- * This file is part of mplayerc.
- *
- * Mplayerc 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.
- *
- * Mplayerc 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-#pragma once
-
-#include "afxwin.h"
-#include <atlcoll.h>
-
-
-// COpenCapDeviceDlg dialog
-
-class COpenCapDeviceDlg : public CResizableDialog
-{
- // DECLARE_DYNAMIC(COpenCapDeviceDlg)
-
-private:
- CAtlArray<CString> m_vidnames, m_audnames;
-
-public:
- COpenCapDeviceDlg(CWnd* pParent = NULL); // standard constructor
- virtual ~COpenCapDeviceDlg();
-
- CComboBox m_vidctrl;
- CComboBox m_audctrl;
- CComboBox m_countryctrl;
-
- CString m_vidstr, m_audstr;
- int m_country;
-
- // Dialog Data
- enum { IDD = IDD_OPENCAPDEVICE_DLG };
-
-protected:
- virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
- virtual BOOL OnInitDialog();
-
- DECLARE_MESSAGE_MAP()
-
-public:
- afx_msg void OnBnClickedOk();
-};
diff --git a/src/apps/mplayerc/PPageCapture.cpp b/src/apps/mplayerc/PPageCapture.cpp index ad82c2ded..df61c0605 100644 --- a/src/apps/mplayerc/PPageCapture.cpp +++ b/src/apps/mplayerc/PPageCapture.cpp @@ -41,8 +41,37 @@ static struct cc_t { const TCHAR* str;
} s_countrycodes[] = {
{1, AnalogVideo_NTSC_M, _T("USA")},
+ /* {1, AnalogVideo_NTSC_M, _T("Anguilla")},
+ {1, AnalogVideo_NTSC_M, _T("Antigua")},
+ {1, AnalogVideo_NTSC_M, _T("Bahamas")},
+ {1, AnalogVideo_NTSC_M, _T("Barbados")},
+ {1, AnalogVideo_NTSC_M, _T("Bermuda")},
+ {1, AnalogVideo_NTSC_M, _T("British Virgin Islands")},
+ {1, AnalogVideo_NTSC_M, _T("Canada")},
+ {1, AnalogVideo_NTSC_M, _T("Cayman Islands")},
+ {1, AnalogVideo_NTSC_M, _T("Dominica")},
+ {1, AnalogVideo_NTSC_M, _T("Dominican Republic")},
+ {1, AnalogVideo_NTSC_M, _T("Grenada")},
+ {1, AnalogVideo_NTSC_M, _T("Jamaica")},
+ {1, AnalogVideo_NTSC_M, _T("Montserrat")},
+ {1, AnalogVideo_NTSC_M, _T("Nevis")},
+ {1, AnalogVideo_NTSC_M, _T("St. Kitts")},
+ {1, AnalogVideo_NTSC_M, _T("St. Vincent and the Grenadines")},
+ {1, AnalogVideo_NTSC_M, _T("Trinidad and Tobago")},
+ {1, AnalogVideo_NTSC_M, _T("Turks and Caicos Islands")},
+ {1, AnalogVideo_NTSC_M, _T("Barbuda")},
+ {1, AnalogVideo_NTSC_M, _T("Puerto Rico")},
+ {1, AnalogVideo_NTSC_M, _T("Saint Lucia")},
+ {1, AnalogVideo_NTSC_M, _T("United States Virgin Islands")},
+ */
{2, AnalogVideo_NTSC_M, _T("Canada")},
{7, AnalogVideo_SECAM_D, _T("Russia")},
+ /* {7, AnalogVideo_SECAM_D, _T("Kazakhstan")},
+ {7, AnalogVideo_SECAM_D, _T("Kyrgyzstan")},
+ {7, AnalogVideo_SECAM_D, _T("Tajikistan")},
+ {7, AnalogVideo_SECAM_D, _T("Turkmenistan")},
+ {7, AnalogVideo_SECAM_D, _T("Uzbekistan")},
+ */
{20, AnalogVideo_SECAM_B, _T("Egypt")},
{27, AnalogVideo_PAL_I, _T("South Africa")},
{30, AnalogVideo_SECAM_B, _T("Greece")},
@@ -50,7 +79,7 @@ static struct cc_t { {32, AnalogVideo_PAL_B, _T("Belgium")},
{33, AnalogVideo_SECAM_L, _T("France")},
{34, AnalogVideo_PAL_B, _T("Spain")},
- {36, AnalogVideo_SECAM_D, _T("Hungary")},
+ {36, AnalogVideo_PAL_B, _T("Hungary")},
{39, AnalogVideo_PAL_B, _T("Italy")},
{39, AnalogVideo_PAL_B, _T("Vatican City")},
{40, AnalogVideo_PAL_D, _T("Romania")},
@@ -74,6 +103,7 @@ static struct cc_t { {58, AnalogVideo_NTSC_M, _T("Bolivarian Republic of Venezuela")},
{60, AnalogVideo_PAL_B, _T("Malaysia")},
{61, AnalogVideo_PAL_B, _T("Australia")},
+ // {61, AnalogVideo_NTSC_M, _T("Cocos-Keeling Islands")},
{62, AnalogVideo_PAL_B, _T("Indonesia")},
{63, AnalogVideo_NTSC_M, _T("Philippines")},
{64, AnalogVideo_PAL_B, _T("New Zealand")},
@@ -143,6 +173,7 @@ static struct cc_t { {267, AnalogVideo_SECAM_K, _T("Botswana")},
{268, AnalogVideo_PAL_B, _T("Swaziland")},
{269, AnalogVideo_SECAM_K, _T("Mayotte Island")},
+ // {269, AnalogVideo_NTSC_M, _T("Comoros")},
{290, AnalogVideo_NTSC_M, _T("St. Helena")},
{291, AnalogVideo_NTSC_M, _T("Eritrea")},
{297, AnalogVideo_NTSC_M, _T("Aruba")},
@@ -186,6 +217,7 @@ static struct cc_t { {508, AnalogVideo_SECAM_K, _T("St. Pierre and Miquelon")},
{509, AnalogVideo_NTSC_M, _T("Haiti")},
{590, AnalogVideo_SECAM_K, _T("Guadeloupe")},
+ // {590, AnalogVideo_NTSC_M, _T("French Antilles")},
{591, AnalogVideo_PAL_N, _T("Bolivia")},
{592, AnalogVideo_SECAM_K, _T("Guyana")},
{593, AnalogVideo_NTSC_M, _T("Ecuador")},
@@ -196,9 +228,12 @@ static struct cc_t { {598, AnalogVideo_PAL_N, _T("Uruguay")},
{599, AnalogVideo_NTSC_M, _T("Netherlands Antilles")},
{670, AnalogVideo_NTSC_M, _T("Saipan Island")},
+ // {670, AnalogVideo_NTSC_M, _T("Rota Island")},
+ // {670, AnalogVideo_NTSC_M, _T("Tinian Island")},
{671, AnalogVideo_NTSC_M, _T("Guam")},
{672, AnalogVideo_NTSC_M, _T("Christmas Island")},
{672, AnalogVideo_NTSC_M, _T("Australian Antarctic Territory")},
+ // {672, AnalogVideo_PAL_B, _T("Norfolk Island")},
{673, AnalogVideo_PAL_B, _T("Brunei")},
{674, AnalogVideo_NTSC_M, _T("Nauru")},
{675, AnalogVideo_PAL_B, _T("Papua New Guinea")},
diff --git a/src/apps/mplayerc/PPageSync.cpp b/src/apps/mplayerc/PPageSync.cpp index fbafbec23..5eec38aa8 100644 --- a/src/apps/mplayerc/PPageSync.cpp +++ b/src/apps/mplayerc/PPageSync.cpp @@ -59,30 +59,7 @@ BOOL CPPageSync::OnInitDialog() {
__super::OnInitDialog();
- AppSettings& s = AfxGetAppSettings();
- CMainFrame * pFrame;
- pFrame = (CMainFrame *)(AfxGetApp()->m_pMainWnd);
- if ((s.iDSVideoRendererType == VIDRNDT_DS_SYNC) && (pFrame->GetPlaybackMode() == PM_NONE)) {
- GetDlgItem(IDC_SYNCVIDEO)->EnableWindow(TRUE);
- GetDlgItem(IDC_SYNCDISPLAY)->EnableWindow(TRUE);
- GetDlgItem(IDC_SYNCNEAREST)->EnableWindow(TRUE);
- } else {
- GetDlgItem(IDC_SYNCVIDEO)->EnableWindow(FALSE);
- GetDlgItem(IDC_SYNCDISPLAY)->EnableWindow(FALSE);
- GetDlgItem(IDC_SYNCNEAREST)->EnableWindow(FALSE);
- }
-
- CRenderersSettings::CRendererSettingsEVR& rendererSettings = s.m_RenderersSettings.m_RenderSettings;
- m_bSynchronizeVideo = rendererSettings.bSynchronizeVideo;
- m_bSynchronizeDisplay = rendererSettings.bSynchronizeDisplay;
- m_bSynchronizeNearest = rendererSettings.bSynchronizeNearest;
- m_iLineDelta = rendererSettings.iLineDelta;
- m_iColumnDelta = rendererSettings.iColumnDelta;
- m_fCycleDelta = rendererSettings.fCycleDelta;
- m_fTargetSyncOffset = rendererSettings.fTargetSyncOffset;
- m_fControlLimit = rendererSettings.fControlLimit;
-
- UpdateData(FALSE);
+ InitDialogPrivate();
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
@@ -90,6 +67,13 @@ BOOL CPPageSync::OnInitDialog() BOOL CPPageSync::OnSetActive()
{
+ InitDialogPrivate();
+
+ return CPropertyPage::OnSetActive();
+}
+
+void CPPageSync::InitDialogPrivate()
+{
AppSettings& s = AfxGetAppSettings();
CMainFrame * pFrame;
pFrame = (CMainFrame *)(AfxGetApp()->m_pMainWnd);
@@ -114,8 +98,6 @@ BOOL CPPageSync::OnSetActive() m_fControlLimit = rendererSettings.fControlLimit;
UpdateData(FALSE);
-
- return CPropertyPage::OnSetActive();
}
BOOL CPPageSync::OnApply()
diff --git a/src/apps/mplayerc/PPageSync.h b/src/apps/mplayerc/PPageSync.h index 410882bd0..10034b0e2 100644 --- a/src/apps/mplayerc/PPageSync.h +++ b/src/apps/mplayerc/PPageSync.h @@ -55,4 +55,7 @@ public: afx_msg void OnBnClickedSyncVideo();
afx_msg void OnBnClickedSyncDisplay();
afx_msg void OnBnClickedSyncNearest();
+
+private:
+ void InitDialogPrivate();
};
diff --git a/src/apps/mplayerc/mpciconlib/mpciconlib.vcproj b/src/apps/mplayerc/mpciconlib/mpciconlib.vcproj index d8a86caf5..0d60ec52b 100644 --- a/src/apps/mplayerc/mpciconlib/mpciconlib.vcproj +++ b/src/apps/mplayerc/mpciconlib/mpciconlib.vcproj @@ -44,8 +44,6 @@ />
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
/>
<Tool
@@ -54,6 +52,7 @@ <Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_UNICODE;UNICODE;NO_VERSION_REV_NEEDED"
+ Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -62,13 +61,7 @@ Name="VCLinkerTool"
ModuleDefinitionFile="mpciconlib.def"
GenerateDebugInformation="false"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -127,6 +120,7 @@ <Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_UNICODE;UNICODE;NO_VERSION_REV_NEEDED"
+ Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -135,10 +129,7 @@ Name="VCLinkerTool"
ModuleDefinitionFile="mpciconlib.def"
GenerateDebugInformation="false"
- LargeAddressAware="2"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
diff --git a/src/apps/mplayerc/mpciconlib/mpciconlib.vcxproj b/src/apps/mplayerc/mpciconlib/mpciconlib.vcxproj index c01f73e81..848c2e2df 100644 --- a/src/apps/mplayerc/mpciconlib/mpciconlib.vcxproj +++ b/src/apps/mplayerc/mpciconlib/mpciconlib.vcxproj @@ -32,12 +32,10 @@ <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)'=='Release|x64'" 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>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -47,20 +45,12 @@ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<ModuleDefinitionFile>mpciconlib.def</ModuleDefinitionFile>
<GenerateDebugInformation>false</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -75,10 +65,7 @@ <Link>
<ModuleDefinitionFile>mpciconlib.def</ModuleDefinitionFile>
<GenerateDebugInformation>false</GenerateDebugInformation>
- <LargeAddressAware>true</LargeAddressAware>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
diff --git a/src/apps/mplayerc/mpcresources/mpcresources.vcproj b/src/apps/mplayerc/mpcresources/mpcresources.vcproj index 5b47ba78d..23089ebd8 100644 --- a/src/apps/mplayerc/mpcresources/mpcresources.vcproj +++ b/src/apps/mplayerc/mpcresources/mpcresources.vcproj @@ -24,7 +24,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -63,13 +63,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).fr.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -99,7 +94,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -139,13 +134,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).fr.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
@@ -175,7 +165,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -214,13 +204,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).de.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -250,7 +235,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -290,13 +275,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).de.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
@@ -326,7 +306,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -365,13 +345,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).ru.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -401,7 +376,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -441,13 +416,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).ru.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
@@ -477,7 +447,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -516,13 +486,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).tr.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -552,7 +517,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -592,13 +557,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).tr.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
@@ -628,7 +588,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -667,13 +627,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).cz.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -703,7 +658,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -743,13 +698,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).cz.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
@@ -779,7 +729,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -818,13 +768,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).es.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -854,7 +799,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -894,13 +839,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).es.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
@@ -930,7 +870,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -969,13 +909,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).hu.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -1005,7 +940,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -1045,13 +980,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).hu.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
@@ -1081,7 +1011,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -1120,13 +1050,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).kr.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -1156,7 +1081,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -1196,13 +1121,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).kr.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
@@ -1232,7 +1152,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -1271,13 +1191,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).pl.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -1307,7 +1222,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -1347,13 +1262,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).pl.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
@@ -1383,7 +1293,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -1422,13 +1332,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).ua.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -1458,7 +1363,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -1498,13 +1403,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).ua.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
@@ -1534,7 +1434,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -1573,13 +1473,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).it.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -1609,7 +1504,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -1649,13 +1544,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).it.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
@@ -1685,7 +1575,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -1724,13 +1614,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).sk.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -1760,7 +1645,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -1800,13 +1685,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).sk.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
@@ -1836,7 +1716,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -1875,13 +1755,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).sc.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -1911,7 +1786,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -1951,13 +1826,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).sc.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
@@ -1987,7 +1857,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -2026,13 +1896,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).tc.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -2062,7 +1927,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -2102,13 +1967,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).tc.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
@@ -2138,7 +1998,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -2177,13 +2037,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).by.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -2213,7 +2068,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -2253,13 +2108,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).by.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
@@ -2289,7 +2139,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -2328,13 +2178,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).sv.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -2364,7 +2209,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -2404,13 +2249,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).sv.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
@@ -2440,7 +2280,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -2479,13 +2319,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).br.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -2515,7 +2350,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -2555,13 +2390,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).br.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
@@ -2591,7 +2421,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -2630,13 +2460,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).nl.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -2666,7 +2491,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -2706,13 +2531,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).nl.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
@@ -2742,7 +2562,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -2781,13 +2601,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).ca.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -2817,7 +2632,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -2857,13 +2672,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).ca.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
@@ -2893,7 +2703,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -2932,13 +2742,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).ja.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -2968,7 +2773,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -3008,13 +2813,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).ja.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
@@ -3044,7 +2844,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -3083,13 +2883,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).hy.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="1"
/>
<Tool
@@ -3119,7 +2914,7 @@ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64\"
IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
CharacterSet="1"
>
<Tool
@@ -3159,13 +2954,8 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).hy.dll"
- SubSystem="2"
- LargeAddressAware="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ GenerateDebugInformation="false"
ResourceOnlyDLL="true"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
TargetMachine="17"
/>
<Tool
diff --git a/src/apps/mplayerc/mpcresources/mpcresources.vcxproj b/src/apps/mplayerc/mpcresources/mpcresources.vcxproj index 52558251e..4957419e7 100644 --- a/src/apps/mplayerc/mpcresources/mpcresources.vcxproj +++ b/src/apps/mplayerc/mpcresources/mpcresources.vcxproj @@ -698,14 +698,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -725,14 +720,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -749,14 +739,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -776,14 +761,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -800,14 +780,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -827,14 +802,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -851,14 +821,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -878,14 +843,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -902,14 +862,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -929,14 +884,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -953,14 +903,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -980,14 +925,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1004,14 +944,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1031,14 +966,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1055,14 +985,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1082,14 +1007,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1106,14 +1026,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1133,14 +1048,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1157,14 +1067,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1184,14 +1089,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1208,14 +1108,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1235,14 +1130,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1259,14 +1149,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1286,14 +1171,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1310,14 +1190,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1337,14 +1212,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1361,14 +1231,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1388,14 +1253,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1412,14 +1272,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1439,14 +1294,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1463,14 +1313,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1490,14 +1335,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1514,14 +1354,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1541,14 +1376,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1565,14 +1395,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1592,14 +1417,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1616,14 +1436,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1643,14 +1458,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1667,14 +1477,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1694,14 +1499,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1718,14 +1518,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1745,14 +1540,9 @@ </ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<NoEntryPoint>true</NoEntryPoint>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;NO_VERSION_REV_NEEDED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.br.rc b/src/apps/mplayerc/mpcresources/mplayerc.br.rc Binary files differindex 83c85a995..1b4c25bf1 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 9a2a8eaf3..8528855c4 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 016aa77c5..a49240318 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 b5ae1ca64..187bfc998 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 3ed97489d..d765d9b8e 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 76f3cf45e..1908fc313 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 31236cc14..bb1ebfb1f 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 d5b239727..4474e2835 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 fa8613162..076d61c5b 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 9e57a58e1..be5ad97ef 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 ba22e4245..faa522bcf 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 d7a756553..fcac09976 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 02a68d608..3d70f8f62 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 ad7b6a8ee..97fc8e322 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 48b1e9da1..b9f214c6d 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 a1747db91..7a1bbc99d 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 342d29fdb..b2d7aec7a 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 c6bbc2b5e..34eaeaa38 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 6999c0c30..5a6e14030 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 6b8ebf828..b135710c5 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 78b560121..e5f00ea0a 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.ua.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.ua.rc diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.br.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.br.rc.txt Binary files differindex 2685368b9..f56dba7a5 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.br.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.br.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.by.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.by.rc.txt Binary files differindex 970cfd2e1..f6a7c3ab9 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.by.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.by.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.ca.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.ca.rc.txt Binary files differindex f44fa47a2..faaafd025 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.ca.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.ca.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.cz.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.cz.rc.txt Binary files differindex f71b2fa0e..663278a2c 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.cz.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.cz.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.de.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.de.rc.txt Binary files differindex 3deb871ca..7790c3122 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.de.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.de.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.es.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.es.rc.txt Binary files differindex 1b5708e89..582e73b86 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.es.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.es.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.fr.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.fr.rc.txt Binary files differindex 86b818652..254c2cd50 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.fr.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.fr.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.hu.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.hu.rc.txt Binary files differindex c1dcd2bb2..1b34a1b50 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.hu.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.hu.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.hy.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.hy.rc.txt Binary files differindex 7776cf8fe..384991320 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.hy.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.hy.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.it.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.it.rc.txt Binary files differindex 967935761..abd1269d9 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.it.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.it.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.ja.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.ja.rc.txt Binary files differindex d59a97fb4..e91b0facc 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.ja.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.ja.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.kr.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.kr.rc.txt Binary files differindex c3b336ae8..cf9075431 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.kr.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.kr.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.nl.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.nl.rc.txt Binary files differindex 26970c865..5498947ec 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.nl.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.nl.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.pl.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.pl.rc.txt Binary files differindex 6e17292ea..bfe9e6590 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.pl.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.pl.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.rc.txt Binary files differindex b8c25ffb9..99de06824 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.ru.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.ru.rc.txt Binary files differindex 479cd236c..dcde3012d 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.ru.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.ru.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.sc.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.sc.rc.txt Binary files differindex 108623ea2..168a6472d 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.sc.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.sc.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.sk.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.sk.rc.txt Binary files differindex ca76d6163..7e213315b 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.sk.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.sk.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.sv.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.sv.rc.txt Binary files differindex a4d69a522..0f80c03ce 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.sv.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.sv.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.tc.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.tc.rc.txt Binary files differindex 753e96be0..f9bc08560 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.tc.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.tc.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.tr.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.tr.rc.txt Binary files differindex f2d7d6ea7..f1f0ac35e 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.tr.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.tr.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.ua.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.ua.rc.txt Binary files differindex de0133a2a..c0facc58f 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.ua.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.ua.rc.txt diff --git a/src/apps/mplayerc/mplayerc.cpp b/src/apps/mplayerc/mplayerc.cpp index 168a5f463..0a3e39c53 100644 --- a/src/apps/mplayerc/mplayerc.cpp +++ b/src/apps/mplayerc/mplayerc.cpp @@ -215,6 +215,29 @@ bool LoadResource(UINT resid, CStringA& str, LPCTSTR restype) return(true);
}
+WORD assignedToCmd(UINT keyOrMouseValue, bool bCheckMouse) {
+ WORD assignTo = 0;
+ AppSettings& s = AfxGetAppSettings();
+
+ POSITION pos = s.wmcmds.GetHeadPosition();
+ while(pos && (!assignTo)) {
+ wmcmd& wc = s.wmcmds.GetNext(pos);
+ if(bCheckMouse) {
+ if(wc.mouse == keyOrMouseValue) {
+ assignTo = wc.cmd;
+ break;
+ }
+ } else {
+ if(wc.key == keyOrMouseValue) {
+ assignTo = wc.cmd;
+ break;
+ }
+ }
+ }
+
+ return assignTo;
+}
+
/////////////////////////////////////////////////////////////////////////////
// CAboutDlg dialog used for App About
diff --git a/src/apps/mplayerc/mplayerc.h b/src/apps/mplayerc/mplayerc.h index 26ceec131..73314ba02 100644 --- a/src/apps/mplayerc/mplayerc.h +++ b/src/apps/mplayerc/mplayerc.h @@ -56,6 +56,7 @@ extern HICON LoadIcon(CString fn, bool fSmall); extern bool LoadType(CString fn, CString& type);
extern bool LoadResource(UINT resid, CStringA& str, LPCTSTR restype);
extern CStringA GetContentType(CString fn, CAtlList<CString>* redir = NULL);
+extern WORD assignedToCmd(UINT keyOrMouseValue, bool bCheckMouse = true);
extern "C" BOOL IsVistaOrAbove();
/////////////////////////////////////////////////////////////////////////////
diff --git a/src/apps/mplayerc/mplayerc.rc b/src/apps/mplayerc/mplayerc.rc Binary files differindex 17ec187d0..e6bdf9b39 100644 --- a/src/apps/mplayerc/mplayerc.rc +++ b/src/apps/mplayerc/mplayerc.rc diff --git a/src/apps/mplayerc/mplayerc.vcproj b/src/apps/mplayerc/mplayerc.vcproj index 604e222b8..5830c3f16 100644 --- a/src/apps/mplayerc/mplayerc.vcproj +++ b/src/apps/mplayerc/mplayerc.vcproj @@ -47,7 +47,6 @@ PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
TargetEnvironment="1"
- TypeLibraryName=".\Release_unicode/mplayerc.tlb"
/>
<Tool
Name="VCCLCompilerTool"
@@ -76,10 +75,6 @@ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\$(ConfigurationName)_$(PlatformName);$(SolutionDir)lib;$(SolutionDir)lib\qt6;$(SolutionDir)lib\detours;$(SolutionDir)lib\lglcd;$(SolutionDir)lib\dx;$(DXSDK_DIR)Lib\x86"
IgnoreDefaultLibraryNames=""
DelayLoadDLLs="d3d9.dll;gdiplus.dll;psapi.dll"
- SubSystem="2"
- LargeAddressAware="2"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
SupportUnloadOfDelayLoadedDLL="true"
TargetMachine="1"
/>
@@ -134,7 +129,6 @@ PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
TargetEnvironment="3"
- TypeLibraryName=".\Release_unicode/mplayerc.tlb"
/>
<Tool
Name="VCCLCompilerTool"
@@ -164,9 +158,6 @@ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\$(ConfigurationName)_$(PlatformName);$(SolutionDir)lib64;$(SolutionDir)lib64\lglcd;$(SolutionDir)lib64\detours;$(SolutionDir)lib64\dx;$(DXSDK_DIR)Lib\x64"
IgnoreDefaultLibraryNames=""
DelayLoadDLLs="d3d9.dll;gdiplus.dll;psapi.dll"
- SubSystem="2"
- RandomizedBaseAddress="2"
- DataExecutionPrevention="2"
SupportUnloadOfDelayLoadedDLL="true"
TargetMachine="17"
/>
@@ -221,7 +212,6 @@ PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
TargetEnvironment="1"
- TypeLibraryName="$(OutDir)\$(ProjectName).tlb"
/>
<Tool
Name="VCCLCompilerTool"
@@ -246,14 +236,10 @@ Name="VCLinkerTool"
AdditionalDependencies="comsuppw.lib Delayimp.lib detours.lib dsound.lib dxguid.lib gdiplus.lib Psapi.lib qtmlClient.lib SetupAPI.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="2"
AdditionalLibraryDirectories="$(SolutionDir)bin\lib\$(ConfigurationName)_$(PlatformName);$(SolutionDir)lib\qt6;$(SolutionDir)lib\detours;$(SolutionDir)lib\lglcd;$(SolutionDir)lib\dx;$(DXSDK_DIR)Lib\x86"
AdditionalManifestDependencies=""
IgnoreDefaultLibraryNames="msvcrtd;libcmt"
DelayLoadDLLs="d3d9.dll;gdiplus.dll;psapi.dll"
- SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -306,7 +292,6 @@ PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
TargetEnvironment="3"
- TypeLibraryName="$(OutDir)\$(ProjectName).tlb"
/>
<Tool
Name="VCCLCompilerTool"
@@ -332,13 +317,9 @@ Name="VCLinkerTool"
AdditionalDependencies="comsuppw.lib Delayimp.lib detours.lib dsound.lib dxguid.lib gdiplus.lib Psapi.lib SetupAPI.lib strmiids.lib"
OutputFile="$(OutDir)\$(ProjectName)64.exe"
- LinkIncremental="2"
AdditionalLibraryDirectories="$(SolutionDir)bin\lib\$(ConfigurationName)_$(PlatformName);$(SolutionDir)lib64\lglcd;$(SolutionDir)lib64\detours;$(SolutionDir)lib64\dx;$(DXSDK_DIR)Lib\x64"
IgnoreDefaultLibraryNames="msvcrtd;libcmt"
DelayLoadDLLs="d3d9.dll;gdiplus.dll;psapi.dll"
- SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -569,10 +550,6 @@ >
</File>
<File
- RelativePath=".\OpenCapDeviceDlg.cpp"
- >
- </File>
- <File
RelativePath=".\OpenDirHelper.cpp"
>
</File>
@@ -1114,10 +1091,6 @@ >
</File>
<File
- RelativePath=".\OpenCapDeviceDlg.h"
- >
- </File>
- <File
RelativePath=".\OpenDirHelper.h"
>
</File>
diff --git a/src/apps/mplayerc/mplayerc.vcxproj b/src/apps/mplayerc/mplayerc.vcxproj index 69d059b51..509506089 100644 --- a/src/apps/mplayerc/mplayerc.vcxproj +++ b/src/apps/mplayerc/mplayerc.vcxproj @@ -55,22 +55,18 @@ <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>
<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|x64'" 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>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" 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>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -78,9 +74,7 @@ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin10\mpc-hc_x86\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin10\mpc-hc_x64\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin10\mpc-hc_x86_$(Configuration)\</OutDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin10\mpc-hc_x64_$(Configuration)\</OutDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)64</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)64</TargetName>
</PropertyGroup>
@@ -90,12 +84,6 @@ update_version.bat
</Command>
</PreBuildEvent>
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\Release_unicode/mplayerc.tlb</TypeLibraryName>
- </Midl>
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\dx;..\..\..\include\atl;..\..\filters\BaseClasses;..\..\thirdparty;..\..\thirdparty\libpng;..\..\thirdparty\MediaInfo;..\..\thirdparty\MediaInfo\MediaInfo;..\..\thirdparty\ZenLib;..\..\thirdparty\zlib;..\..\filters\renderer\VideoRenderers;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;DETOURS_X32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -114,10 +102,6 @@ update_version.bat <AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\$(Configuration)_$(Platform);$(SolutionDir)lib;$(SolutionDir)lib\qt6;$(SolutionDir)lib\detours;$(SolutionDir)lib\lglcd;$(SolutionDir)lib\dx;$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<DelayLoadDLLs>d3d9.dll;gdiplus.dll;psapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
- <SubSystem>Windows</SubSystem>
- <LargeAddressAware>true</LargeAddressAware>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>
<TargetMachine>MachineX86</TargetMachine>
</Link>
@@ -132,12 +116,6 @@ update_version.bat update_version.bat
</Command>
</PreBuildEvent>
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>.\Release_unicode/mplayerc.tlb</TypeLibraryName>
- </Midl>
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\dx;..\..\..\include\atl;..\..\filters\BaseClasses;..\..\thirdparty;..\..\thirdparty\libpng;..\..\thirdparty\MediaInfo;..\..\thirdparty\MediaInfo\MediaInfo;..\..\thirdparty\ZenLib;..\..\thirdparty\zlib;..\..\filters\renderer\VideoRenderers;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;NDEBUG;_WINDOWS;DETOURS_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -157,9 +135,6 @@ update_version.bat <AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\$(Configuration)_$(Platform);$(SolutionDir)lib64;$(SolutionDir)lib64\lglcd;$(SolutionDir)lib64\detours;$(SolutionDir)lib64\dx;$(DXSDK_DIR)Lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<DelayLoadDLLs>d3d9.dll;gdiplus.dll;psapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
<SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>
<TargetMachine>MachineX64</TargetMachine>
</Link>
@@ -173,12 +148,6 @@ update_version.bat update_version.bat
</Command>
</PreBuildEvent>
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
- </Midl>
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\dx;..\..\..\include\atl;..\..\filters\BaseClasses;..\..\thirdparty;..\..\thirdparty\libpng;..\..\thirdparty\MediaInfo;..\..\thirdparty\MediaInfo\MediaInfo;..\..\thirdparty\ZenLib;..\..\thirdparty\zlib;..\..\filters\renderer\VideoRenderers;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;DETOURS_X32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -196,10 +165,6 @@ update_version.bat <AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\$(Configuration)_$(Platform);$(SolutionDir)lib\qt6;$(SolutionDir)lib\detours;$(SolutionDir)lib\lglcd;$(SolutionDir)lib\dx;$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>msvcrtd;libcmt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<DelayLoadDLLs>d3d9.dll;gdiplus.dll;psapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
@@ -213,12 +178,6 @@ update_version.bat update_version.bat
</Command>
</PreBuildEvent>
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
- </Midl>
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\dx;..\..\..\include\atl;..\..\filters\BaseClasses;..\..\thirdparty;..\..\thirdparty\libpng;..\..\thirdparty\MediaInfo;..\..\thirdparty\MediaInfo\MediaInfo;..\..\thirdparty\ZenLib;..\..\thirdparty\zlib;..\..\filters\renderer\VideoRenderers;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;_DEBUG;_WINDOWS;DETOURS_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -237,10 +196,6 @@ update_version.bat <AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\$(Configuration)_$(Platform);$(SolutionDir)lib64\lglcd;$(SolutionDir)lib64\detours;$(SolutionDir)lib64\dx;$(DXSDK_DIR)Lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>msvcrtd;libcmt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<DelayLoadDLLs>d3d9.dll;gdiplus.dll;psapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
@@ -302,7 +257,6 @@ update_version.bat <ClCompile Include="Mpeg2SectionData.cpp" />
<ClCompile Include="mplayerc.cpp" />
<ClCompile Include="MultiMonitor.cpp" />
- <ClCompile Include="OpenCapDeviceDlg.cpp" />
<ClCompile Include="OpenDirHelper.cpp" />
<ClCompile Include="OpenDlg.cpp" />
<ClCompile Include="OpenFileDlg.cpp" />
@@ -440,7 +394,6 @@ update_version.bat <ClInclude Include="Mpeg2SectionData.h" />
<ClInclude Include="mplayerc.h" />
<ClInclude Include="MultiMonitor.h" />
- <ClInclude Include="OpenCapDeviceDlg.h" />
<ClInclude Include="OpenDirHelper.h" />
<ClInclude Include="OpenDlg.h" />
<ClInclude Include="OpenFileDlg.h" />
diff --git a/src/apps/mplayerc/mplayerc.vcxproj.filters b/src/apps/mplayerc/mplayerc.vcxproj.filters index a621df6b7..b6321432b 100644 --- a/src/apps/mplayerc/mplayerc.vcxproj.filters +++ b/src/apps/mplayerc/mplayerc.vcxproj.filters @@ -138,9 +138,6 @@ <ClCompile Include="MultiMonitor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="OpenCapDeviceDlg.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="OpenDlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -482,9 +479,6 @@ <ClInclude Include="MultiMonitor.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="OpenCapDeviceDlg.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="OpenDlg.h">
<Filter>Header Files</Filter>
</ClInclude>
|