Skip to content

Commit 3eb05a2

Browse files
committed
64-bit build changes.
1 parent e5efac6 commit 3eb05a2

4 files changed

Lines changed: 20 additions & 10 deletions

File tree

DSlibass.sln

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ Global
3939
{687CD386-955D-42C7-8A47-4B1CFC56911A}.Profile|x64.ActiveCfg = Release|Win32
4040
{687CD386-955D-42C7-8A47-4B1CFC56911A}.Release|Win32.ActiveCfg = Release|Win32
4141
{687CD386-955D-42C7-8A47-4B1CFC56911A}.Release|Win32.Build.0 = Release|Win32
42-
{687CD386-955D-42C7-8A47-4B1CFC56911A}.Release|x64.ActiveCfg = Release|Win32
42+
{687CD386-955D-42C7-8A47-4B1CFC56911A}.Release|x64.ActiveCfg = Release|x64
43+
{687CD386-955D-42C7-8A47-4B1CFC56911A}.Release|x64.Build.0 = Release|x64
4344
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|Win32.ActiveCfg = Debug|Win32
4445
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|Win32.Build.0 = Debug|Win32
4546
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|x64.ActiveCfg = Debug|x64
@@ -60,7 +61,8 @@ Global
6061
{168C0F0D-9975-4D24-885C-87A9B018617E}.Profile|x64.ActiveCfg = Release|Win32
6162
{168C0F0D-9975-4D24-885C-87A9B018617E}.Release|Win32.ActiveCfg = Release|Win32
6263
{168C0F0D-9975-4D24-885C-87A9B018617E}.Release|Win32.Build.0 = Release|Win32
63-
{168C0F0D-9975-4D24-885C-87A9B018617E}.Release|x64.ActiveCfg = Release|Win32
64+
{168C0F0D-9975-4D24-885C-87A9B018617E}.Release|x64.ActiveCfg = Release|x64
65+
{168C0F0D-9975-4D24-885C-87A9B018617E}.Release|x64.Build.0 = Release|x64
6466
{817DD354-40BB-5065-F000-886ED3BFA54E}.Debug|Win32.ActiveCfg = Debug|Win32
6567
{817DD354-40BB-5065-F000-886ED3BFA54E}.Debug|Win32.Build.0 = Debug|Win32
6668
{817DD354-40BB-5065-F000-886ED3BFA54E}.Debug|x64.ActiveCfg = Debug|Win32
@@ -69,7 +71,8 @@ Global
6971
{817DD354-40BB-5065-F000-886ED3BFA54E}.Profile|x64.ActiveCfg = Release|Win32
7072
{817DD354-40BB-5065-F000-886ED3BFA54E}.Release|Win32.ActiveCfg = Release|Win32
7173
{817DD354-40BB-5065-F000-886ED3BFA54E}.Release|Win32.Build.0 = Release|Win32
72-
{817DD354-40BB-5065-F000-886ED3BFA54E}.Release|x64.ActiveCfg = Release|Win32
74+
{817DD354-40BB-5065-F000-886ED3BFA54E}.Release|x64.ActiveCfg = Release|x64
75+
{817DD354-40BB-5065-F000-886ED3BFA54E}.Release|x64.Build.0 = Release|x64
7376
EndGlobalSection
7477
GlobalSection(SolutionProperties) = preSolution
7578
HideSolutionNode = FALSE

DSlibass/DSlibass.vcxproj.filters

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@
3838
<ClInclude Include="ASSTrack.h">
3939
<Filter>Header Files</Filter>
4040
</ClInclude>
41-
<ClInclude Include="memcpy_amd.h">
42-
<Filter>Header Files</Filter>
43-
</ClInclude>
4441
<ClInclude Include="dslauids.h">
4542
<Filter>Header Files</Filter>
4643
</ClInclude>
@@ -88,9 +85,6 @@
8885
<ClCompile Include="ASSTrack.cpp">
8986
<Filter>Source Files</Filter>
9087
</ClCompile>
91-
<ClCompile Include="memcpy_amd.cpp">
92-
<Filter>Source Files</Filter>
93-
</ClCompile>
9488
<ClCompile Include="MatroskaParser.cpp">
9589
<Filter>Source Files</Filter>
9690
</ClCompile>

DSlibass/DSlibass.vcxproj.user

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,25 @@
33
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
44
<LocalDebuggerCommand>C:\Program Files %28x86%29\Combined Community Codec Pack\MPC\mpc-hc.exe</LocalDebuggerCommand>
55
</PropertyGroup>
6+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7+
<LocalDebuggerCommand>C:\Program Files %28x86%29\Combined Community Codec Pack\MPC\mpc-hc.exe</LocalDebuggerCommand>
8+
</PropertyGroup>
69
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
710
<LocalDebuggerCommandArguments>"D:\buf\DSLibassTests\DenpaOP.mkv"</LocalDebuggerCommandArguments>
811
</PropertyGroup>
12+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
13+
<LocalDebuggerCommandArguments>"D:\buf\DSLibassTests\DenpaOP.mkv"</LocalDebuggerCommandArguments>
14+
</PropertyGroup>
915
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
1016
<LocalDebuggerAttach>false</LocalDebuggerAttach>
1117
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
1218
<LocalDebuggerDebuggerType>NativeOnly</LocalDebuggerDebuggerType>
1319
<LocalDebuggerMergeEnvironment>false</LocalDebuggerMergeEnvironment>
1420
</PropertyGroup>
21+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
22+
<LocalDebuggerAttach>false</LocalDebuggerAttach>
23+
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
24+
<LocalDebuggerDebuggerType>NativeOnly</LocalDebuggerDebuggerType>
25+
<LocalDebuggerMergeEnvironment>false</LocalDebuggerMergeEnvironment>
26+
</PropertyGroup>
1527
</Project>

baseclasses/baseclasses.vcxproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
<ProjectGuid>{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}</ProjectGuid>
4747
<RootNamespace>BaseClasses</RootNamespace>
4848
<Keyword>Win32Proj</Keyword>
49+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
4950
</PropertyGroup>
5051
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
5152
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_MBCS|Win32'" Label="Configuration">
@@ -146,7 +147,7 @@
146147
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_MBCS|Win32'">$(Configuration)\</IntDir>
147148
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
148149
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
149-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
150+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
150151
<OutDir Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">$(Platform)\$(Configuration)\</OutDir>
151152
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
152153
<IntDir Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">$(Platform)\$(Configuration)\</IntDir>

0 commit comments

Comments
 (0)