diff options
Diffstat (limited to 'src/apps/mplayerc/stdafx.h')
| -rw-r--r-- | src/apps/mplayerc/stdafx.h | 44 |
1 files changed, 14 insertions, 30 deletions
diff --git a/src/apps/mplayerc/stdafx.h b/src/apps/mplayerc/stdafx.h index c580fc393..fc64a27bc 100644 --- a/src/apps/mplayerc/stdafx.h +++ b/src/apps/mplayerc/stdafx.h @@ -21,41 +21,23 @@ *
*/
-#if !defined(AFX_STDAFX_H__C76533D6_6242_4BEB_8FD3_C6BE58F07224__INCLUDED_)
-#define AFX_STDAFX_H__C76533D6_6242_4BEB_8FD3_C6BE58F07224__INCLUDED_
-
#pragma once
-#include "../../DSUtil/SharedInclude.h"
-
-#define HITTEST_RET LRESULT
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#undef _ATL_CSTRING_EXPLICIT_CONSTRUCTORS
+#include "../../../../include/stdafx_common_afx2.h"
+#include "../../../../include/stdafx_common_dshow.h"
-#include <afxwin.h> // MFC core and standard components
-#include <afxext.h> // MFC extensions
-#include <afxdisp.h> // MFC Automation classes
-#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
-#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h> // MFC support for Windows Common Controls
-#endif // _AFX_NO_AFXCMN_SUPPORT
#include <afxdlgs.h>
-#define ResStr(id) CString(MAKEINTRESOURCE(id))
-
-#include <afxdisp.h>
-#include <afxole.h>
#include <Shlwapi.h>
#include <atlcoll.h>
#include <atlpath.h>
-#include "../../thirdparty/zlib/zlib.h"
-#include <streams.h>
-#include <dvdmedia.h>
-#include <mpconfig.h>
-#ifndef _WIN64
-#include <qt/qt.h>
-#endif
+#define HITTEST_RET LRESULT
+#include "../../thirdparty/zlib/zlib.h"
#include "../../CmdUI/CmdUI.h"
#include "../../thirdparty/ui/ResizableLib/ResizableDialog.h"
#include "../../thirdparty/ui/ResizableLib/ResizablePage.h"
@@ -66,15 +48,17 @@ #include "../../thirdparty/ui/TreePropSheet/TreePropSheet.h"
#include "../../DSUtil/DSUtil.h"
+#ifndef _WIN64
+#include <qt/qt.h>
+#endif
+
#include <gdiplus.h>
+#include <mpconfig.h>
+
+#define ResStr(id) CString(MAKEINTRESOURCE(id))
template <class T = CString, class S = CString>
class CAtlStringMap : public CAtlMap<S, T, CStringElementTraits<S> > {};
#define CheckAndLog(x, msg) hr = ##x; if (FAILED (hr)) { TRACE(msg" : 0x%08x\n", hr); return hr; }
#define CheckNoLog(x) hr = ##x; if (FAILED (hr)) { return hr; }
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__C76533D6_6242_4BEB_8FD3_C6BE58F07224__INCLUDED_)
|