Skip to content

Commit 0eb537d

Browse files
torquetorque
committed
Add visual studio projects.
Projects have been updated to build the submodules.
1 parent 901d0ef commit 0eb537d

9 files changed

Lines changed: 812 additions & 83 deletions

‎DSlibass/DSlibass.vcxproj.user‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

DSlibass/DSlibass.vcxproj renamed to DSlibass/DirectASS.vcxproj

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
@@ -30,6 +30,8 @@
3030
<ProjectGuid>{687CD386-955D-42C7-8A47-4B1CFC56911A}</ProjectGuid>
3131
<Keyword>Win32Proj</Keyword>
3232
<RootNamespace>DSlibass</RootNamespace>
33+
<ProjectName>DirectASS</ProjectName>
34+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
3335
</PropertyGroup>
3436
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3537
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -102,27 +104,39 @@
102104
<LinkIncremental>true</LinkIncremental>
103105
<IncludePath>$(IncludePath)</IncludePath>
104106
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
107+
<OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
108+
<IntDir>$(Configuration)\$(Platform)\</IntDir>
105109
</PropertyGroup>
106110
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
107111
<LinkIncremental>true</LinkIncremental>
108112
<IncludePath>$(IncludePath)</IncludePath>
109113
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
114+
<OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
115+
<IntDir>$(Configuration)\$(Platform)\</IntDir>
110116
</PropertyGroup>
111117
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
112118
<LinkIncremental>false</LinkIncremental>
113119
<TargetExt>.ax</TargetExt>
120+
<OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
121+
<IntDir>$(Configuration)\$(Platform)\</IntDir>
114122
</PropertyGroup>
115123
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
116124
<LinkIncremental>false</LinkIncremental>
117125
<TargetExt>.ax</TargetExt>
126+
<OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
127+
<IntDir>$(Configuration)\$(Platform)\</IntDir>
118128
</PropertyGroup>
119129
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
120130
<LinkIncremental>false</LinkIncremental>
121131
<TargetExt>.ax</TargetExt>
132+
<OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
133+
<IntDir>$(Configuration)\$(Platform)\</IntDir>
122134
</PropertyGroup>
123135
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">
124136
<LinkIncremental>false</LinkIncremental>
125137
<TargetExt>.ax</TargetExt>
138+
<OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
139+
<IntDir>$(Configuration)\$(Platform)\</IntDir>
126140
</PropertyGroup>
127141
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
128142
<ClCompile>
@@ -136,17 +150,18 @@
136150
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
137151
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
138152
<OmitFramePointers>false</OmitFramePointers>
139-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
153+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
140154
<DisableLanguageExtensions>false</DisableLanguageExtensions>
141155
</ClCompile>
142156
<Link>
143157
<SubSystem>Windows</SubSystem>
144158
<GenerateDebugInformation>true</GenerateDebugInformation>
145-
<AdditionalDependencies>libmatroskad.lib;libebmld.lib;libass_static_debug.lib;libfribidi.a;fontconfigd.lib;libfreetype.a;libenca.a;libiconv.a;libz.a;libgcc.a;strmbasd.lib;winmm.lib;shlwapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
159+
<AdditionalDependencies>libmatroska.lib;libebml.lib;libass.lib;fribidi.lib;fontconfig.lib;freetype2.lib;baseclasses.lib;winmm.lib;shlwapi.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
146160
<ModuleDefinitionFile>DSlibass.def</ModuleDefinitionFile>
147161
<EntryPointSymbol>
148162
</EntryPointSymbol>
149-
<AdditionalLibraryDirectories>..\libass\;..\libebml\Debug\;..\libmatroska\Debug\;..\baseclasses\Debug\</AdditionalLibraryDirectories>
163+
<AdditionalLibraryDirectories>..\libass\;$(SolutionDir)$(Configuration)\$(Platform)</AdditionalLibraryDirectories>
164+
<OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
150165
</Link>
151166
<ProjectReference>
152167
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
@@ -164,17 +179,18 @@
164179
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
165180
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
166181
<OmitFramePointers>false</OmitFramePointers>
167-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
182+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
168183
<DisableLanguageExtensions>false</DisableLanguageExtensions>
169184
</ClCompile>
170185
<Link>
171186
<SubSystem>Windows</SubSystem>
172187
<GenerateDebugInformation>true</GenerateDebugInformation>
173-
<AdditionalDependencies>libmatroskad.lib;libebmld.lib;libass_static_debug.lib;libfribidi.a;fontconfigd.lib;libfreetype.a;libenca.a;libiconv.a;libz.a;libgcc.a;strmbasd.lib;winmm.lib;shlwapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
188+
<AdditionalDependencies>libmatroska.lib;libebml.lib;libass.lib;fribidi.lib;fontconfig.lib;freetype2.lib;baseclasses.lib;winmm.lib;shlwapi.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
174189
<ModuleDefinitionFile>DSlibass.def</ModuleDefinitionFile>
175190
<EntryPointSymbol>
176191
</EntryPointSymbol>
177-
<AdditionalLibraryDirectories>..\libass\;$(OutDir)</AdditionalLibraryDirectories>
192+
<AdditionalLibraryDirectories>..\libass\;$(SolutionDir)$(Configuration)\$(Platform)</AdditionalLibraryDirectories>
193+
<OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
178194
</Link>
179195
<ProjectReference>
180196
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
@@ -205,12 +221,13 @@
205221
<GenerateDebugInformation>false</GenerateDebugInformation>
206222
<EnableCOMDATFolding>true</EnableCOMDATFolding>
207223
<OptimizeReferences>true</OptimizeReferences>
208-
<AdditionalDependencies>libmatroska.lib;libebml.lib;libass.lib;fribidi.lib;fontconfig.lib;freetype2.lib;strmbase.lib;winmm.lib;shlwapi.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
224+
<AdditionalDependencies>libmatroska.lib;libebml.lib;libass.lib;fribidi.lib;fontconfig.lib;freetype2.lib;baseclasses.lib;winmm.lib;shlwapi.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
209225
<ModuleDefinitionFile>DSlibass.def</ModuleDefinitionFile>
210226
<EntryPointSymbol>
211227
</EntryPointSymbol>
212-
<AdditionalLibraryDirectories>..\libass\;..\libebml\Release\;..\libmatroska\Release\;..\baseclasses\Release\</AdditionalLibraryDirectories>
228+
<AdditionalLibraryDirectories>..\libass\;$(SolutionDir)$(Configuration)\$(Platform)</AdditionalLibraryDirectories>
213229
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
230+
<OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
214231
</Link>
215232
<ProjectReference>
216233
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
@@ -241,12 +258,13 @@
241258
<GenerateDebugInformation>false</GenerateDebugInformation>
242259
<EnableCOMDATFolding>true</EnableCOMDATFolding>
243260
<OptimizeReferences>true</OptimizeReferences>
244-
<AdditionalDependencies>libmatroska.lib;libebml.lib;libass.lib;fribidi.lib;fontconfig.lib;freetype2.lib;strmbase.lib;winmm.lib;shlwapi.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
261+
<AdditionalDependencies>libmatroska.lib;libebml.lib;libass.lib;fribidi.lib;fontconfig.lib;freetype2.lib;baseclasses.lib;winmm.lib;shlwapi.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
245262
<ModuleDefinitionFile>DSlibass.def</ModuleDefinitionFile>
246263
<EntryPointSymbol>
247264
</EntryPointSymbol>
248-
<AdditionalLibraryDirectories>..\libass\;$(OutDir)</AdditionalLibraryDirectories>
265+
<AdditionalLibraryDirectories>..\libass\;$(SolutionDir)$(Configuration)\$(Platform)</AdditionalLibraryDirectories>
249266
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
267+
<OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
250268
</Link>
251269
<ProjectReference>
252270
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
@@ -277,12 +295,13 @@
277295
<GenerateDebugInformation>true</GenerateDebugInformation>
278296
<EnableCOMDATFolding>true</EnableCOMDATFolding>
279297
<OptimizeReferences>true</OptimizeReferences>
280-
<AdditionalDependencies>libmatroska.lib;libebml.lib;libass_static.lib;libfribidi.a;fontconfig.lib;libfreetype.a;libenca.a;libiconv.a;libz.a;libgcc.a;strmbase.lib;winmm.lib;shlwapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
298+
<AdditionalDependencies>libmatroska.lib;libebml.lib;libass.lib;fribidi.lib;fontconfig.lib;freetype2.lib;baseclasses.lib;winmm.lib;shlwapi.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
281299
<ModuleDefinitionFile>DSlibass.def</ModuleDefinitionFile>
282300
<EntryPointSymbol>
283301
</EntryPointSymbol>
284-
<AdditionalLibraryDirectories>..\libass\;..\libebml\Release\;..\libmatroska\Release\;..\baseclasses\Release\</AdditionalLibraryDirectories>
302+
<AdditionalLibraryDirectories>..\libass\;$(SolutionDir)$(Configuration)\$(Platform)</AdditionalLibraryDirectories>
285303
<Profile>true</Profile>
304+
<OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
286305
</Link>
287306
</ItemDefinitionGroup>
288307
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">
@@ -310,12 +329,13 @@
310329
<GenerateDebugInformation>true</GenerateDebugInformation>
311330
<EnableCOMDATFolding>true</EnableCOMDATFolding>
312331
<OptimizeReferences>true</OptimizeReferences>
313-
<AdditionalDependencies>libmatroska.lib;libebml.lib;libass_static.lib;libfribidi.a;fontconfig.lib;libfreetype.a;libenca.a;libiconv.a;libz.a;libgcc.a;strmbase.lib;winmm.lib;shlwapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
332+
<AdditionalDependencies>libmatroska.lib;libebml.lib;libass.lib;fribidi.lib;fontconfig.lib;freetype2.lib;baseclasses.lib;winmm.lib;shlwapi.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
314333
<ModuleDefinitionFile>DSlibass.def</ModuleDefinitionFile>
315334
<EntryPointSymbol>
316335
</EntryPointSymbol>
317-
<AdditionalLibraryDirectories>..\libass\;$(OutDir)</AdditionalLibraryDirectories>
336+
<AdditionalLibraryDirectories>..\libass\;$(SolutionDir)$(Configuration)\$(Platform)</AdditionalLibraryDirectories>
318337
<Profile>true</Profile>
338+
<OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
319339
</Link>
320340
</ItemDefinitionGroup>
321341
<ItemGroup>

DSlibass/DSlibass.vcxproj.filters renamed to DSlibass/DirectASS.vcxproj.filters

File renamed without changes.

‎DSlibass/MatroskaParser.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#pragma once
2121

22-
#include "ebml/WinIOCallback.h"
22+
#include "src/platform/win32/WinIOCallback.h"
2323

2424

2525
using namespace LIBEBML_NAMESPACE;

DSlibass.sln renamed to DirectASS.sln

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
44
VisualStudioVersion = 14.0.23107.0
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSlibass", "DSlibass\DSlibass.vcxproj", "{687CD386-955D-42C7-8A47-4B1CFC56911A}"
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectASS", "DSlibass\DirectASS.vcxproj", "{687CD386-955D-42C7-8A47-4B1CFC56911A}"
77
ProjectSection(ProjectDependencies) = postProject
88
{168C0F0D-9975-4D24-885C-87A9B018617E} = {168C0F0D-9975-4D24-885C-87A9B018617E}
99
{817DD354-40BB-5065-F000-886ED3BFA54E} = {817DD354-40BB-5065-F000-886ED3BFA54E}
@@ -12,9 +12,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSlibass", "DSlibass\DSliba
1212
EndProject
1313
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "baseclasses", "baseclasses\baseclasses.vcxproj", "{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}"
1414
EndProject
15-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libebml", "libebml\libebml.vcxproj", "{168C0F0D-9975-4D24-885C-87A9B018617E}"
15+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libebml", "msvs\libebml.vcxproj", "{168C0F0D-9975-4D24-885C-87A9B018617E}"
1616
EndProject
17-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmatroska", "libmatroska\libmatroska.vcxproj", "{817DD354-40BB-5065-F000-886ED3BFA54E}"
17+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmatroska", "msvs\libmatroska.vcxproj", "{817DD354-40BB-5065-F000-886ED3BFA54E}"
1818
ProjectSection(ProjectDependencies) = postProject
1919
{168C0F0D-9975-4D24-885C-87A9B018617E} = {168C0F0D-9975-4D24-885C-87A9B018617E}
2020
EndProjectSection

0 commit comments

Comments
 (0)