diff options
| author | drevil_xxl <drevil_xxl@users.sourceforge.net> | 2008-08-24 20:36:45 +0400 |
|---|---|---|
| committer | drevil_xxl <drevil_xxl@users.sourceforge.net> | 2008-08-24 20:36:45 +0400 |
| commit | e15557ec42e1e4210f57345f4e46a304b7c63752 (patch) | |
| tree | 922e7de1d26496908ac66ac2ea7b0f9f6ebbff2c /src | |
| parent | 86abba5bc0b4e11513834dae2a3fb4bcdfe88d6c (diff) | |
updates for x64
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@754 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src')
140 files changed, 308 insertions, 301 deletions
diff --git a/src/apps/mplayerc/FGManager.cpp b/src/apps/mplayerc/FGManager.cpp index 7b60fcc4c..2746c8cb8 100644 --- a/src/apps/mplayerc/FGManager.cpp +++ b/src/apps/mplayerc/FGManager.cpp @@ -1338,7 +1338,7 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) #if INTERNAL_SOURCEFILTER_DVSOURCE
// TODOX64 : fix DVSource internal filter
-#ifndef WIN64
+#ifndef _WIN64
__if_exists(CD2VSource)
{
if(src & SRC_D2V)
diff --git a/src/apps/mplayerc/FakeFilterMapper2.cpp b/src/apps/mplayerc/FakeFilterMapper2.cpp index 7b2c8df4a..0ac1105b6 100644 --- a/src/apps/mplayerc/FakeFilterMapper2.cpp +++ b/src/apps/mplayerc/FakeFilterMapper2.cpp @@ -30,7 +30,7 @@ #include <qedit.h>
-#ifdef WIN64 // TODOX64
+#ifdef _WIN64 // TODOX64
//#include "detours.h"
//#define DetourFunctionWithTrampoline(a,b) DetourAttach((PVOID*)a,(PVOID)b)
#define DetourFunctionWithTrampoline(a,b) /**/
@@ -225,7 +225,7 @@ LONG (WINAPI * Real_RegSetValueW)(HKEY a0, LPCWSTR a1, DWORD a2, LPCWSTR a3, DWO LONG (WINAPI * Real_RegSetValueA)(HKEY a0, LPCSTR a1, DWORD a2, LPCSTR a3, DWORD a4)
= RegSetValueA;
-#else /* WIN64 */
+#else /* _WIN64 */
#include <detours\detours.h>
@@ -258,7 +258,7 @@ DETOUR_TRAMPOLINE(LONG WINAPI Real_RegSetValueA(HKEY a0, LPCSTR a1, DWORD a2, LP DETOUR_TRAMPOLINE(LONG WINAPI Real_RegSetValueW(HKEY a0, LPCWSTR a1, DWORD a2, LPCWSTR a3, DWORD a4), RegSetValueW);
DETOUR_TRAMPOLINE(LONG WINAPI Real_RegSetValueExA(HKEY a0, LPCSTR a1, DWORD a2, DWORD a3, BYTE* a4, DWORD a5), RegSetValueExA);
DETOUR_TRAMPOLINE(LONG WINAPI Real_RegSetValueExW(HKEY a0, LPCWSTR a1, DWORD a2, DWORD a3, BYTE* a4, DWORD a5), RegSetValueExW);
-#endif /* WIN64 */
+#endif /* _WIN64 */
HRESULT WINAPI Mine_CoCreateInstance(IN REFCLSID rclsid, IN LPUNKNOWN pUnkOuter,
IN DWORD dwClsContext, IN REFIID riid, OUT LPVOID FAR* ppv)
diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp index 5fa23b692..e70ea6fe4 100644 --- a/src/apps/mplayerc/MainFrm.cpp +++ b/src/apps/mplayerc/MainFrm.cpp @@ -7433,7 +7433,7 @@ void CMainFrame::OpenCreateGraphObject(OpenMediaData* pOMD) }
else if(engine == QuickTime)
{
-#ifdef WIN64 // TODOX64
+#ifdef _WIN64 // TODOX64
MessageBox (ResStr(IDS_MAINFRM_78), _T(""), MB_OK);
#else
if(!(pUnk = (IUnknown*)(INonDelegatingUnknown*)new CQuicktimeGraph(m_pVideoWnd->m_hWnd, hr)))
@@ -11303,7 +11303,7 @@ int __stdcall BrowseCallbackProcDIR(HWND hwnd,UINT uMsg,LPARAM lParam,LPARAM SetWindowPos(checkbox, HWND_BOTTOM, (ListViewRect.left-Dialog.left), ClientArea.bottom - 35, 120, 27, SWP_SHOWWINDOW);
SetFont(checkbox,_T("Tahoma"),13);
-#ifdef WIN64
+#ifdef _WIN64
CBProc = (WNDPROC) SetWindowLong(checkbox, GWLP_WNDPROC, (LONG) CheckBoxSubclassProc);
#else
CBProc = (WNDPROC) SetWindowLong(checkbox, GWL_WNDPROC, (LONG) CheckBoxSubclassProc);
diff --git a/src/apps/mplayerc/MainFrm.h b/src/apps/mplayerc/MainFrm.h index 55e4d7773..755d15399 100644 --- a/src/apps/mplayerc/MainFrm.h +++ b/src/apps/mplayerc/MainFrm.h @@ -47,12 +47,12 @@ #include "IGraphBuilder2.h"
#include "RealMediaGraph.h"
-#ifdef WIN64
+#ifdef _WIN64
// TODOX64 : add QuickTime support when available!
#pragma message ("No support for Quick Time for X64 yet!")
-#else /* WIN64 */
+#else /* _WIN64 */
#include "QuicktimeGraph.h"
-#endif /* WIN64 */
+#endif /* _WIN64 */
#include "ShockwaveGraph.h"
#include <IChapterInfo.h>
diff --git a/src/apps/mplayerc/OpenFileDlg.cpp b/src/apps/mplayerc/OpenFileDlg.cpp index 740145d90..0c297e743 100644 --- a/src/apps/mplayerc/OpenFileDlg.cpp +++ b/src/apps/mplayerc/OpenFileDlg.cpp @@ -80,7 +80,7 @@ BOOL COpenFileDlg::OnInitDialog() {
CFileDialog::OnInitDialog();
-#ifdef WIN64
+#ifdef _WIN64
m_wndProc = (WNDPROC)SetWindowLong(GetParent()->m_hWnd, GWLP_WNDPROC , (LONG)WindowProcNew);
#else
m_wndProc = (WNDPROC)SetWindowLong(GetParent()->m_hWnd, GWL_WNDPROC, (LONG)WindowProcNew);
diff --git a/src/apps/mplayerc/StdAfx.h b/src/apps/mplayerc/StdAfx.h index 0b304ac1e..f318bc65b 100644 --- a/src/apps/mplayerc/StdAfx.h +++ b/src/apps/mplayerc/StdAfx.h @@ -65,7 +65,7 @@ #include <streams.h>
#include <dvdmedia.h>
#include <mpconfig.h>
-#ifdef WIN64
+#ifdef _WIN64
#else
#include <qt\qt.h>
#endif
diff --git a/src/apps/mplayerc/mplayerc.cpp b/src/apps/mplayerc/mplayerc.cpp index 4cfc6b95c..f67a909d4 100644 --- a/src/apps/mplayerc/mplayerc.cpp +++ b/src/apps/mplayerc/mplayerc.cpp @@ -452,7 +452,7 @@ void CMPlayerCApp::SendCommandLine(HWND hWnd) #include <winddk\ntddcdvd.h>
-#ifdef WIN64
+#ifdef _WIN64
//#include "detours.h"
//#define DetourFunctionWithTrampoline(a,b) DetourAttach((PVOID*)a,(PVOID)b)
#define DetourFunctionWithTrampoline(a,b) /**/
@@ -706,7 +706,7 @@ BOOL CMPlayerCApp::InitInstance() {
//ssftest s;
-#ifdef WIN64
+#ifdef _WIN64
// DetourTransactionBegin();
// DetourUpdateThread(GetCurrentThread());
#endif
@@ -722,7 +722,7 @@ BOOL CMPlayerCApp::InitInstance() CFilterMapper2::Init();
-#ifdef WIN64
+#ifdef _WIN64
// DetourTransactionCommit();
#endif
diff --git a/src/apps/mplayerc/mplayerc.vcproj b/src/apps/mplayerc/mplayerc.vcproj index 1c5f0ffed..4c3ea3b27 100644 --- a/src/apps/mplayerc/mplayerc.vcproj +++ b/src/apps/mplayerc/mplayerc.vcproj @@ -138,7 +138,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\include;..\..\zlib"
- PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;DETOURS_X64"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_WINDOWS;DETOURS_X64"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(OutDir)\$(ProjectName).pch"
/>
@@ -307,7 +307,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\include;..\..\zlib"
- PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;DETOURS_X64"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_WINDOWS;DETOURS_X64"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(OutDir)\$(ProjectName).pch"
DebugInformationFormat="3"
@@ -538,7 +538,7 @@ >
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="NDEBUG,_WIN64"
/>
</FileConfiguration>
<FileConfiguration
@@ -546,7 +546,7 @@ >
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG, WIN64"
+ PreprocessorDefinitions="_DEBUG,_WIN64"
/>
</FileConfiguration>
</File>
diff --git a/src/apps/mplayerc/mplayerc_vs2005.vcproj b/src/apps/mplayerc/mplayerc_vs2005.vcproj index 29a1d2161..f50e5e28b 100644 --- a/src/apps/mplayerc/mplayerc_vs2005.vcproj +++ b/src/apps/mplayerc/mplayerc_vs2005.vcproj @@ -29,7 +29,7 @@ >
<Tool
Name="VCPreBuildEventTool"
- CommandLine="if not exist "%programfiles%\TortoiseSVN\bin\SubWCRev.exe" goto x64
"%programfiles%\TortoiseSVN\bin\SubWCRev.exe" ..\..\.. ..\..\..\include\SubWCRev.conf ..\..\..\include\Version.h
goto End

:x64
if not exist "%ProgramW6432%\TortoiseSVN\bin\SubWCRev.exe" goto NoChrisWillem
"%ProgramW6432%\TortoiseSVN\bin\SubWCRev.exe" ..\..\.. ..\..\..\include\SubWCRev.conf ..\..\..\include\Version.h
goto End

:NoChrisWillem
echo #pragma once >..\..\..\include\Version.h
echo #define VERSION_MAJOR 1 >>..\..\..\include\Version.h
echo #define VERSION_MINOR 1 >>..\..\..\include\Version.h
echo #define VERSION_REV 666 >>..\..\..\include\Version.h
echo #define VERSION_PATCH 0 >>..\..\..\include\Version.h

:End

if exist ..\..\..\include\UserConfig.h goto SpecificConfig
echo #pragma once >..\..\..\include\UserConfig.h
echo //#ifdef ENABLE_MINIDUMP >>..\..\..\include\UserConfig.h

:SpecificConfig"
+ CommandLine="if not exist "%programfiles%\TortoiseSVN\bin\SubWCRev.exe" goto x64
"%programfiles%\TortoiseSVN\bin\SubWCRev.exe" ..\..\.. ..\..\..\include\SubWCRev.conf ..\..\..\include\Version.h
goto End

:x64
if not exist "%ProgramW6432%\TortoiseSVN\bin\SubWCRev.exe" goto NoChrisWillem
"%ProgramW6432%\TortoiseSVN\bin\SubWCRev.exe" ..\..\.. ..\..\..\include\SubWCRev.conf ..\..\..\include\Version.h
goto End

:NoChrisWillem
echo #pragma once >..\..\..\include\Version.h
echo #define VERSION_MAJOR 1 >>..\..\..\include\Version.h
echo #define VERSION_MINOR 1 >>..\..\..\include\Version.h
echo #define VERSION_REV 666 >>..\..\..\include\Version.h
echo #define VERSION_PATCH 0 >>..\..\..\include\Version.h

:End

if exist ..\..\..\include\UserConfig.h goto SpecificConfig
echo #pragma once >..\..\..\include\UserConfig.h
echo //#define ENABLE_MINIDUMP >>..\..\..\include\UserConfig.h

:SpecificConfig
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -118,7 +118,7 @@ >
<Tool
Name="VCPreBuildEventTool"
- CommandLine="if not exist "%programfiles%\TortoiseSVN\bin\SubWCRev.exe" goto x64
"%programfiles%\TortoiseSVN\bin\SubWCRev.exe" ..\..\.. ..\..\..\include\SubWCRev.conf ..\..\..\include\Version.h
goto End

:x64
if not exist "%ProgramW6432%\TortoiseSVN\bin\SubWCRev.exe" goto NoChrisWillem
"%ProgramW6432%\TortoiseSVN\bin\SubWCRev.exe" ..\..\.. ..\..\..\include\SubWCRev.conf ..\..\..\include\Version.h
goto End

:NoChrisWillem
echo #pragma once >..\..\..\include\Version.h
echo #define VERSION_MAJOR 1 >>..\..\..\include\Version.h
echo #define VERSION_MINOR 1 >>..\..\..\include\Version.h
echo #define VERSION_REV 666 >>..\..\..\include\Version.h
echo #define VERSION_PATCH 0 >>..\..\..\include\Version.h

:End

if exist ..\..\..\include\UserConfig.h goto SpecificConfig
echo #pragma once >..\..\..\include\UserConfig.h
echo //#ifdef ENABLE_MINIDUMP >>..\..\..\include\UserConfig.h

:SpecificConfig"
+ CommandLine="if not exist "%programfiles%\TortoiseSVN\bin\SubWCRev.exe" goto x64
"%programfiles%\TortoiseSVN\bin\SubWCRev.exe" ..\..\.. ..\..\..\include\SubWCRev.conf ..\..\..\include\Version.h
goto End

:x64
if not exist "%ProgramW6432%\TortoiseSVN\bin\SubWCRev.exe" goto NoChrisWillem
"%ProgramW6432%\TortoiseSVN\bin\SubWCRev.exe" ..\..\.. ..\..\..\include\SubWCRev.conf ..\..\..\include\Version.h
goto End

:NoChrisWillem
echo #pragma once >..\..\..\include\Version.h
echo #define VERSION_MAJOR 1 >>..\..\..\include\Version.h
echo #define VERSION_MINOR 1 >>..\..\..\include\Version.h
echo #define VERSION_REV 666 >>..\..\..\include\Version.h
echo #define VERSION_PATCH 0 >>..\..\..\include\Version.h

:End

if exist ..\..\..\include\UserConfig.h goto SpecificConfig
echo #pragma once >..\..\..\include\UserConfig.h
echo //#define ENABLE_MINIDUMP >>..\..\..\include\UserConfig.h

:SpecificConfig
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -139,7 +139,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\include;..\..\zlib"
- PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;DETOURS_X64"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_WINDOWS;DETOURS_X64"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(OutDir)\$(ProjectName).pch"
/>
@@ -307,7 +307,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\include;..\..\zlib"
- PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;DETOURS_X64"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_WINDOWS;DETOURS_X64"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(OutDir)\$(ProjectName).pch"
DebugInformationFormat="3"
@@ -538,7 +538,7 @@ >
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG, WIN64"
+ PreprocessorDefinitions="NDEBUG,_WIN64"
/>
</FileConfiguration>
<FileConfiguration
@@ -546,7 +546,7 @@ >
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG, WIN64"
+ PreprocessorDefinitions="_DEBUG,_WIN64"
/>
</FileConfiguration>
</File>
diff --git a/src/apps/mplayerc/res/mplayerc.rc2 b/src/apps/mplayerc/res/mplayerc.rc2 index e62f92105..78d181e8b 100644 --- a/src/apps/mplayerc/res/mplayerc.rc2 +++ b/src/apps/mplayerc/res/mplayerc.rc2 @@ -18,7 +18,7 @@ //
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -39,7 +39,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT // FILE
//
-#ifdef WIN64
+#ifdef _WIN64
IDF_LOGO1 FILE "res\\x64\\logo.1.png"
IDF_LOGO2 FILE "res\\x64\\logo.2.png"
IDF_LOGO3 FILE "res\\x64\\logo.3.png"
diff --git a/src/decss/decss.vcproj b/src/decss/decss.vcproj index 97e55da7c..ed27cb07c 100644 --- a/src/decss/decss.vcproj +++ b/src/decss/decss.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"
DebugInformationFormat="3"
/>
<Tool
@@ -220,7 +220,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -373,4 +373,4 @@ Value="0"
/>
</Globals>
-</VisualStudioProject>
+</VisualStudioProject>
\ No newline at end of file diff --git a/src/decss/decss_vs2005.vcproj b/src/decss/decss_vs2005.vcproj index c220259f6..8c26130bf 100644 --- a/src/decss/decss_vs2005.vcproj +++ b/src/decss/decss_vs2005.vcproj @@ -102,7 +102,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"
DebugInformationFormat="3"
/>
<Tool
@@ -219,7 +219,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -372,4 +372,4 @@ Value="0"
/>
</Globals>
-</VisualStudioProject>
+</VisualStudioProject>
\ No newline at end of file diff --git a/src/dsutil/DSUtil.cpp b/src/dsutil/DSUtil.cpp index 3e5645a7d..283f2b136 100644 --- a/src/dsutil/DSUtil.cpp +++ b/src/dsutil/DSUtil.cpp @@ -927,7 +927,7 @@ REFERENCE_TIME HMSF2RT(DVD_HMSF_TIMECODE hmsf, double fps) void memsetd(void* dst, unsigned int c, int nbytes)
{
-#ifdef WIN64
+#ifdef _WIN64
for (int i=0; i<nbytes/sizeof(DWORD); i++)
((DWORD*)dst)[i] = c;
#else
diff --git a/src/dsutil/dsutil.vcproj b/src/dsutil/dsutil.vcproj index 6d2d09064..19ab327e8 100644 --- a/src/dsutil/dsutil.vcproj +++ b/src/dsutil/dsutil.vcproj @@ -104,7 +104,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
@@ -224,7 +224,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -560,4 +560,4 @@ Value="0"
/>
</Globals>
-</VisualStudioProject>
+</VisualStudioProject>
\ No newline at end of file diff --git a/src/dsutil/dsutil_vs2005.vcproj b/src/dsutil/dsutil_vs2005.vcproj index c27ea9e13..ecfc9faf7 100644 --- a/src/dsutil/dsutil_vs2005.vcproj +++ b/src/dsutil/dsutil_vs2005.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
@@ -223,7 +223,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -559,4 +559,4 @@ Value="0"
/>
</Globals>
-</VisualStudioProject>
+</VisualStudioProject>
\ No newline at end of file diff --git a/src/dsutil/vd.cpp b/src/dsutil/vd.cpp index a5dd9a46f..9ca4e2cce 100644 --- a/src/dsutil/vd.cpp +++ b/src/dsutil/vd.cpp @@ -27,7 +27,7 @@ #pragma warning(disable : 4799) // no emms... blahblahblah
-#ifdef WIN64
+#ifdef _WIN64 // _WIN64
CCpuID g_cpuid;
@@ -111,19 +111,6 @@ bool BitBltFromI420ToYUY2(int w, int h, BYTE* dst, int dstpitch, BYTE* srcy, BYT if(srcpitch == 0) srcpitch = w;
-#ifndef WIN64
- if(!((DWORD_PTR)srcy&15) && !((DWORD_PTR)srcu&15) && !((DWORD_PTR)srcv&15) && !(srcpitch&31)
- && !((DWORD_PTR)dst&15) && !(dstpitch&15))
- {
- ASSERT (FALSE);
- return false;
- }
- else
- {
- ASSERT(!fInterlaced);
- }
-#endif
-
do
{
yuvtoyuy2row_c(dst, srcy, srcu, srcv, w);
@@ -320,7 +307,7 @@ void AvgLines8(BYTE* dst, DWORD h, DWORD pitch) }
-#else
+#else // _WIN64
CCpuID::CCpuID()
{
@@ -1803,4 +1790,4 @@ bool BitBltFromYUY2ToRGB(int w, int h, BYTE* dst, int dstpitch, int dbpp, BYTE* return(true);
}
-#endif //WIN64
+#endif //_WIN64
diff --git a/src/filters/BaseClasses/baseclasses.vcproj b/src/filters/BaseClasses/baseclasses.vcproj index 9072e4f8f..50eeb3f58 100644 --- a/src/filters/BaseClasses/baseclasses.vcproj +++ b/src/filters/BaseClasses/baseclasses.vcproj @@ -114,7 +114,7 @@ Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="."
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -246,7 +246,7 @@ Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories="."
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
diff --git a/src/filters/BaseClasses/baseclasses_vs2005.vcproj b/src/filters/BaseClasses/baseclasses_vs2005.vcproj index e4b7c088e..d00a72f94 100644 --- a/src/filters/BaseClasses/baseclasses_vs2005.vcproj +++ b/src/filters/BaseClasses/baseclasses_vs2005.vcproj @@ -113,7 +113,7 @@ Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="."
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -245,7 +245,7 @@ Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories="."
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
diff --git a/src/filters/filters.vcproj b/src/filters/filters.vcproj index 66c91f000..70a3bf154 100644 --- a/src/filters/filters.vcproj +++ b/src/filters/filters.vcproj @@ -101,7 +101,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -216,7 +216,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -345,4 +345,4 @@ Value="0"
/>
</Globals>
-</VisualStudioProject>
+</VisualStudioProject>
\ No newline at end of file diff --git a/src/filters/filters_vs2005.vcproj b/src/filters/filters_vs2005.vcproj index 912d7fbe2..ccee3d706 100644 --- a/src/filters/filters_vs2005.vcproj +++ b/src/filters/filters_vs2005.vcproj @@ -100,7 +100,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -215,7 +215,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -344,4 +344,4 @@ Value="0"
/>
</Globals>
-</VisualStudioProject>
+</VisualStudioProject>
\ No newline at end of file diff --git a/src/filters/muxer/basemuxer/BaseMuxer.vcproj b/src/filters/muxer/basemuxer/BaseMuxer.vcproj index f82d94558..1757dc54a 100644 --- a/src/filters/muxer/basemuxer/BaseMuxer.vcproj +++ b/src/filters/muxer/basemuxer/BaseMuxer.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -220,7 +220,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/muxer/basemuxer/BaseMuxer_vs2005.vcproj b/src/filters/muxer/basemuxer/BaseMuxer_vs2005.vcproj index 826df5617..a607221d1 100644 --- a/src/filters/muxer/basemuxer/BaseMuxer_vs2005.vcproj +++ b/src/filters/muxer/basemuxer/BaseMuxer_vs2005.vcproj @@ -102,7 +102,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -219,7 +219,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/muxer/dsmmuxer/DSMMuxer.vcproj b/src/filters/muxer/dsmmuxer/DSMMuxer.vcproj index 1c8290f1a..a689d8de5 100644 --- a/src/filters/muxer/dsmmuxer/DSMMuxer.vcproj +++ b/src/filters/muxer/dsmmuxer/DSMMuxer.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -220,7 +220,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/muxer/dsmmuxer/DSMMuxer_vs2005.vcproj b/src/filters/muxer/dsmmuxer/DSMMuxer_vs2005.vcproj index 5a2dfcf88..6222109ba 100644 --- a/src/filters/muxer/dsmmuxer/DSMMuxer_vs2005.vcproj +++ b/src/filters/muxer/dsmmuxer/DSMMuxer_vs2005.vcproj @@ -102,7 +102,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -219,7 +219,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/muxer/matroskamuxer/MatroskaMuxer.vcproj b/src/filters/muxer/matroskamuxer/MatroskaMuxer.vcproj index a8a4adf9c..7643df6ca 100644 --- a/src/filters/muxer/matroskamuxer/MatroskaMuxer.vcproj +++ b/src/filters/muxer/matroskamuxer/MatroskaMuxer.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -220,7 +220,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/muxer/matroskamuxer/MatroskaMuxer_vs2005.vcproj b/src/filters/muxer/matroskamuxer/MatroskaMuxer_vs2005.vcproj index 7172fc46e..3e8df5765 100644 --- a/src/filters/muxer/matroskamuxer/MatroskaMuxer_vs2005.vcproj +++ b/src/filters/muxer/matroskamuxer/MatroskaMuxer_vs2005.vcproj @@ -102,7 +102,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -219,7 +219,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/muxer/wavdest/wavdest.vcproj b/src/filters/muxer/wavdest/wavdest.vcproj index 0d9a5f5f2..b71e4793d 100644 --- a/src/filters/muxer/wavdest/wavdest.vcproj +++ b/src/filters/muxer/wavdest/wavdest.vcproj @@ -101,7 +101,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -216,7 +216,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/muxer/wavdest/wavdest_vs2005.vcproj b/src/filters/muxer/wavdest/wavdest_vs2005.vcproj index edac19776..dac00224f 100644 --- a/src/filters/muxer/wavdest/wavdest_vs2005.vcproj +++ b/src/filters/muxer/wavdest/wavdest_vs2005.vcproj @@ -100,7 +100,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -215,7 +215,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/avisplitter/AviSplitter.vcproj b/src/filters/parser/avisplitter/AviSplitter.vcproj index 1267a0069..4822b4a14 100644 --- a/src/filters/parser/avisplitter/AviSplitter.vcproj +++ b/src/filters/parser/avisplitter/AviSplitter.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -220,7 +220,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/avisplitter/AviSplitter_vs2005.vcproj b/src/filters/parser/avisplitter/AviSplitter_vs2005.vcproj index 8afd4ef25..9addb7c5c 100644 --- a/src/filters/parser/avisplitter/AviSplitter_vs2005.vcproj +++ b/src/filters/parser/avisplitter/AviSplitter_vs2005.vcproj @@ -102,7 +102,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -219,7 +219,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/basesplitter/basesplitter.vcproj b/src/filters/parser/basesplitter/basesplitter.vcproj index 370c88f5b..94a2441e8 100644 --- a/src/filters/parser/basesplitter/basesplitter.vcproj +++ b/src/filters/parser/basesplitter/basesplitter.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -220,7 +220,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/basesplitter/basesplitter_vs2005.vcproj b/src/filters/parser/basesplitter/basesplitter_vs2005.vcproj index cb857ad6e..832b2d9d9 100644 --- a/src/filters/parser/basesplitter/basesplitter_vs2005.vcproj +++ b/src/filters/parser/basesplitter/basesplitter_vs2005.vcproj @@ -102,7 +102,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -219,7 +219,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/diracsplitter/DiracSplitter.vcproj b/src/filters/parser/diracsplitter/DiracSplitter.vcproj index ff9fa8d5f..a4a325b5e 100644 --- a/src/filters/parser/diracsplitter/DiracSplitter.vcproj +++ b/src/filters/parser/diracsplitter/DiracSplitter.vcproj @@ -104,7 +104,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\libdirac;..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -223,7 +223,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\libdirac;..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/diracsplitter/DiracSplitter_vs2005.vcproj b/src/filters/parser/diracsplitter/DiracSplitter_vs2005.vcproj index 492446127..d7ca802fa 100644 --- a/src/filters/parser/diracsplitter/DiracSplitter_vs2005.vcproj +++ b/src/filters/parser/diracsplitter/DiracSplitter_vs2005.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\libdirac;..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -222,7 +222,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\libdirac;..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/diracsplitter/libdirac/libdirac.vcproj b/src/filters/parser/diracsplitter/libdirac/libdirac.vcproj index 9c6e872bd..a9514e19e 100644 --- a/src/filters/parser/diracsplitter/libdirac/libdirac.vcproj +++ b/src/filters/parser/diracsplitter/libdirac/libdirac.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="."
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
UsePrecompiledHeader="0"
DebugInformationFormat="3"
/>
@@ -220,7 +220,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="."
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB;HAVE_MMX"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;HAVE_MMX"
UsePrecompiledHeader="0"
/>
<Tool
diff --git a/src/filters/parser/diracsplitter/libdirac/libdirac_vs2005.vcproj b/src/filters/parser/diracsplitter/libdirac/libdirac_vs2005.vcproj index ffd1372c4..3bf38a3df 100644 --- a/src/filters/parser/diracsplitter/libdirac/libdirac_vs2005.vcproj +++ b/src/filters/parser/diracsplitter/libdirac/libdirac_vs2005.vcproj @@ -102,7 +102,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="."
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
UsePrecompiledHeader="0"
DebugInformationFormat="3"
/>
@@ -219,7 +219,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="."
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB;HAVE_MMX"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;HAVE_MMX"
UsePrecompiledHeader="0"
/>
<Tool
diff --git a/src/filters/parser/dsmsplitter/DSMSplitter.vcproj b/src/filters/parser/dsmsplitter/DSMSplitter.vcproj index 6b81bb95a..f5737d02d 100644 --- a/src/filters/parser/dsmsplitter/DSMSplitter.vcproj +++ b/src/filters/parser/dsmsplitter/DSMSplitter.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -220,7 +220,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/dsmsplitter/DSMSplitter_vs2005.vcproj b/src/filters/parser/dsmsplitter/DSMSplitter_vs2005.vcproj index a9ef9bae0..9305106bf 100644 --- a/src/filters/parser/dsmsplitter/DSMSplitter_vs2005.vcproj +++ b/src/filters/parser/dsmsplitter/DSMSplitter_vs2005.vcproj @@ -102,7 +102,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -219,7 +219,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/flvsplitter/FLVSplitter.vcproj b/src/filters/parser/flvsplitter/FLVSplitter.vcproj index 5fba6430f..077391ee7 100644 --- a/src/filters/parser/flvsplitter/FLVSplitter.vcproj +++ b/src/filters/parser/flvsplitter/FLVSplitter.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -220,7 +220,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/flvsplitter/FLVSplitter_vs2005.vcproj b/src/filters/parser/flvsplitter/FLVSplitter_vs2005.vcproj index a914fedd8..81321bc50 100644 --- a/src/filters/parser/flvsplitter/FLVSplitter_vs2005.vcproj +++ b/src/filters/parser/flvsplitter/FLVSplitter_vs2005.vcproj @@ -102,7 +102,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -219,7 +219,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/matroskasplitter/MatroskaSplitter.vcproj b/src/filters/parser/matroskasplitter/MatroskaSplitter.vcproj index 876d086aa..a83238796 100644 --- a/src/filters/parser/matroskasplitter/MatroskaSplitter.vcproj +++ b/src/filters/parser/matroskasplitter/MatroskaSplitter.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -220,7 +220,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/matroskasplitter/MatroskaSplitter_vs2005.vcproj b/src/filters/parser/matroskasplitter/MatroskaSplitter_vs2005.vcproj index 934f298d7..2f6e35ae8 100644 --- a/src/filters/parser/matroskasplitter/MatroskaSplitter_vs2005.vcproj +++ b/src/filters/parser/matroskasplitter/MatroskaSplitter_vs2005.vcproj @@ -102,7 +102,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -219,7 +219,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/mp4splitter/AP4/Source/Config/Ap4Config.h b/src/filters/parser/mp4splitter/AP4/Source/Config/Ap4Config.h index ae6f24d7e..143d2e86c 100644 --- a/src/filters/parser/mp4splitter/AP4/Source/Config/Ap4Config.h +++ b/src/filters/parser/mp4splitter/AP4/Source/Config/Ap4Config.h @@ -58,7 +58,7 @@ /*----------------------------------------------------------------------
| Win32 specifics
+---------------------------------------------------------------------*/
-#if defined(WIN32) || defined(WIN64)
+#if defined(WIN32) || defined(_WIN64)
#define snprintf _snprintf
#if _MSC_VER < 1500
#define vsnprintf _vsnprintf
diff --git a/src/filters/parser/mp4splitter/MP4Splitter.vcproj b/src/filters/parser/mp4splitter/MP4Splitter.vcproj index adb14f7a6..936316a1a 100644 --- a/src/filters/parser/mp4splitter/MP4Splitter.vcproj +++ b/src/filters/parser/mp4splitter/MP4Splitter.vcproj @@ -104,7 +104,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
DisableSpecificWarnings="4812"
/>
@@ -222,7 +222,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
DisableSpecificWarnings="4812"
/>
<Tool
diff --git a/src/filters/parser/mp4splitter/MP4Splitter_vs2005.vcproj b/src/filters/parser/mp4splitter/MP4Splitter_vs2005.vcproj index fc6036a89..40c166e1e 100644 --- a/src/filters/parser/mp4splitter/MP4Splitter_vs2005.vcproj +++ b/src/filters/parser/mp4splitter/MP4Splitter_vs2005.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
DisableSpecificWarnings="4812"
/>
@@ -221,7 +221,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
DisableSpecificWarnings="4812"
/>
<Tool
diff --git a/src/filters/parser/mpasplitter/MpaSplitter.vcproj b/src/filters/parser/mpasplitter/MpaSplitter.vcproj index 867a09bbe..04b8e0c0a 100644 --- a/src/filters/parser/mpasplitter/MpaSplitter.vcproj +++ b/src/filters/parser/mpasplitter/MpaSplitter.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -220,7 +220,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/mpasplitter/MpaSplitter_vs2005.vcproj b/src/filters/parser/mpasplitter/MpaSplitter_vs2005.vcproj index eff60a84d..a360ec25c 100644 --- a/src/filters/parser/mpasplitter/MpaSplitter_vs2005.vcproj +++ b/src/filters/parser/mpasplitter/MpaSplitter_vs2005.vcproj @@ -102,7 +102,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -219,7 +219,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/mpegsplitter/MpegSplitter.vcproj b/src/filters/parser/mpegsplitter/MpegSplitter.vcproj index 3e63c1650..565c8204a 100644 --- a/src/filters/parser/mpegsplitter/MpegSplitter.vcproj +++ b/src/filters/parser/mpegsplitter/MpegSplitter.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -220,7 +220,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/mpegsplitter/MpegSplitter_vs2005.vcproj b/src/filters/parser/mpegsplitter/MpegSplitter_vs2005.vcproj index 9d39780df..395dc635d 100644 --- a/src/filters/parser/mpegsplitter/MpegSplitter_vs2005.vcproj +++ b/src/filters/parser/mpegsplitter/MpegSplitter_vs2005.vcproj @@ -102,7 +102,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -219,7 +219,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/nutsplitter/NutSplitter.vcproj b/src/filters/parser/nutsplitter/NutSplitter.vcproj index 8fc65f0f3..111f4fefd 100644 --- a/src/filters/parser/nutsplitter/NutSplitter.vcproj +++ b/src/filters/parser/nutsplitter/NutSplitter.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -220,7 +220,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/nutsplitter/NutSplitter_vs2005.vcproj b/src/filters/parser/nutsplitter/NutSplitter_vs2005.vcproj index 0f8fa9de7..64db63241 100644 --- a/src/filters/parser/nutsplitter/NutSplitter_vs2005.vcproj +++ b/src/filters/parser/nutsplitter/NutSplitter_vs2005.vcproj @@ -102,7 +102,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -219,7 +219,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/oggsplitter/OggSplitter.vcproj b/src/filters/parser/oggsplitter/OggSplitter.vcproj index e3cc580f2..960291203 100644 --- a/src/filters/parser/oggsplitter/OggSplitter.vcproj +++ b/src/filters/parser/oggsplitter/OggSplitter.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -220,7 +220,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/oggsplitter/OggSplitter_vs2005.vcproj b/src/filters/parser/oggsplitter/OggSplitter_vs2005.vcproj index d055a2b81..296a1e939 100644 --- a/src/filters/parser/oggsplitter/OggSplitter_vs2005.vcproj +++ b/src/filters/parser/oggsplitter/OggSplitter_vs2005.vcproj @@ -102,7 +102,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -219,7 +219,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/realmediasplitter/RealMediaSplitter.vcproj b/src/filters/parser/realmediasplitter/RealMediaSplitter.vcproj index 0b0636cf9..a9d431833 100644 --- a/src/filters/parser/realmediasplitter/RealMediaSplitter.vcproj +++ b/src/filters/parser/realmediasplitter/RealMediaSplitter.vcproj @@ -105,7 +105,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -226,7 +226,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/realmediasplitter/RealMediaSplitter_vs2005.vcproj b/src/filters/parser/realmediasplitter/RealMediaSplitter_vs2005.vcproj index bf7a05695..20eb34720 100644 --- a/src/filters/parser/realmediasplitter/RealMediaSplitter_vs2005.vcproj +++ b/src/filters/parser/realmediasplitter/RealMediaSplitter_vs2005.vcproj @@ -104,7 +104,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -225,7 +225,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/roqsplitter/RoQSplitter.vcproj b/src/filters/parser/roqsplitter/RoQSplitter.vcproj index 6d5c158db..afe2b2cb4 100644 --- a/src/filters/parser/roqsplitter/RoQSplitter.vcproj +++ b/src/filters/parser/roqsplitter/RoQSplitter.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -220,7 +220,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/roqsplitter/RoQSplitter_vs2005.vcproj b/src/filters/parser/roqsplitter/RoQSplitter_vs2005.vcproj index d26442e76..28a5c7efa 100644 --- a/src/filters/parser/roqsplitter/RoQSplitter_vs2005.vcproj +++ b/src/filters/parser/roqsplitter/RoQSplitter_vs2005.vcproj @@ -102,7 +102,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -219,7 +219,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/ssfsplitter/SSFSplitter.vcproj b/src/filters/parser/ssfsplitter/SSFSplitter.vcproj index b573f7182..e78957245 100644 --- a/src/filters/parser/ssfsplitter/SSFSplitter.vcproj +++ b/src/filters/parser/ssfsplitter/SSFSplitter.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -220,7 +220,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/ssfsplitter/SSFSplitter_vs2005.vcproj b/src/filters/parser/ssfsplitter/SSFSplitter_vs2005.vcproj index e94041f18..36f8788d9 100644 --- a/src/filters/parser/ssfsplitter/SSFSplitter_vs2005.vcproj +++ b/src/filters/parser/ssfsplitter/SSFSplitter_vs2005.vcproj @@ -102,7 +102,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -219,7 +219,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/streamdrivethru/streamdrivethru.vcproj b/src/filters/parser/streamdrivethru/streamdrivethru.vcproj index 1cfea6fe7..8b4aaae4d 100644 --- a/src/filters/parser/streamdrivethru/streamdrivethru.vcproj +++ b/src/filters/parser/streamdrivethru/streamdrivethru.vcproj @@ -101,7 +101,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -216,7 +216,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/streamdrivethru/streamdrivethru_vs2005.vcproj b/src/filters/parser/streamdrivethru/streamdrivethru_vs2005.vcproj index 3454c2842..24621ae8f 100644 --- a/src/filters/parser/streamdrivethru/streamdrivethru_vs2005.vcproj +++ b/src/filters/parser/streamdrivethru/streamdrivethru_vs2005.vcproj @@ -100,7 +100,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -215,7 +215,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/reader/asyncreader/asyncreader.vcproj b/src/filters/reader/asyncreader/asyncreader.vcproj index 2a8781ba8..c4b478812 100644 --- a/src/filters/reader/asyncreader/asyncreader.vcproj +++ b/src/filters/reader/asyncreader/asyncreader.vcproj @@ -99,7 +99,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -212,7 +212,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/reader/asyncreader/asyncreader_vs2005.vcproj b/src/filters/reader/asyncreader/asyncreader_vs2005.vcproj index 2dffb80a9..9072c3cf5 100644 --- a/src/filters/reader/asyncreader/asyncreader_vs2005.vcproj +++ b/src/filters/reader/asyncreader/asyncreader_vs2005.vcproj @@ -98,7 +98,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -211,7 +211,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/reader/cddareader/cddareader.vcproj b/src/filters/reader/cddareader/cddareader.vcproj index da4de0139..ba476bdf4 100644 --- a/src/filters/reader/cddareader/cddareader.vcproj +++ b/src/filters/reader/cddareader/cddareader.vcproj @@ -387,7 +387,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -504,7 +504,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/reader/cddareader/cddareader_vs2005.vcproj b/src/filters/reader/cddareader/cddareader_vs2005.vcproj index af0ed15b2..4f6115048 100644 --- a/src/filters/reader/cddareader/cddareader_vs2005.vcproj +++ b/src/filters/reader/cddareader/cddareader_vs2005.vcproj @@ -390,7 +390,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -507,7 +507,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/reader/cdxareader/cdxareader.vcproj b/src/filters/reader/cdxareader/cdxareader.vcproj index e89108206..341902e97 100644 --- a/src/filters/reader/cdxareader/cdxareader.vcproj +++ b/src/filters/reader/cdxareader/cdxareader.vcproj @@ -387,7 +387,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -504,7 +504,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/reader/cdxareader/cdxareader_vs2005.vcproj b/src/filters/reader/cdxareader/cdxareader_vs2005.vcproj index 0fef9907a..0155d420e 100644 --- a/src/filters/reader/cdxareader/cdxareader_vs2005.vcproj +++ b/src/filters/reader/cdxareader/cdxareader_vs2005.vcproj @@ -390,7 +390,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -507,7 +507,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/reader/udpreader/UDPReader.vcproj b/src/filters/reader/udpreader/UDPReader.vcproj index 8cd35e29f..0dd39357b 100644 --- a/src/filters/reader/udpreader/UDPReader.vcproj +++ b/src/filters/reader/udpreader/UDPReader.vcproj @@ -102,7 +102,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
UsePrecompiledHeader="2"
DebugInformationFormat="3"
/>
@@ -219,7 +219,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
UsePrecompiledHeader="2"
/>
<Tool
diff --git a/src/filters/reader/udpreader/UDPReader_vs2005.vcproj b/src/filters/reader/udpreader/UDPReader_vs2005.vcproj index 5479c8413..58199bcf3 100644 --- a/src/filters/reader/udpreader/UDPReader_vs2005.vcproj +++ b/src/filters/reader/udpreader/UDPReader_vs2005.vcproj @@ -101,7 +101,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
UsePrecompiledHeader="2"
DebugInformationFormat="3"
/>
@@ -218,7 +218,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
UsePrecompiledHeader="2"
/>
<Tool
diff --git a/src/filters/reader/vtsreader/vtsreader.vcproj b/src/filters/reader/vtsreader/vtsreader.vcproj index d3dd89671..2965f0416 100644 --- a/src/filters/reader/vtsreader/vtsreader.vcproj +++ b/src/filters/reader/vtsreader/vtsreader.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -220,7 +220,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/reader/vtsreader/vtsreader_vs2005.vcproj b/src/filters/reader/vtsreader/vtsreader_vs2005.vcproj index 22ac073f4..d7d518bf9 100644 --- a/src/filters/reader/vtsreader/vtsreader_vs2005.vcproj +++ b/src/filters/reader/vtsreader/vtsreader_vs2005.vcproj @@ -102,7 +102,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -219,7 +219,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/source/basesource/basesource.vcproj b/src/filters/source/basesource/basesource.vcproj index 51487f139..ba1fba31f 100644 --- a/src/filters/source/basesource/basesource.vcproj +++ b/src/filters/source/basesource/basesource.vcproj @@ -101,7 +101,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -216,7 +216,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/source/basesource/basesource_vs2005.vcproj b/src/filters/source/basesource/basesource_vs2005.vcproj index c812cb7f0..e0f0ad0ae 100644 --- a/src/filters/source/basesource/basesource_vs2005.vcproj +++ b/src/filters/source/basesource/basesource_vs2005.vcproj @@ -100,7 +100,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
DebugInformationFormat="3"
/>
<Tool
@@ -215,7 +215,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/source/d2vsource/d2vsource.vcproj b/src/filters/source/d2vsource/d2vsource.vcproj index 9d95273f9..522e8de69 100644 --- a/src/filters/source/d2vsource/d2vsource.vcproj +++ b/src/filters/source/d2vsource/d2vsource.vcproj @@ -382,7 +382,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -497,7 +497,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/source/d2vsource/d2vsource_vs2005.vcproj b/src/filters/source/d2vsource/d2vsource_vs2005.vcproj index 6abcea124..50d0471a0 100644 --- a/src/filters/source/d2vsource/d2vsource_vs2005.vcproj +++ b/src/filters/source/d2vsource/d2vsource_vs2005.vcproj @@ -385,7 +385,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -500,7 +500,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/source/dtsac3source/dtsac3source.vcproj b/src/filters/source/dtsac3source/dtsac3source.vcproj index ebd3168ba..334ba0dc7 100644 --- a/src/filters/source/dtsac3source/dtsac3source.vcproj +++ b/src/filters/source/dtsac3source/dtsac3source.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -220,7 +220,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/source/dtsac3source/dtsac3source_vs2005.vcproj b/src/filters/source/dtsac3source/dtsac3source_vs2005.vcproj index deb794de1..b480b4842 100644 --- a/src/filters/source/dtsac3source/dtsac3source_vs2005.vcproj +++ b/src/filters/source/dtsac3source/dtsac3source_vs2005.vcproj @@ -102,7 +102,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -219,7 +219,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/source/flicsource/flicsource.vcproj b/src/filters/source/flicsource/flicsource.vcproj index c8151ef99..b013da2dd 100644 --- a/src/filters/source/flicsource/flicsource.vcproj +++ b/src/filters/source/flicsource/flicsource.vcproj @@ -382,7 +382,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -497,7 +497,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/source/flicsource/flicsource_vs2005.vcproj b/src/filters/source/flicsource/flicsource_vs2005.vcproj index 3210fc89f..9fc1d1e0d 100644 --- a/src/filters/source/flicsource/flicsource_vs2005.vcproj +++ b/src/filters/source/flicsource/flicsource_vs2005.vcproj @@ -385,7 +385,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -500,7 +500,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/source/shoutcastsource/shoutcastsource.vcproj b/src/filters/source/shoutcastsource/shoutcastsource.vcproj index 497f916af..bc9f5423b 100644 --- a/src/filters/source/shoutcastsource/shoutcastsource.vcproj +++ b/src/filters/source/shoutcastsource/shoutcastsource.vcproj @@ -388,7 +388,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -505,7 +505,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/source/shoutcastsource/shoutcastsource_vs2005.vcproj b/src/filters/source/shoutcastsource/shoutcastsource_vs2005.vcproj index e70eb2b49..a14edb57a 100644 --- a/src/filters/source/shoutcastsource/shoutcastsource_vs2005.vcproj +++ b/src/filters/source/shoutcastsource/shoutcastsource_vs2005.vcproj @@ -391,7 +391,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -508,7 +508,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/source/subtitlesource/subtitlesource.vcproj b/src/filters/source/subtitlesource/subtitlesource.vcproj index 2afe360ea..9b4616cba 100644 --- a/src/filters/source/subtitlesource/subtitlesource.vcproj +++ b/src/filters/source/subtitlesource/subtitlesource.vcproj @@ -388,7 +388,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -505,7 +505,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/source/subtitlesource/subtitlesource_vs2005.vcproj b/src/filters/source/subtitlesource/subtitlesource_vs2005.vcproj index 2ed808a85..3fc528e5b 100644 --- a/src/filters/source/subtitlesource/subtitlesource_vs2005.vcproj +++ b/src/filters/source/subtitlesource/subtitlesource_vs2005.vcproj @@ -391,7 +391,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -508,7 +508,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/switcher/audioswitcher/audioswitcher.vcproj b/src/filters/switcher/audioswitcher/audioswitcher.vcproj index d863a4874..21a399fd5 100644 --- a/src/filters/switcher/audioswitcher/audioswitcher.vcproj +++ b/src/filters/switcher/audioswitcher/audioswitcher.vcproj @@ -392,7 +392,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -509,7 +509,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/switcher/audioswitcher/audioswitcher_vs2005.vcproj b/src/filters/switcher/audioswitcher/audioswitcher_vs2005.vcproj index 69920e189..140a6f29c 100644 --- a/src/filters/switcher/audioswitcher/audioswitcher_vs2005.vcproj +++ b/src/filters/switcher/audioswitcher/audioswitcher_vs2005.vcproj @@ -395,7 +395,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -512,7 +512,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/transform/avi2ac3filter/avi2ac3filter.vcproj b/src/filters/transform/avi2ac3filter/avi2ac3filter.vcproj index 431d5ed05..61bb2268e 100644 --- a/src/filters/transform/avi2ac3filter/avi2ac3filter.vcproj +++ b/src/filters/transform/avi2ac3filter/avi2ac3filter.vcproj @@ -388,7 +388,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -505,7 +505,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/transform/avi2ac3filter/avi2ac3filter_vs2005.vcproj b/src/filters/transform/avi2ac3filter/avi2ac3filter_vs2005.vcproj index 1b7ffdd27..d5d0c1abe 100644 --- a/src/filters/transform/avi2ac3filter/avi2ac3filter_vs2005.vcproj +++ b/src/filters/transform/avi2ac3filter/avi2ac3filter_vs2005.vcproj @@ -391,7 +391,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -508,7 +508,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/transform/basevideofilter/BaseVideoFilter.cpp b/src/filters/transform/basevideofilter/BaseVideoFilter.cpp index 0c3a872a0..5137dc668 100644 --- a/src/filters/transform/basevideofilter/BaseVideoFilter.cpp +++ b/src/filters/transform/basevideofilter/BaseVideoFilter.cpp @@ -77,7 +77,7 @@ CBasePin* CBaseVideoFilter::GetPin(int n) HRESULT CBaseVideoFilter::Receive(IMediaSample* pIn)
{
-#ifndef WIN64
+#ifndef _WIN64
// TODOX64 : fixme!
_mm_empty(); // just for safety
#endif
diff --git a/src/filters/transform/basevideofilter/basevideofilter.vcproj b/src/filters/transform/basevideofilter/basevideofilter.vcproj index 41892f9cb..05957e621 100644 --- a/src/filters/transform/basevideofilter/basevideofilter.vcproj +++ b/src/filters/transform/basevideofilter/basevideofilter.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -220,7 +220,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/transform/basevideofilter/basevideofilter_vs2005.vcproj b/src/filters/transform/basevideofilter/basevideofilter_vs2005.vcproj index 2d8b57996..e796ca244 100644 --- a/src/filters/transform/basevideofilter/basevideofilter_vs2005.vcproj +++ b/src/filters/transform/basevideofilter/basevideofilter_vs2005.vcproj @@ -102,7 +102,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -219,7 +219,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/transform/bufferfilter/bufferfilter.vcproj b/src/filters/transform/bufferfilter/bufferfilter.vcproj index bc8eaefd7..6c79a9206 100644 --- a/src/filters/transform/bufferfilter/bufferfilter.vcproj +++ b/src/filters/transform/bufferfilter/bufferfilter.vcproj @@ -382,7 +382,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -497,7 +497,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/transform/bufferfilter/bufferfilter_vs2005.vcproj b/src/filters/transform/bufferfilter/bufferfilter_vs2005.vcproj index 1b6717422..ac26319d0 100644 --- a/src/filters/transform/bufferfilter/bufferfilter_vs2005.vcproj +++ b/src/filters/transform/bufferfilter/bufferfilter_vs2005.vcproj @@ -385,7 +385,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -500,7 +500,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/transform/decssfilter/decssfilter.vcproj b/src/filters/transform/decssfilter/decssfilter.vcproj index 60d6d8c5f..53255b8e7 100644 --- a/src/filters/transform/decssfilter/decssfilter.vcproj +++ b/src/filters/transform/decssfilter/decssfilter.vcproj @@ -382,7 +382,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -497,7 +497,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/transform/decssfilter/decssfilter_vs2005.vcproj b/src/filters/transform/decssfilter/decssfilter_vs2005.vcproj index adbda384a..a3f4c3845 100644 --- a/src/filters/transform/decssfilter/decssfilter_vs2005.vcproj +++ b/src/filters/transform/decssfilter/decssfilter_vs2005.vcproj @@ -385,7 +385,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -500,7 +500,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/transform/mpadecfilter/MpaDecFilter.vcproj b/src/filters/transform/mpadecfilter/MpaDecFilter.vcproj index 638d61dd6..0526f29e1 100644 --- a/src/filters/transform/mpadecfilter/MpaDecFilter.vcproj +++ b/src/filters/transform/mpadecfilter/MpaDecFilter.vcproj @@ -389,7 +389,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -510,7 +510,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/transform/mpadecfilter/MpaDecFilter_vs2005.vcproj b/src/filters/transform/mpadecfilter/MpaDecFilter_vs2005.vcproj index 6ce680eab..14149c9db 100644 --- a/src/filters/transform/mpadecfilter/MpaDecFilter_vs2005.vcproj +++ b/src/filters/transform/mpadecfilter/MpaDecFilter_vs2005.vcproj @@ -392,7 +392,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -513,7 +513,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/transform/mpadecfilter/a52dec-0.7.4/vc++/liba52.vcproj b/src/filters/transform/mpadecfilter/a52dec-0.7.4/vc++/liba52.vcproj index 5c7dd0564..32cd26aec 100644 --- a/src/filters/transform/mpadecfilter/a52dec-0.7.4/vc++/liba52.vcproj +++ b/src/filters/transform/mpadecfilter/a52dec-0.7.4/vc++/liba52.vcproj @@ -109,7 +109,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".,../include, ..\..\..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
PrecompiledHeaderFile=".\Release\liba52.pch"
CompileAs="0"
/>
@@ -236,7 +236,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".,../include, ..\..\..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
GeneratePreprocessedFile="0"
PrecompiledHeaderFile=".\Debug\liba52.pch"
AssemblerOutput="0"
diff --git a/src/filters/transform/mpadecfilter/a52dec-0.7.4/vc++/liba52_vs2005.vcproj b/src/filters/transform/mpadecfilter/a52dec-0.7.4/vc++/liba52_vs2005.vcproj index 0993e0a8e..5b60479ed 100644 --- a/src/filters/transform/mpadecfilter/a52dec-0.7.4/vc++/liba52_vs2005.vcproj +++ b/src/filters/transform/mpadecfilter/a52dec-0.7.4/vc++/liba52_vs2005.vcproj @@ -108,7 +108,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".,../include, ..\..\..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
PrecompiledHeaderFile=".\Release\liba52.pch"
CompileAs="0"
/>
@@ -235,7 +235,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".,../include, ..\..\..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
GeneratePreprocessedFile="0"
PrecompiledHeaderFile=".\Debug\liba52.pch"
AssemblerOutput="0"
diff --git a/src/filters/transform/mpadecfilter/dtsdec-0.0.1/vc++/libdts.vcproj b/src/filters/transform/mpadecfilter/dtsdec-0.0.1/vc++/libdts.vcproj index 4c7c5480d..c6cefad8f 100644 --- a/src/filters/transform/mpadecfilter/dtsdec-0.0.1/vc++/libdts.vcproj +++ b/src/filters/transform/mpadecfilter/dtsdec-0.0.1/vc++/libdts.vcproj @@ -108,7 +108,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".,../include, ..\..\..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
PrecompiledHeaderFile=".\Debug\libdts.pch"
DebugInformationFormat="3"
CompileAs="0"
@@ -235,7 +235,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".,../include, ..\..\..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
PrecompiledHeaderFile=".\Release\libdts.pch"
CompileAs="0"
/>
diff --git a/src/filters/transform/mpadecfilter/dtsdec-0.0.1/vc++/libdts_vs2005.vcproj b/src/filters/transform/mpadecfilter/dtsdec-0.0.1/vc++/libdts_vs2005.vcproj index 748adc9bf..24966ce87 100644 --- a/src/filters/transform/mpadecfilter/dtsdec-0.0.1/vc++/libdts_vs2005.vcproj +++ b/src/filters/transform/mpadecfilter/dtsdec-0.0.1/vc++/libdts_vs2005.vcproj @@ -107,7 +107,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".,../include, ..\..\..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
PrecompiledHeaderFile=".\Debug\libdts.pch"
DebugInformationFormat="3"
CompileAs="0"
@@ -234,7 +234,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".,../include, ..\..\..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
PrecompiledHeaderFile=".\Release\libdts.pch"
CompileAs="0"
/>
diff --git a/src/filters/transform/mpadecfilter/faad2/libfaad/libfaad.vcproj b/src/filters/transform/mpadecfilter/faad2/libfaad/libfaad.vcproj index 9c58afe71..95469285c 100644 --- a/src/filters/transform/mpadecfilter/faad2/libfaad/libfaad.vcproj +++ b/src/filters/transform/mpadecfilter/faad2/libfaad/libfaad.vcproj @@ -109,7 +109,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalOptions=""
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
PrecompiledHeaderFile=".\Release\libfaad.pch"
/>
<Tool
@@ -234,7 +234,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalOptions=""
- PreprocessorDefinitions="WIN64;_LIB;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_LIB;_DEBUG"
PrecompiledHeaderFile=".\Debug\libfaad.pch"
DebugInformationFormat="3"
/>
diff --git a/src/filters/transform/mpadecfilter/faad2/libfaad/libfaad_vs2005.vcproj b/src/filters/transform/mpadecfilter/faad2/libfaad/libfaad_vs2005.vcproj index b8a127276..473935cbf 100644 --- a/src/filters/transform/mpadecfilter/faad2/libfaad/libfaad_vs2005.vcproj +++ b/src/filters/transform/mpadecfilter/faad2/libfaad/libfaad_vs2005.vcproj @@ -108,7 +108,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalOptions=""
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
PrecompiledHeaderFile=".\Release\libfaad.pch"
/>
<Tool
@@ -233,7 +233,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalOptions=""
- PreprocessorDefinitions="WIN64;_LIB;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_LIB;_DEBUG"
PrecompiledHeaderFile=".\Debug\libfaad.pch"
DebugInformationFormat="3"
/>
diff --git a/src/filters/transform/mpadecfilter/libmad-0.15.0b/fixed.h b/src/filters/transform/mpadecfilter/libmad-0.15.0b/fixed.h index ee5817a9a..7f88de06c 100644 --- a/src/filters/transform/mpadecfilter/libmad-0.15.0b/fixed.h +++ b/src/filters/transform/mpadecfilter/libmad-0.15.0b/fixed.h @@ -141,7 +141,7 @@ typedef mad_fixed_t mad_sample_t; # if defined(_MSC_VER)
# pragma warning(push)
# pragma warning(disable: 4035) /* no return value */
-# if defined(WIN64)
+# if defined(_WIN64)
static __forceinline
mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
{
diff --git a/src/filters/transform/mpadecfilter/libmad-0.15.0b/msvc++/libmad.vcproj b/src/filters/transform/mpadecfilter/libmad-0.15.0b/msvc++/libmad.vcproj index dc374f0be..5c55632be 100644 --- a/src/filters/transform/mpadecfilter/libmad-0.15.0b/msvc++/libmad.vcproj +++ b/src/filters/transform/mpadecfilter/libmad-0.15.0b/msvc++/libmad.vcproj @@ -110,7 +110,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="."
- PreprocessorDefinitions="FPM_DEFAULT;_LIB;HAVE_CONFIG_H;ASO_ZEROCHECK;WIN64;_DEBUG;DEBUG"
+ PreprocessorDefinitions="FPM_DEFAULT;_LIB;HAVE_CONFIG_H;ASO_ZEROCHECK;_WIN64;_DEBUG;DEBUG"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Debug\libmad.pch"
AssemblerOutput="0"
@@ -240,7 +240,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="."
- PreprocessorDefinitions="WIN64;NDEBUG;FPM_INTEL;FPM_64BIT;_LIB;HAVE_CONFIG_H;ASO_ZEROCHECK"
+ PreprocessorDefinitions="_WIN64;NDEBUG;FPM_INTEL;FPM_64BIT;_LIB;HAVE_CONFIG_H;ASO_ZEROCHECK"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Release\libmad.pch"
CompileAs="0"
diff --git a/src/filters/transform/mpadecfilter/libmad-0.15.0b/msvc++/libmad_vs2005.vcproj b/src/filters/transform/mpadecfilter/libmad-0.15.0b/msvc++/libmad_vs2005.vcproj index b1d9602c1..29e2949b8 100644 --- a/src/filters/transform/mpadecfilter/libmad-0.15.0b/msvc++/libmad_vs2005.vcproj +++ b/src/filters/transform/mpadecfilter/libmad-0.15.0b/msvc++/libmad_vs2005.vcproj @@ -109,7 +109,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="."
- PreprocessorDefinitions="FPM_DEFAULT;_LIB;HAVE_CONFIG_H;ASO_ZEROCHECK;WIN64;_DEBUG;DEBUG"
+ PreprocessorDefinitions="FPM_DEFAULT;_LIB;HAVE_CONFIG_H;ASO_ZEROCHECK;_WIN64;_DEBUG;DEBUG"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Debug\libmad.pch"
AssemblerOutput="0"
@@ -239,7 +239,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="."
- PreprocessorDefinitions="WIN64;NDEBUG;FPM_INTEL;FPM_64BIT;_LIB;HAVE_CONFIG_H;ASO_ZEROCHECK"
+ PreprocessorDefinitions="_WIN64;NDEBUG;FPM_INTEL;FPM_64BIT;_LIB;HAVE_CONFIG_H;ASO_ZEROCHECK"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Release\libmad.pch"
CompileAs="0"
diff --git a/src/filters/transform/mpadecfilter/libvorbisidec/libvorbisidec.vcproj b/src/filters/transform/mpadecfilter/libvorbisidec/libvorbisidec.vcproj index 60b8d38b5..0a2257f7a 100644 --- a/src/filters/transform/mpadecfilter/libvorbisidec/libvorbisidec.vcproj +++ b/src/filters/transform/mpadecfilter/libvorbisidec/libvorbisidec.vcproj @@ -110,7 +110,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="., ..\..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_LIB;_DEBUG;DEBUG"
+ PreprocessorDefinitions="_WIN64;_LIB;_DEBUG;DEBUG"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Debug\libvorbisidec.pch"
AssemblerOutput="0"
@@ -240,7 +240,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="., ..\..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_LIB;NDEBUG"
+ PreprocessorDefinitions="_WIN64;_LIB;NDEBUG"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Release\libvorbisidec.pch"
CompileAs="0"
diff --git a/src/filters/transform/mpadecfilter/libvorbisidec/libvorbisidec_vs2005.vcproj b/src/filters/transform/mpadecfilter/libvorbisidec/libvorbisidec_vs2005.vcproj index 0d607bd02..faff6442f 100644 --- a/src/filters/transform/mpadecfilter/libvorbisidec/libvorbisidec_vs2005.vcproj +++ b/src/filters/transform/mpadecfilter/libvorbisidec/libvorbisidec_vs2005.vcproj @@ -109,7 +109,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="., ..\..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_LIB;_DEBUG;DEBUG"
+ PreprocessorDefinitions="_WIN64;_LIB;_DEBUG;DEBUG"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Debug\libvorbisidec.pch"
AssemblerOutput="0"
@@ -239,7 +239,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="., ..\..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_LIB;NDEBUG"
+ PreprocessorDefinitions="_WIN64;_LIB;NDEBUG"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Release\libvorbisidec.pch"
CompileAs="0"
diff --git a/src/filters/transform/mpcvideodec/MPCVideoDec.vcproj b/src/filters/transform/mpcvideodec/MPCVideoDec.vcproj index 17e66fcb5..f8761d4a4 100644 --- a/src/filters/transform/mpcvideodec/MPCVideoDec.vcproj +++ b/src/filters/transform/mpcvideodec/MPCVideoDec.vcproj @@ -384,7 +384,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include,ffmpeg,ffmpeg\libavcodec,ffmpeg\libavutil"
- PreprocessorDefinitions="WIN64;_DEBUG;"
+ PreprocessorDefinitions="_WIN64;_DEBUG;"
DebugInformationFormat="3"
/>
<Tool
@@ -504,7 +504,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include,ffmpeg,ffmpeg\libavcodec,ffmpeg\libavutil"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/transform/mpcvideodec/MPCVideoDec_vs2005.vcproj b/src/filters/transform/mpcvideodec/MPCVideoDec_vs2005.vcproj index ae868531d..0363beb2e 100644 --- a/src/filters/transform/mpcvideodec/MPCVideoDec_vs2005.vcproj +++ b/src/filters/transform/mpcvideodec/MPCVideoDec_vs2005.vcproj @@ -394,7 +394,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include,ffmpeg,ffmpeg\libavcodec,ffmpeg\libavutil"
- PreprocessorDefinitions="WIN64;_DEBUG;"
+ PreprocessorDefinitions="_WIN64;_DEBUG;"
DebugInformationFormat="3"
/>
<Tool
@@ -515,7 +515,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include,ffmpeg,ffmpeg\libavcodec,ffmpeg\libavutil"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/transform/mpcvideodec/ffmpeg/compiler.h b/src/filters/transform/mpcvideodec/ffmpeg/compiler.h index 53bf28f27..e85752e00 100644 --- a/src/filters/transform/mpcvideodec/ffmpeg/compiler.h +++ b/src/filters/transform/mpcvideodec/ffmpeg/compiler.h @@ -43,7 +43,7 @@ #define COMPILER "unknown"
#endif
-#ifdef WIN64
+#ifdef _WIN64
#define COMPILER_X64 ", x64"
#else
#define COMPILER_X64 ", x86"
diff --git a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec.vcproj b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec.vcproj index 98c0692b9..ba5045d57 100644 --- a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec.vcproj +++ b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec.vcproj @@ -132,7 +132,7 @@ Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\zlib,.,libavcodec,libavutil, ..\..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_WARNINGS;_DEBUG;_WINDOWS;HAVE_AV_CONFIG_H"
+ PreprocessorDefinitions="_WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_WARNINGS;_DEBUG;_WINDOWS;HAVE_AV_CONFIG_H"
ExceptionHandling="0"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -305,7 +305,7 @@ OmitFramePointers="true"
WholeProgramOptimization="false"
AdditionalIncludeDirectories="..\..\..\..\zlib,.,libavcodec,libavutil, ..\..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_WARNINGS;NDEBUG;_WINDOWS;HAVE_AV_CONFIG_H"
+ PreprocessorDefinitions="_WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_WARNINGS;NDEBUG;_WINDOWS;HAVE_AV_CONFIG_H"
StringPooling="true"
ExceptionHandling="0"
RuntimeLibrary="0"
diff --git a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec_vs2005.vcproj b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec_vs2005.vcproj index 335f215ef..26e2237d0 100644 --- a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec_vs2005.vcproj +++ b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec_vs2005.vcproj @@ -131,7 +131,7 @@ Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\zlib,.,libavcodec,libavutil, ..\..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_WARNINGS;_DEBUG;_WINDOWS;HAVE_AV_CONFIG_H"
+ PreprocessorDefinitions="_WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_WARNINGS;_DEBUG;_WINDOWS;HAVE_AV_CONFIG_H"
ExceptionHandling="0"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -304,7 +304,7 @@ OmitFramePointers="true"
WholeProgramOptimization="false"
AdditionalIncludeDirectories="..\..\..\..\zlib,.,libavcodec,libavutil, ..\..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_WARNINGS;NDEBUG;_WINDOWS;HAVE_AV_CONFIG_H"
+ PreprocessorDefinitions="_WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_WARNINGS;NDEBUG;_WINDOWS;HAVE_AV_CONFIG_H"
StringPooling="true"
ExceptionHandling="0"
RuntimeLibrary="0"
diff --git a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.cpp b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.cpp index b2e2c59f0..2af8485cf 100644 --- a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.cpp +++ b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.cpp @@ -438,7 +438,7 @@ HRESULT CMpeg2DecFilter::Transform(IMediaSample* pIn) while(len >= 0)
{
mpeg2_state_t state = m_dec->mpeg2_parse();
-#ifndef WIN64
+#ifndef _WIN64
__asm emms; // this one is missing somewhere in the precompiled mmx obj files
#endif
switch(state)
diff --git a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.vcproj b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.vcproj index cf4ce0206..f1ffb07d1 100644 --- a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.vcproj +++ b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.vcproj @@ -365,7 +365,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -486,7 +486,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter_vs2005.vcproj b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter_vs2005.vcproj index 68734c4a7..b9fd66254 100644 --- a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter_vs2005.vcproj +++ b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter_vs2005.vcproj @@ -367,7 +367,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG"
+ PreprocessorDefinitions="_WIN64;_DEBUG"
DebugInformationFormat="3"
/>
<Tool
@@ -488,7 +488,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG"
+ PreprocessorDefinitions="_WIN64;NDEBUG"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/transform/mpeg2decfilter/libmpeg2.cpp b/src/filters/transform/mpeg2decfilter/libmpeg2.cpp index 8a825a69f..93dc2b48b 100644 --- a/src/filters/transform/mpeg2decfilter/libmpeg2.cpp +++ b/src/filters/transform/mpeg2decfilter/libmpeg2.cpp @@ -497,7 +497,7 @@ int CMpeg2Dec::copy_chunk(int bytes) // this assembly gives us a nice speed up
// 36 sec down to 32 sec decoding the ts.stream.tpr test file
// (idtc, mc was set to null)
-#ifndef WIN64
+#ifndef _WIN64
__asm
{
mov ebx, this
@@ -1959,7 +1959,7 @@ CMpeg2Decoder::CMpeg2Decoder() // //
/**/
-#ifndef WIN64
+#ifndef _WIN64
if(g_cpuid.m_flags&CCpuID::sse2)
{
m_idct_init = mpeg2_idct_init_sse2;
diff --git a/src/filters/transform/vsfilter/VSFilter_vs2005.sln b/src/filters/transform/vsfilter/VSFilter_vs2005.sln index b426ee663..baa0ad475 100644 --- a/src/filters/transform/vsfilter/VSFilter_vs2005.sln +++ b/src/filters/transform/vsfilter/VSFilter_vs2005.sln @@ -23,6 +23,10 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssf", "..\..\..\subtitles\libssf\libssf_vs2005.vcproj", "{DD9D2D92-2241-408A-859E-B85D444B7E3C}"
EndProject
Global
+ GlobalSection(SubversionScc) = preSolution
+ Svn-Managed = True
+ Manager = AnkhSVN - Subversion Support for Visual Studio
+ EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Unicode lib|Win32 = Debug Unicode lib|Win32
Debug Unicode lib|Win64 (AMD64) = Debug Unicode lib|Win64 (AMD64)
diff --git a/src/libpng/libpng.vcproj b/src/libpng/libpng.vcproj index 04ee10c89..671d6fd07 100644 --- a/src/libpng/libpng.vcproj +++ b/src/libpng/libpng.vcproj @@ -106,7 +106,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\zlib"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
UsePrecompiledHeader="0"
DebugInformationFormat="3"
/>
@@ -227,7 +227,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\zlib"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
UsePrecompiledHeader="0"
/>
<Tool
@@ -360,4 +360,4 @@ </Files>
<Globals>
</Globals>
-</VisualStudioProject>
+</VisualStudioProject>
\ No newline at end of file diff --git a/src/libpng/libpng_vs2005.vcproj b/src/libpng/libpng_vs2005.vcproj index ddaf55a8a..704602127 100644 --- a/src/libpng/libpng_vs2005.vcproj +++ b/src/libpng/libpng_vs2005.vcproj @@ -105,7 +105,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\zlib"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
UsePrecompiledHeader="0"
DebugInformationFormat="3"
/>
@@ -226,7 +226,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\zlib"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
UsePrecompiledHeader="0"
/>
<Tool
@@ -359,4 +359,4 @@ </Files>
<Globals>
</Globals>
-</VisualStudioProject>
+</VisualStudioProject>
\ No newline at end of file diff --git a/src/subpic/MemSubPic.cpp b/src/subpic/MemSubPic.cpp index ec5f9cd88..27b81e595 100644 --- a/src/subpic/MemSubPic.cpp +++ b/src/subpic/MemSubPic.cpp @@ -158,7 +158,7 @@ STDMETHODIMP CMemSubPic::ClearDirtyRect(DWORD color) // memsetd(p, 0, m_rcDirty.Width());
int w = m_rcDirty.Width();
-#ifdef WIN64
+#ifdef _WIN64
ASSERT(FALSE); // TODOX64
#else
__asm
@@ -452,7 +452,7 @@ STDMETHODIMP CMemSubPic::AlphaBlt(RECT* pSrc, RECT* pDst, SubPicDesc* pTarget) ia = (ia<<24)|(s2[7]<<16)|(ia<<8)|s2[3];
c = (s2[4]<<24)|(s2[5]<<16)|(s2[0]<<8)|s2[1]; // (v<<24)|(y2<<16)|(u<<8)|y1;
-#ifdef WIN64
+#ifdef _WIN64
ASSERT(FALSE); // TODOX64
#else
__asm
@@ -562,7 +562,7 @@ STDMETHODIMP CMemSubPic::AlphaBlt(RECT* pSrc, RECT* pDst, SubPicDesc* pTarget) }
-#ifdef WIN64
+#ifdef _WIN64
ASSERT(FALSE); // TODOX64
#else
__asm emms;
diff --git a/src/subpic/subpic.vcproj b/src/subpic/subpic.vcproj index f9285ca1f..6f6dfae67 100644 --- a/src/subpic/subpic.vcproj +++ b/src/subpic/subpic.vcproj @@ -102,7 +102,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"
DebugInformationFormat="3"
/>
<Tool
@@ -219,7 +219,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/subpic/subpic_vs2005.vcproj b/src/subpic/subpic_vs2005.vcproj index f6e61fffd..91b204338 100644 --- a/src/subpic/subpic_vs2005.vcproj +++ b/src/subpic/subpic_vs2005.vcproj @@ -101,7 +101,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"
DebugInformationFormat="3"
/>
<Tool
@@ -218,7 +218,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/subtitles/libssf/libssf.vcproj b/src/subtitles/libssf/libssf.vcproj index 61067534f..246b7703a 100644 --- a/src/subtitles/libssf/libssf.vcproj +++ b/src/subtitles/libssf/libssf.vcproj @@ -106,7 +106,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="2"
@@ -227,7 +227,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
UsePrecompiledHeader="2"
/>
<Tool
diff --git a/src/subtitles/libssf/libssf_vs2005.vcproj b/src/subtitles/libssf/libssf_vs2005.vcproj index cfb0b1e8c..6af41d36a 100644 --- a/src/subtitles/libssf/libssf_vs2005.vcproj +++ b/src/subtitles/libssf/libssf_vs2005.vcproj @@ -105,7 +105,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="2"
@@ -226,7 +226,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
UsePrecompiledHeader="2"
/>
<Tool
diff --git a/src/subtitles/subtitles.vcproj b/src/subtitles/subtitles.vcproj index 355786ea7..0d8220663 100644 --- a/src/subtitles/subtitles.vcproj +++ b/src/subtitles/subtitles.vcproj @@ -103,7 +103,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;"
+ PreprocessorDefinitions="_WIN64;_DEBUG;"
DebugInformationFormat="3"
/>
<Tool
@@ -220,7 +220,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;"
+ PreprocessorDefinitions="_WIN64;NDEBUG;"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/subtitles/subtitles_vs2005.vcproj b/src/subtitles/subtitles_vs2005.vcproj index 073bfb7b4..1093a2870 100644 --- a/src/subtitles/subtitles_vs2005.vcproj +++ b/src/subtitles/subtitles_vs2005.vcproj @@ -102,7 +102,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;"
+ PreprocessorDefinitions="_WIN64;_DEBUG;"
DebugInformationFormat="3"
/>
<Tool
@@ -219,7 +219,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;"
+ PreprocessorDefinitions="_WIN64;NDEBUG;"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -267,6 +267,10 @@ >
</File>
<File
+ RelativePath=".\HdmvSub.cpp"
+ >
+ </File>
+ <File
RelativePath="Rasterizer.cpp"
>
<FileConfiguration
@@ -303,6 +307,10 @@ </FileConfiguration>
</File>
<File
+ RelativePath=".\RenderedHdmvSubtitle.cpp"
+ >
+ </File>
+ <File
RelativePath="RealTextParser.cpp"
>
</File>
@@ -472,10 +480,18 @@ >
</File>
<File
+ RelativePath=".\HdmvSub.h"
+ >
+ </File>
+ <File
RelativePath="Rasterizer.h"
>
</File>
<File
+ RelativePath=".\RenderedHdmvSubtitle.h"
+ >
+ </File>
+ <File
RelativePath="RealTextParser.h"
>
</File>
diff --git a/src/ui/CmdUI/CmdUI.vcproj b/src/ui/CmdUI/CmdUI.vcproj index 1d43b8287..86cac68ae 100644 --- a/src/ui/CmdUI/CmdUI.vcproj +++ b/src/ui/CmdUI/CmdUI.vcproj @@ -101,7 +101,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"
DebugInformationFormat="3"
/>
<Tool
@@ -216,7 +216,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/ui/CmdUI/CmdUI_vs2005.vcproj b/src/ui/CmdUI/CmdUI_vs2005.vcproj index 48ace2963..f7521e828 100644 --- a/src/ui/CmdUI/CmdUI_vs2005.vcproj +++ b/src/ui/CmdUI/CmdUI_vs2005.vcproj @@ -100,7 +100,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"
DebugInformationFormat="3"
/>
<Tool
@@ -215,7 +215,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/ui/LCDUI/LCDUI.vcproj b/src/ui/LCDUI/LCDUI.vcproj index f3fa83995..0d97f09f1 100644 --- a/src/ui/LCDUI/LCDUI.vcproj +++ b/src/ui/LCDUI/LCDUI.vcproj @@ -101,7 +101,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"
DebugInformationFormat="3"
/>
<Tool
@@ -216,7 +216,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/ui/LCDUI/LCDUI_vs2005.vcproj b/src/ui/LCDUI/LCDUI_vs2005.vcproj index 74795a8e9..9b0a392b8 100644 --- a/src/ui/LCDUI/LCDUI_vs2005.vcproj +++ b/src/ui/LCDUI/LCDUI_vs2005.vcproj @@ -100,7 +100,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\include"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"
DebugInformationFormat="3"
/>
<Tool
@@ -215,7 +215,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\include"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/ui/ResizableLib/ResizableLayout.cpp b/src/ui/ResizableLib/ResizableLayout.cpp index 15e140ebe..8d7a4d7a9 100644 --- a/src/ui/ResizableLib/ResizableLayout.cpp +++ b/src/ui/ResizableLib/ResizableLayout.cpp @@ -273,7 +273,7 @@ void CResizableLayout::EraseBackground(CDC* pDC) else
{
// take the background brush from the window's class
-#ifdef WIN64
+#ifdef _WIN64
hBrush = (HBRUSH)::GetClassLongPtr(hWnd, GCLP_HBRBACKGROUND);
#else
hBrush = (HBRUSH)::GetClassLongPtr(hWnd, GCL_HBRBACKGROUND);
diff --git a/src/ui/ResizableLib/ResizableLib.vcproj b/src/ui/ResizableLib/ResizableLib.vcproj index 9445a0534..2c7dd5ea5 100644 --- a/src/ui/ResizableLib/ResizableLib.vcproj +++ b/src/ui/ResizableLib/ResizableLib.vcproj @@ -101,7 +101,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"
DebugInformationFormat="3"
/>
<Tool
@@ -216,7 +216,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/ui/ResizableLib/ResizableLib_vs2005.vcproj b/src/ui/ResizableLib/ResizableLib_vs2005.vcproj index 5d4c377da..9a1b73110 100644 --- a/src/ui/ResizableLib/ResizableLib_vs2005.vcproj +++ b/src/ui/ResizableLib/ResizableLib_vs2005.vcproj @@ -100,7 +100,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"
DebugInformationFormat="3"
/>
<Tool
@@ -215,7 +215,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/ui/TreePropSheet/TreePropSheet.vcproj b/src/ui/TreePropSheet/TreePropSheet.vcproj index 5bf5bbb5f..28a2a840d 100644 --- a/src/ui/TreePropSheet/TreePropSheet.vcproj +++ b/src/ui/TreePropSheet/TreePropSheet.vcproj @@ -101,7 +101,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"
DebugInformationFormat="3"
/>
<Tool
@@ -216,7 +216,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/ui/TreePropSheet/TreePropSheet_vs2005.vcproj b/src/ui/TreePropSheet/TreePropSheet_vs2005.vcproj index a6b122b6d..f6d48b7b9 100644 --- a/src/ui/TreePropSheet/TreePropSheet_vs2005.vcproj +++ b/src/ui/TreePropSheet/TreePropSheet_vs2005.vcproj @@ -100,7 +100,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"
DebugInformationFormat="3"
/>
<Tool
@@ -215,7 +215,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/ui/sizecbar/sizecbar.cpp b/src/ui/sizecbar/sizecbar.cpp index 6f3a8fb43..8cb8d7157 100644 --- a/src/ui/sizecbar/sizecbar.cpp +++ b/src/ui/sizecbar/sizecbar.cpp @@ -532,7 +532,7 @@ void CSizingControlBar::OnNcPaint() DrawBorders(&mdc, rcDraw);
// erase the NC background
-#ifdef WIN64
+#ifdef _WIN64
mdc.FillRect(rcDraw, CBrush::FromHandle(
(HBRUSH) GetClassLong(m_hWnd, GCLP_HBRBACKGROUND)));
#else
diff --git a/src/ui/sizecbar/sizecbar.vcproj b/src/ui/sizecbar/sizecbar.vcproj index 873c7314e..ab907d73a 100644 --- a/src/ui/sizecbar/sizecbar.vcproj +++ b/src/ui/sizecbar/sizecbar.vcproj @@ -101,7 +101,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"
DebugInformationFormat="3"
/>
<Tool
@@ -216,7 +216,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/ui/sizecbar/sizecbar_vs2005.vcproj b/src/ui/sizecbar/sizecbar_vs2005.vcproj index b5c72f72e..4084d1c7a 100644 --- a/src/ui/sizecbar/sizecbar_vs2005.vcproj +++ b/src/ui/sizecbar/sizecbar_vs2005.vcproj @@ -100,7 +100,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"
DebugInformationFormat="3"
/>
<Tool
@@ -215,7 +215,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/zlib/zlib.vcproj b/src/zlib/zlib.vcproj index c55c3c446..e9fb8edaa 100644 --- a/src/zlib/zlib.vcproj +++ b/src/zlib/zlib.vcproj @@ -105,7 +105,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_WINDOWS"
PrecompiledHeaderFile=".\Debug/zlib.pch"
DebugInformationFormat="3"
/>
@@ -225,7 +225,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_WINDOWS"
PrecompiledHeaderFile=".\Release/zlib.pch"
/>
<Tool
@@ -364,4 +364,4 @@ Value="0"
/>
</Globals>
-</VisualStudioProject>
+</VisualStudioProject>
\ No newline at end of file diff --git a/src/zlib/zlib_vs2005.vcproj b/src/zlib/zlib_vs2005.vcproj index d2d6b8015..aab6ef73a 100644 --- a/src/zlib/zlib_vs2005.vcproj +++ b/src/zlib/zlib_vs2005.vcproj @@ -104,7 +104,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS"
+ PreprocessorDefinitions="_WIN64;_DEBUG;_WINDOWS"
PrecompiledHeaderFile=".\Debug/zlib.pch"
DebugInformationFormat="3"
/>
@@ -224,7 +224,7 @@ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS"
+ PreprocessorDefinitions="_WIN64;NDEBUG;_WINDOWS"
PrecompiledHeaderFile=".\Release/zlib.pch"
/>
<Tool
@@ -363,4 +363,4 @@ Value="0"
/>
</Globals>
-</VisualStudioProject>
+</VisualStudioProject>
\ No newline at end of file |