enable 64bit compile.

chikuzen · Aug 28, 2016 · 5729170 · 5729170
1 parent c596eae
commit 5729170
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 16 deletions.
diff --git a/build/msvcX/DGDecode/DGDecode.vcxproj b/build/msvcX/DGDecode/DGDecode.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{13BF3FBA-7CD9-4374-83D5-E001E722E3DE}</ProjectGuid>
@@ -24,33 +32,57 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)..\..\bin\msvc$(VisualStudioVersion)\$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\msvc$(VisualStudioVersion)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)..\..\bin\msvc$(VisualStudioVersion)\$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\msvc$(VisualStudioVersion)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>
@@ -66,6 +98,21 @@
       <AdditionalDependencies>shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;DGDECODE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>C:\my_projects\AviSynthPlus\avs_core\include;..\..\..\src\dgdecode</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -88,9 +135,32 @@
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;DGDECODE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>C:\my_projects\AviSynthPlus\avs_core\include;..\..\..\src\dgdecode</AdditionalIncludeDirectories>
+      <OmitFramePointers>true</OmitFramePointers>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <StringPooling>true</StringPooling>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\dgdecode\alloc.cpp" />
-    <ClCompile Include="..\..\..\src\dgdecode\BlindPP.cpp" />
     <ClCompile Include="..\..\..\src\dgdecode\color_convert.cpp" />
     <ClCompile Include="..\..\..\src\dgdecode\deblock.cpp" />
     <ClCompile Include="..\..\..\src\dgdecode\getbit.cpp" />
@@ -106,7 +176,6 @@
     <ClCompile Include="..\..\..\src\dgdecode\store.cpp" />
     <ClCompile Include="..\..\..\src\dgdecode\vfapidec.cpp" />
     <ClCompile Include="..\..\..\src\dgdecode\AVISynthAPI.cpp" />
-    <ClCompile Include="..\..\..\src\dgdecode\PostProcess.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\dgdecode\color_convert.h" />
@@ -116,7 +185,6 @@
     <ClInclude Include="..\..\..\src\dgdecode\mc.h" />
     <ClInclude Include="..\..\..\src\dgdecode\misc.h" />
     <ClInclude Include="..\..\..\src\dgdecode\MPEG2Decoder.h" />
-    <ClInclude Include="..\..\..\src\dgdecode\PostProcess.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/build/msvcX/DGDecode/DGDecode.vcxproj.filters b/build/msvcX/DGDecode/DGDecode.vcxproj.filters
@@ -42,15 +42,9 @@
     <ClCompile Include="..\..\..\src\dgdecode\AVISynthAPI.cpp">
       <Filter>DGDecode</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\dgdecode\PostProcess.cpp">
-      <Filter>DGDecode</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\dgdecode\deblock.cpp">
       <Filter>DGDecode</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\dgdecode\BlindPP.cpp">
-      <Filter>DGDecode</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\dgdecode\color_convert.cpp">
       <Filter>DGDecode</Filter>
     </ClCompile>
@@ -80,9 +74,6 @@
     <ClInclude Include="..\..\..\src\dgdecode\AvisynthAPI.h">
       <Filter>DGDecode</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\dgdecode\PostProcess.h">
-      <Filter>DGDecode</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\dgdecode\color_convert.h">
       <Filter>DGDecode</Filter>
     </ClInclude>

diff --git a/src/dgdecode/getbit.cpp b/src/dgdecode/getbit.cpp
@@ -26,7 +26,7 @@ void CMPEG2Decoder::Initialize_Buffer()
 {
     Rdptr = Rdbfr + BUFFER_SIZE;
     Rdmax = Rdptr;
-    buffer_invalid = (uint8_t *) 0xffffffff;
+    buffer_invalid = (uint8_t *)(UINTPTR_MAX);
 
     if (SystemStream_Flag)
     {
@@ -505,7 +505,7 @@ void CMPEG2Decoder::Next_File()
     bytes = _read(Infile[File_Flag], Rdbfr + Read, BUFFER_SIZE - Read);
     if (Read + bytes == BUFFER_SIZE)
         // The whole buffer has valid data.
-        buffer_invalid = (uint8_t *) 0xffffffff;
+        buffer_invalid = (uint8_t *)(UINTPTR_MAX);
     else
         // Point to the first invalid buffer location.
         buffer_invalid = Rdbfr + Read + bytes;

diff --git a/src/dgdecode/misc.cpp b/src/dgdecode/misc.cpp
@@ -30,7 +30,7 @@
 #include "misc.h"
 
 
-int __cdecl dprintf(char* fmt, ...)
+size_t __cdecl dprintf(char* fmt, ...)
 {
     char printString[1024];
 

diff --git a/src/dgdecode/misc.h b/src/dgdecode/misc.h
@@ -32,6 +32,6 @@ void fast_copy(const uint8_t *src, const int src_stride, uint8_t *dst,
                const int dst_stride, const int horizontal_size,
                const int vertical_size) noexcept;
 
-int __cdecl dprintf(char* fmt, ...);
+size_t __cdecl dprintf(char* fmt, ...);
 
 #endif