Skip to content
This repository was archived by the owner on Oct 31, 2022. It is now read-only.

Commit 91d67b1

Browse files
committed
Merge branch 'master' of private repo with Windows support
Conflicts: README.md
2 parents 51bdc71 + 16ded98 commit 91d67b1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+3853
-1420
lines changed

.gitignore

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,16 @@ xcuserdata
1414
profile
1515
*.moved-aside
1616
.DS_Store
17+
# User-specific files
18+
*.suo
19+
*.user
20+
*.sln.docstates
21+
*.sdf
22+
*.opensdf
23+
# Build results
24+
[Dd]ebug/
25+
[Rr]elease/
26+
*.msi
27+
*.wixobj
28+
*.wixpdb
29+
Thumbs.db

Hap Codec Windows/Hap Codec.sln

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Express 2012 for Windows Desktop
4+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Hap", "Hap Codec.vcxproj", "{505578FB-B98D-4DDB-9B06-B6F85A40B3A2}"
5+
ProjectSection(ProjectDependencies) = postProject
6+
{EA240C00-1F49-4C14-AE7C-A7D5D00AF7FB} = {EA240C00-1F49-4C14-AE7C-A7D5D00AF7FB}
7+
EndProjectSection
8+
EndProject
9+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "snappy", "..\external\snappy\snappy-windows\snappy.vcxproj", "{EA240C00-1F49-4C14-AE7C-A7D5D00AF7FB}"
10+
EndProject
11+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "squish", "..\external\squish\squish-windows\squish.vcxproj", "{6A8518C3-D81A-4428-BD7F-C37933088AC1}"
12+
EndProject
13+
Global
14+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
15+
Debug|Win32 = Debug|Win32
16+
Debug|x64 = Debug|x64
17+
Release|Win32 = Release|Win32
18+
Release|x64 = Release|x64
19+
EndGlobalSection
20+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
21+
{505578FB-B98D-4DDB-9B06-B6F85A40B3A2}.Debug|Win32.ActiveCfg = Debug|Win32
22+
{505578FB-B98D-4DDB-9B06-B6F85A40B3A2}.Debug|Win32.Build.0 = Debug|Win32
23+
{505578FB-B98D-4DDB-9B06-B6F85A40B3A2}.Debug|x64.ActiveCfg = Debug|Win32
24+
{505578FB-B98D-4DDB-9B06-B6F85A40B3A2}.Release|Win32.ActiveCfg = Release|Win32
25+
{505578FB-B98D-4DDB-9B06-B6F85A40B3A2}.Release|Win32.Build.0 = Release|Win32
26+
{505578FB-B98D-4DDB-9B06-B6F85A40B3A2}.Release|x64.ActiveCfg = Release|Win32
27+
{EA240C00-1F49-4C14-AE7C-A7D5D00AF7FB}.Debug|Win32.ActiveCfg = Debug|Win32
28+
{EA240C00-1F49-4C14-AE7C-A7D5D00AF7FB}.Debug|Win32.Build.0 = Debug|Win32
29+
{EA240C00-1F49-4C14-AE7C-A7D5D00AF7FB}.Debug|x64.ActiveCfg = Debug|Win32
30+
{EA240C00-1F49-4C14-AE7C-A7D5D00AF7FB}.Release|Win32.ActiveCfg = Release|Win32
31+
{EA240C00-1F49-4C14-AE7C-A7D5D00AF7FB}.Release|Win32.Build.0 = Release|Win32
32+
{EA240C00-1F49-4C14-AE7C-A7D5D00AF7FB}.Release|x64.ActiveCfg = Release|Win32
33+
{6A8518C3-D81A-4428-BD7F-C37933088AC1}.Debug|Win32.ActiveCfg = Debug|Win32
34+
{6A8518C3-D81A-4428-BD7F-C37933088AC1}.Debug|Win32.Build.0 = Debug|Win32
35+
{6A8518C3-D81A-4428-BD7F-C37933088AC1}.Debug|x64.ActiveCfg = Debug|x64
36+
{6A8518C3-D81A-4428-BD7F-C37933088AC1}.Debug|x64.Build.0 = Debug|x64
37+
{6A8518C3-D81A-4428-BD7F-C37933088AC1}.Release|Win32.ActiveCfg = Release|Win32
38+
{6A8518C3-D81A-4428-BD7F-C37933088AC1}.Release|Win32.Build.0 = Release|Win32
39+
{6A8518C3-D81A-4428-BD7F-C37933088AC1}.Release|x64.ActiveCfg = Release|x64
40+
{6A8518C3-D81A-4428-BD7F-C37933088AC1}.Release|x64.Build.0 = Release|x64
41+
EndGlobalSection
42+
GlobalSection(SolutionProperties) = preSolution
43+
HideSolutionNode = FALSE
44+
EndGlobalSection
45+
EndGlobal
Lines changed: 184 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,184 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
</ItemGroup>
13+
<PropertyGroup Label="Globals">
14+
<ProjectGuid>{505578FB-B98D-4DDB-9B06-B6F85A40B3A2}</ProjectGuid>
15+
<Keyword>Win32Proj</Keyword>
16+
<RootNamespace>HapCodec</RootNamespace>
17+
<ProjectName>Hap</ProjectName>
18+
</PropertyGroup>
19+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
20+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
21+
<ConfigurationType>DynamicLibrary</ConfigurationType>
22+
<UseDebugLibraries>true</UseDebugLibraries>
23+
<PlatformToolset>v110</PlatformToolset>
24+
<CharacterSet>Unicode</CharacterSet>
25+
</PropertyGroup>
26+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
27+
<ConfigurationType>DynamicLibrary</ConfigurationType>
28+
<UseDebugLibraries>false</UseDebugLibraries>
29+
<PlatformToolset>v110</PlatformToolset>
30+
<WholeProgramOptimization>true</WholeProgramOptimization>
31+
<CharacterSet>Unicode</CharacterSet>
32+
</PropertyGroup>
33+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
34+
<ImportGroup Label="ExtensionSettings">
35+
</ImportGroup>
36+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
37+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
38+
</ImportGroup>
39+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
40+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
41+
</ImportGroup>
42+
<PropertyGroup Label="UserMacros" />
43+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
44+
<LinkIncremental>true</LinkIncremental>
45+
<TargetExt>.dll</TargetExt>
46+
<ExtensionsToDeleteOnClean>*.qtr;*.qtx;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
47+
</PropertyGroup>
48+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
49+
<LinkIncremental>false</LinkIncremental>
50+
<TargetExt>.dll</TargetExt>
51+
<ExtensionsToDeleteOnClean>*.qtr;*.qtx;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
52+
</PropertyGroup>
53+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
54+
<ClCompile>
55+
<PrecompiledHeader>
56+
</PrecompiledHeader>
57+
<WarningLevel>Level3</WarningLevel>
58+
<Optimization>Disabled</Optimization>
59+
<PreprocessorDefinitions>WIN32;WINVER=0x0600;_WIN32_WINNT=0x0600;WIN32_LEAN_AND_MEAN;_DEBUG;DEBUG;_WINDOWS;_USRDLL;HAPCODEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
60+
<AdditionalIncludeDirectories>$(SolutionDir)..\external\hap;$(SolutionDir)..\external\squish\squish-source;$(SolutionDir)..\external\snappy\snappy-source;$(PROGRAMFILES)\QuickTime SDK\ComponentIncludes;$(PROGRAMFILES)\QuickTime SDK\CIncludes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
61+
</ClCompile>
62+
<Link>
63+
<SubSystem>Windows</SubSystem>
64+
<GenerateDebugInformation>true</GenerateDebugInformation>
65+
<AdditionalLibraryDirectories>$(PROGRAMFILES)\QuickTime SDK\Libraries;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
66+
<AdditionalDependencies>qtmlclient.lib;cvclient.lib;%(AdditionalDependencies)</AdditionalDependencies>
67+
<IgnoreSpecificDefaultLibraries>libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
68+
<ModuleDefinitionFile>$(SolutionDir)..\source\HapComponent.def</ModuleDefinitionFile>
69+
</Link>
70+
<PreBuildEvent>
71+
<Command>@echo on
72+
"$(ProgramFiles)\QuickTime SDK\Tools\Rez.exe" -rd -i "$(ProgramFiles)\QuickTime SDK\RIncludes" -i .\..\source -o "$(TargetDir)$(TargetName).qtr" &lt; "$(ProjectDir)../source/HapResWindows.r"</Command>
73+
</PreBuildEvent>
74+
<PostBuildEvent>
75+
<Command>@echo on
76+
attrib -R "$(OutDir)$(TargetName)$(TargetExt)"
77+
"$(ProgramFiles)\QuickTime SDK\Tools\RezWack.exe" -f -d "$(TargetDir)$(TargetName)$(TargetExt)" -r "$(TargetDir)$(TargetName).qtr" -o "$(TargetDir)$(TargetName).qtx"
78+
attrib -R "$(TargetDir)$(TargetName).qtx"
79+
</Command>
80+
</PostBuildEvent>
81+
</ItemDefinitionGroup>
82+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
83+
<ClCompile>
84+
<WarningLevel>Level3</WarningLevel>
85+
<PrecompiledHeader>
86+
</PrecompiledHeader>
87+
<Optimization>MaxSpeed</Optimization>
88+
<FunctionLevelLinking>true</FunctionLevelLinking>
89+
<IntrinsicFunctions>true</IntrinsicFunctions>
90+
<PreprocessorDefinitions>WIN32;WINVER=0x0600;_WIN32_WINNT=0x0600;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_USRDLL;HAPCODEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
91+
<AdditionalIncludeDirectories>$(SolutionDir)..\external\hap;$(SolutionDir)..\external\squish\squish-source;$(SolutionDir)..\external\snappy\snappy-source;$(PROGRAMFILES)\QuickTime SDK\ComponentIncludes;$(PROGRAMFILES)\QuickTime SDK\CIncludes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
92+
</ClCompile>
93+
<Link>
94+
<SubSystem>Windows</SubSystem>
95+
<GenerateDebugInformation>true</GenerateDebugInformation>
96+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
97+
<OptimizeReferences>true</OptimizeReferences>
98+
<AdditionalLibraryDirectories>$(PROGRAMFILES)\QuickTime SDK\Libraries;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
99+
<AdditionalDependencies>qtmlclient.lib;cvclient.lib;%(AdditionalDependencies)</AdditionalDependencies>
100+
<IgnoreSpecificDefaultLibraries>libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
101+
<ModuleDefinitionFile>$(SolutionDir)..\source\HapComponent.def</ModuleDefinitionFile>
102+
</Link>
103+
<PreBuildEvent>
104+
<Command>@echo on
105+
"$(ProgramFiles)\QuickTime SDK\Tools\Rez.exe" -rd -i "$(ProgramFiles)\QuickTime SDK\RIncludes" -i .\..\source -o "$(TargetDir)$(TargetName).qtr" &lt; "$(ProjectDir)../source/HapResWindows.r"</Command>
106+
</PreBuildEvent>
107+
<PostBuildEvent>
108+
<Command>@echo on
109+
attrib -R "$(OutDir)$(TargetName)$(TargetExt)"
110+
"$(ProgramFiles)\QuickTime SDK\Tools\RezWack.exe" -f -d "$(TargetDir)$(TargetName)$(TargetExt)" -r "$(TargetDir)$(TargetName).qtr" -o "$(TargetDir)$(TargetName).qtx"
111+
attrib -R "$(TargetDir)$(TargetName).qtx"
112+
</Command>
113+
</PostBuildEvent>
114+
</ItemDefinitionGroup>
115+
<ItemGroup>
116+
<ClCompile Include="..\external\hap\hap.c" />
117+
<ClCompile Include="..\source\Buffers.c" />
118+
<ClCompile Include="..\source\Dllmain.c" />
119+
<ClCompile Include="..\source\DXTBlocks.c" />
120+
<ClCompile Include="..\source\DXTBlocksSSSE3.c" />
121+
<ClCompile Include="..\source\HapCompressor.c" />
122+
<ClCompile Include="..\source\HapDecompressor.c" />
123+
<ClCompile Include="..\source\ImageMath.c" />
124+
<ClCompile Include="..\source\ParallelLoops.cpp" />
125+
<ClCompile Include="..\source\PixelFormats.c" />
126+
<ClCompile Include="..\source\squish-c.cpp" />
127+
<ClCompile Include="..\source\SquishDecoder.c" />
128+
<ClCompile Include="..\source\SquishEncoder.c" />
129+
<ClCompile Include="..\source\Tasks.c" />
130+
<ClCompile Include="..\source\Utility.c">
131+
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
132+
</CompileAs>
133+
</ClCompile>
134+
<ClCompile Include="..\source\YCoCg.c" />
135+
<ClCompile Include="..\source\Lock.c" />
136+
<ClCompile Include="..\source\YCoCgDXT.cpp">
137+
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
138+
</ClCompile>
139+
<ClCompile Include="..\source\YCoCgDXTEncoder.c" />
140+
</ItemGroup>
141+
<ItemGroup>
142+
<ClInclude Include="..\external\hap\hap.h" />
143+
<ClInclude Include="..\source\Buffers.h" />
144+
<ClInclude Include="..\source\DXTBlocks.h" />
145+
<ClInclude Include="..\source\DXTEncoder.h" />
146+
<ClInclude Include="..\source\HapCodecSubTypes.h" />
147+
<ClInclude Include="..\source\HapCodecVersion.h" />
148+
<ClInclude Include="..\source\HapCompressorDispatch.h" />
149+
<ClInclude Include="..\source\HapDecompressorDispatch.h" />
150+
<ClInclude Include="..\source\HapPlatform.h" />
151+
<ClInclude Include="..\source\HapResCommon.h" />
152+
<ClInclude Include="..\source\ImageMath.h" />
153+
<ClInclude Include="..\source\ParallelLoops.h" />
154+
<ClInclude Include="..\source\PixelFormats.h" />
155+
<ClInclude Include="..\source\squish-c.h" />
156+
<ClInclude Include="..\source\SquishDecoder.h" />
157+
<ClInclude Include="..\source\SquishEncoder.h" />
158+
<ClInclude Include="..\source\Tasks.h" />
159+
<ClInclude Include="..\source\Utility.h" />
160+
<ClInclude Include="..\source\YCoCg.h" />
161+
<ClInclude Include="..\source\Lock.h" />
162+
<ClInclude Include="..\source\YCoCgDXT.h" />
163+
<ClInclude Include="..\source\YCoCgDXTEncoder.h" />
164+
</ItemGroup>
165+
<ItemGroup>
166+
<None Include="..\source\HapAlphaComponent.r" />
167+
<None Include="..\source\HapComponent.def" />
168+
<None Include="..\source\HapComponent.r" />
169+
<None Include="..\source\HapResCommon.r" />
170+
<None Include="..\source\HapYCoCgComponent.r" />
171+
<None Include="..\source\HapResWindows.r" />
172+
</ItemGroup>
173+
<ItemGroup>
174+
<ProjectReference Include="..\external\snappy\snappy-windows\snappy.vcxproj">
175+
<Project>{ea240c00-1f49-4c14-ae7c-a7d5d00af7fb}</Project>
176+
</ProjectReference>
177+
<ProjectReference Include="..\external\squish\squish-windows\squish.vcxproj">
178+
<Project>{6a8518c3-d81a-4428-bd7f-c37933088ac1}</Project>
179+
</ProjectReference>
180+
</ItemGroup>
181+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
182+
<ImportGroup Label="ExtensionTargets">
183+
</ImportGroup>
184+
</Project>

0 commit comments

Comments
 (0)