Android and Linux sln and vcxproj
This commit is contained in:
Ruben Guerrero Samaniego
Родитель
0378c26475
Коммит
9df34cb86e
|
|
@ -0,0 +1,41 @@
|
|||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.26730.16
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xPlatAppx", "xPlatAppx.vcxproj", "{898221ED-E7C3-44C3-8859-330BBB50C567}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstatAndroid", "..\..\lib\zlibstatAndroid.vcxproj", "{3B165978-7233-4741-87FE-EC33E0A25232}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|ARM = Debug|ARM
|
||||
Debug|x86 = Debug|x86
|
||||
Release|ARM = Release|ARM
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{898221ED-E7C3-44C3-8859-330BBB50C567}.Debug|ARM.ActiveCfg = Debug|ARM
|
||||
{898221ED-E7C3-44C3-8859-330BBB50C567}.Debug|ARM.Build.0 = Debug|ARM
|
||||
{898221ED-E7C3-44C3-8859-330BBB50C567}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{898221ED-E7C3-44C3-8859-330BBB50C567}.Debug|x86.Build.0 = Debug|x86
|
||||
{898221ED-E7C3-44C3-8859-330BBB50C567}.Release|ARM.ActiveCfg = Release|ARM
|
||||
{898221ED-E7C3-44C3-8859-330BBB50C567}.Release|ARM.Build.0 = Release|ARM
|
||||
{898221ED-E7C3-44C3-8859-330BBB50C567}.Release|x86.ActiveCfg = Release|x86
|
||||
{898221ED-E7C3-44C3-8859-330BBB50C567}.Release|x86.Build.0 = Release|x86
|
||||
{3B165978-7233-4741-87FE-EC33E0A25232}.Debug|ARM.ActiveCfg = Debug|ARM
|
||||
{3B165978-7233-4741-87FE-EC33E0A25232}.Debug|ARM.Build.0 = Debug|ARM
|
||||
{3B165978-7233-4741-87FE-EC33E0A25232}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{3B165978-7233-4741-87FE-EC33E0A25232}.Debug|x86.Build.0 = Debug|x86
|
||||
{3B165978-7233-4741-87FE-EC33E0A25232}.Release|ARM.ActiveCfg = Release|ARM
|
||||
{3B165978-7233-4741-87FE-EC33E0A25232}.Release|ARM.Build.0 = Release|ARM
|
||||
{3B165978-7233-4741-87FE-EC33E0A25232}.Release|x86.ActiveCfg = Release|x86
|
||||
{3B165978-7233-4741-87FE-EC33E0A25232}.Release|x86.Build.0 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {57ECB58D-C3DC-40C9-A274-5325E5E6D2AE}
|
||||
SolutionGuid = {3E5D06AE-0F9E-45D2-8DF3-B73D686AEE6A}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -0,0 +1,137 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|ARM">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>ARM</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|ARM">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>ARM</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|x86">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x86</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x86">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x86</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{898221ed-e7c3-44c3-8859-330bbb50c567}</ProjectGuid>
|
||||
<Keyword>Android</Keyword>
|
||||
<RootNamespace>xPlatAppx</RootNamespace>
|
||||
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
|
||||
<ApplicationType>Android</ApplicationType>
|
||||
<ApplicationTypeRevision>3.0</ApplicationTypeRevision>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>Clang_3_8</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>Clang_3_8</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>Clang_3_8</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>Clang_3_8</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings" />
|
||||
<ImportGroup Label="Shared" />
|
||||
<ImportGroup Label="PropertySheets" />
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>PLATFORM_ANDROID</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>..\..\src\inc;$(NDKRoot)\platforms\$(AndroidAPILevel)\arch-arm\usr\include;$(NDKRoot)\sources\android\native_app_glue;$(NDKRoot)\sources\android\ndk_helper;$(NDKRoot)\sources\android\cpufeatures;$(StlIncludeDirectories)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<ExceptionHandling>Enabled</ExceptionHandling>
|
||||
<CppLanguageStandard>c++1y</CppLanguageStandard>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>PLATFORM_ANDROID</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>..\..\src\inc;$(NDKRoot)\platforms\$(AndroidAPILevel)\arch-arm\usr\include;$(NDKRoot)\sources\android\native_app_glue;$(NDKRoot)\sources\android\ndk_helper;$(NDKRoot)\sources\android\cpufeatures;$(StlIncludeDirectories)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<CppLanguageStandard>c++1y</CppLanguageStandard>
|
||||
<ExceptionHandling>Enabled</ExceptionHandling>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>PLATFORM_ANDROID</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>..\..\src\inc;$(NDKRoot)\platforms\$(AndroidAPILevel)\arch-arm\usr\include;$(NDKRoot)\sources\android\native_app_glue;$(NDKRoot)\sources\android\ndk_helper;$(NDKRoot)\sources\android\cpufeatures;$(StlIncludeDirectories)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<CppLanguageStandard>c++1y</CppLanguageStandard>
|
||||
<ExceptionHandling>Enabled</ExceptionHandling>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>PLATFORM_ANDROID</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>..\..\src\inc;$(NDKRoot)\platforms\$(AndroidAPILevel)\arch-arm\usr\include;$(NDKRoot)\sources\android\native_app_glue;$(NDKRoot)\sources\android\ndk_helper;$(NDKRoot)\sources\android\cpufeatures;$(StlIncludeDirectories)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<CppLanguageStandard>c++1y</CppLanguageStandard>
|
||||
<ExceptionHandling>Enabled</ExceptionHandling>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\src\xPlatAppx\xPlatAppx.cpp" />
|
||||
<ClCompile Include="..\..\src\xPlatAppx\ZipObject.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\lib\zlib\zlib.h" />
|
||||
<ClInclude Include="..\..\src\inc\Base64Stream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\CRC32Stream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\Exceptions.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\FileStream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\OffsetStream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\PartitionStream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\SequenceStream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\SHA256Stream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\StreamBase.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\xPlatAppx.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\ZipFileStream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\ZipObject.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\ObjectBase.hpp" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets" />
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\src\xPlatAppx\xPlatAppx.cpp" />
|
||||
<ClCompile Include="..\..\src\xPlatAppx\ZipStream.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\lib\zlib\zlib.h" />
|
||||
<ClInclude Include="..\..\src\inc\Base64Stream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\CRC32Stream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\Exceptions.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\FileStream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\OffsetStream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\PartitionStream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\SequenceStream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\SHA256Stream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\StreamBase.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\xPlatAppx.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\ZipFileStream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\ZipStream.hpp" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.26730.16
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xPlatAppx", "xPlatAppx.vcxproj", "{D914BD8A-FEAA-483C-8C3B-09DE43B98057}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstatLinux", "..\..\lib\zlibstatLinux.vcxproj", "{0DB96B65-AE6A-4F70-8A6E-81D5CF91DFE5}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|ARM = Debug|ARM
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
Release|ARM = Release|ARM
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{D914BD8A-FEAA-483C-8C3B-09DE43B98057}.Debug|ARM.ActiveCfg = Debug|x86
|
||||
{D914BD8A-FEAA-483C-8C3B-09DE43B98057}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{D914BD8A-FEAA-483C-8C3B-09DE43B98057}.Debug|x64.Build.0 = Debug|x64
|
||||
{D914BD8A-FEAA-483C-8C3B-09DE43B98057}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{D914BD8A-FEAA-483C-8C3B-09DE43B98057}.Debug|x86.Build.0 = Debug|x86
|
||||
{D914BD8A-FEAA-483C-8C3B-09DE43B98057}.Release|ARM.ActiveCfg = Release|x86
|
||||
{D914BD8A-FEAA-483C-8C3B-09DE43B98057}.Release|x64.ActiveCfg = Release|x64
|
||||
{D914BD8A-FEAA-483C-8C3B-09DE43B98057}.Release|x64.Build.0 = Release|x64
|
||||
{D914BD8A-FEAA-483C-8C3B-09DE43B98057}.Release|x86.ActiveCfg = Release|x86
|
||||
{D914BD8A-FEAA-483C-8C3B-09DE43B98057}.Release|x86.Build.0 = Release|x86
|
||||
{0DB96B65-AE6A-4F70-8A6E-81D5CF91DFE5}.Debug|ARM.ActiveCfg = Debug|ARM
|
||||
{0DB96B65-AE6A-4F70-8A6E-81D5CF91DFE5}.Debug|ARM.Build.0 = Debug|ARM
|
||||
{0DB96B65-AE6A-4F70-8A6E-81D5CF91DFE5}.Debug|x64.ActiveCfg = Debug|x86
|
||||
{0DB96B65-AE6A-4F70-8A6E-81D5CF91DFE5}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{0DB96B65-AE6A-4F70-8A6E-81D5CF91DFE5}.Debug|x86.Build.0 = Debug|x86
|
||||
{0DB96B65-AE6A-4F70-8A6E-81D5CF91DFE5}.Release|ARM.ActiveCfg = Release|ARM
|
||||
{0DB96B65-AE6A-4F70-8A6E-81D5CF91DFE5}.Release|ARM.Build.0 = Release|ARM
|
||||
{0DB96B65-AE6A-4F70-8A6E-81D5CF91DFE5}.Release|x64.ActiveCfg = Release|x86
|
||||
{0DB96B65-AE6A-4F70-8A6E-81D5CF91DFE5}.Release|x86.ActiveCfg = Release|x86
|
||||
{0DB96B65-AE6A-4F70-8A6E-81D5CF91DFE5}.Release|x86.Build.0 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {FBFF2301-AA80-457F-8705-9AC74F4221E2}
|
||||
SolutionGuid = {11120DC9-2243-48BB-9B69-57399585D26E}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -0,0 +1,108 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|x86">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x86</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x86">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x86</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{d914bd8a-feaa-483c-8c3b-09de43b98057}</ProjectGuid>
|
||||
<Keyword>Linux</Keyword>
|
||||
<RootNamespace>xPlatAppx</RootNamespace>
|
||||
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
|
||||
<ApplicationType>Linux</ApplicationType>
|
||||
<ApplicationTypeRevision>1.0</ApplicationTypeRevision>
|
||||
<TargetLinuxPlatform>Generic</TargetLinuxPlatform>
|
||||
<LinuxProjectType>{D51BCBC9-82E9-4017-911E-C93873C4EA2B}</LinuxProjectType>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings" />
|
||||
<ImportGroup Label="Shared" />
|
||||
<ImportGroup Label="PropertySheets" />
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
<CLanguageStandard>Default</CLanguageStandard>
|
||||
<CppLanguageStandard>c++1y</CppLanguageStandard>
|
||||
<PreprocessorDefinitions>PLATFORM_LINUX</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>..\..\src\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<ClCompile>
|
||||
<CppLanguageStandard>Default</CppLanguageStandard>
|
||||
<CppLanguageStandard>c++1y</CppLanguageStandard>
|
||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions);PLATFORM_LINUX</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>..\..\src\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
|
||||
<ClCompile>
|
||||
<CLanguageStandard>Default</CLanguageStandard>
|
||||
<CppLanguageStandard>c++1y</CppLanguageStandard>
|
||||
<PreprocessorDefinitions>PLATFORM_LINUX</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>..\..\src\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
|
||||
<ClCompile>
|
||||
<CLanguageStandard>Default</CLanguageStandard>
|
||||
<CppLanguageStandard>c++1y</CppLanguageStandard>
|
||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions);PLATFORM_LINUX</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>..\..\src\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\src\xPlatAppx\xPlatAppx.cpp" />
|
||||
<ClCompile Include="..\..\src\xPlatAppx\ZipObject.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\lib\zlib\zlib.h" />
|
||||
<ClInclude Include="..\..\src\inc\Base64Stream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\CRC32Stream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\Exceptions.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\FileStream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\OffsetStream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\PartitionStream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\SequenceStream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\SHA256Stream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\StreamBase.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\xPlatAppx.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\ZipFileStream.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\ZipObject.hpp" />
|
||||
<ClInclude Include="..\..\src\inc\ObjectBase.hpp" />
|
||||
</ItemGroup>
|
||||
<ItemDefinitionGroup />
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets" />
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,73 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|ARM">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>ARM</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|ARM">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>ARM</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|x86">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x86</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x86">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x86</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{3b165978-7233-4741-87fe-ec33e0a25232}</ProjectGuid>
|
||||
<Keyword>Android</Keyword>
|
||||
<RootNamespace>zlibAndroid</RootNamespace>
|
||||
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
|
||||
<ApplicationType>Android</ApplicationType>
|
||||
<ApplicationTypeRevision>3.0</ApplicationTypeRevision>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>Clang_3_8</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>Clang_3_8</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>Clang_3_8</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>Clang_3_8</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings" />
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<ItemGroup>
|
||||
<ClCompile Include=".\zlib\adler32.c" />
|
||||
<ClCompile Include=".\zlib\compress.c" />
|
||||
<ClCompile Include=".\zlib\crc32.c" />
|
||||
<ClCompile Include=".\zlib\deflate.c" />
|
||||
<ClCompile Include=".\zlib\gzclose.c" />
|
||||
<ClCompile Include=".\zlib\gzlib.c" />
|
||||
<ClCompile Include=".\zlib\gzread.c" />
|
||||
<ClCompile Include=".\zlib\gzwrite.c" />
|
||||
<ClCompile Include=".\zlib\infback.c" />
|
||||
<ClCompile Include=".\zlib\inffast.c" />
|
||||
<ClCompile Include=".\zlib\inflate.c" />
|
||||
<ClCompile Include=".\zlib\inftrees.c" />
|
||||
<ClCompile Include=".\zlib\trees.c" />
|
||||
<ClCompile Include=".\zlib\uncompr.c" />
|
||||
<ClCompile Include=".\zlib\zutil.c" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|ARM">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>ARM</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|ARM">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>ARM</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|x86">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x86</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x86">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x86</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{0db96b65-ae6a-4f70-8a6e-81d5cf91dfe5}</ProjectGuid>
|
||||
<Keyword>Linux</Keyword>
|
||||
<RootNamespace>LinuxConsoleApplication</RootNamespace>
|
||||
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
|
||||
<ApplicationType>Linux</ApplicationType>
|
||||
<ApplicationTypeRevision>1.0</ApplicationTypeRevision>
|
||||
<TargetLinuxPlatform>Generic</TargetLinuxPlatform>
|
||||
<LinuxProjectType>{85261C82-0E9B-457D-9D8C-D133A114CBC8}</LinuxProjectType>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings" />
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<ItemGroup>
|
||||
<ClCompile Include=".\zlib\adler32.c" />
|
||||
<ClCompile Include=".\zlib\compress.c" />
|
||||
<ClCompile Include=".\zlib\crc32.c" />
|
||||
<ClCompile Include=".\zlib\deflate.c" />
|
||||
<ClCompile Include=".\zlib\gzclose.c" />
|
||||
<ClCompile Include=".\zlib\gzlib.c" />
|
||||
<ClCompile Include=".\zlib\gzread.c" />
|
||||
<ClCompile Include=".\zlib\gzwrite.c" />
|
||||
<ClCompile Include=".\zlib\infback.c" />
|
||||
<ClCompile Include=".\zlib\inffast.c" />
|
||||
<ClCompile Include=".\zlib\inflate.c" />
|
||||
<ClCompile Include=".\zlib\inftrees.c" />
|
||||
<ClCompile Include=".\zlib\trees.c" />
|
||||
<ClCompile Include=".\zlib\uncompr.c" />
|
||||
<ClCompile Include=".\zlib\zutil.c" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include=".\zlib\zutil.h" />
|
||||
<ClInclude Include=".\zlib\zlib.h" />
|
||||
<ClInclude Include=".\zlib\deflate.h" />
|
||||
<ClInclude Include=".\zlib\gzguts.h" />
|
||||
<ClInclude Include=".\zlib\zconf.h" />
|
||||
<ClInclude Include=".\zlib\crc32.h" />
|
||||
<ClInclude Include=".\zlib\inftrees.h" />
|
||||
<ClInclude Include=".\zlib\trees.h" />
|
||||
<ClInclude Include=".\zlib\inflate.h" />
|
||||
<ClInclude Include=".\zlib\inffast.h" />
|
||||
<ClInclude Include=".\zlib\inffixed.h" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
|
|
@ -12,8 +12,8 @@ namespace xPlat {
|
|||
{
|
||||
public:
|
||||
FileException(std::string message, uint32_t error = 0) :
|
||||
reason(message),
|
||||
ExceptionBase(ExceptionBase::Facility::FILE)
|
||||
ExceptionBase(ExceptionBase::Facility::FILE),
|
||||
reason(message)
|
||||
{
|
||||
SetLastError(error);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ namespace xPlat {
|
|||
class StructuredObject : public Object
|
||||
{
|
||||
public:
|
||||
StructuredObject(std::initializer_list<std::shared_ptr<Object>> list) : fields(list), Object(&fields) { }
|
||||
StructuredObject(std::initializer_list<std::shared_ptr<Object>> list) : Object(&fields), fields(list) { }
|
||||
|
||||
virtual void Write(StreamBase* stream) override
|
||||
{
|
||||
|
|
@ -85,7 +85,7 @@ namespace xPlat {
|
|||
public:
|
||||
using Lambda = std::function<void(T& v)>;
|
||||
|
||||
FieldBase(Lambda validator) : validate(validator), Object(&value) {}
|
||||
FieldBase(Lambda validator) : Object(&value), validate(validator) {}
|
||||
|
||||
virtual T& GetValue() { return value; }
|
||||
virtual void SetValue(T& v) { value = v; }
|
||||
|
|
@ -139,7 +139,7 @@ namespace xPlat {
|
|||
{
|
||||
public:
|
||||
using Lambda = std::function<void(std::vector<std::uint8_t>& v)>;
|
||||
FieldNBytes(Lambda validator) : validate(validator), Object(&value) {}
|
||||
FieldNBytes(Lambda validator) : Object(&value), validate(validator) {}
|
||||
|
||||
size_t Size() override { return value.size(); }
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ namespace xPlat {
|
|||
HiddenDataBetweenLastCDHandEoCD = 7,
|
||||
};
|
||||
|
||||
ZipException(std::string message, Error error) : reason(message), ExceptionBase(ExceptionBase::Facility::ZIP)
|
||||
ZipException(std::string message, Error error) : ExceptionBase(ExceptionBase::Facility::ZIP), reason(message)
|
||||
{
|
||||
SetLastError(static_cast<std::uint32_t>(error));
|
||||
}
|
||||
|
|
@ -132,7 +132,7 @@ namespace xPlat {
|
|||
public:
|
||||
virtual ~CentralDirectoryFileHeader() {}
|
||||
|
||||
CentralDirectoryFileHeader(StreamBase* s) : m_stream(s), Meta::StructuredObject(
|
||||
CentralDirectoryFileHeader(StreamBase* s) : Meta::StructuredObject(
|
||||
{
|
||||
// 0 - central file header signature 4 bytes(0x02014b50)
|
||||
std::make_shared<Meta::Field4Bytes>([](std::uint32_t& v)
|
||||
|
|
@ -229,7 +229,7 @@ namespace xPlat {
|
|||
std::make_shared<Meta::FieldNBytes>([](std::vector<std::uint8_t>& data) {}),
|
||||
//19 - file comment(variable size)
|
||||
std::make_shared<Meta::FieldNBytes>([](std::vector<std::uint8_t>& data) {})
|
||||
})
|
||||
}), m_stream(s)
|
||||
{/*constructor*/
|
||||
SetSignature(static_cast<std::uint32_t>(Signatures::CentralFileHeader));
|
||||
SetVersionMadeBy(static_cast<std::uint16_t>(ZipVersions::Zip64FormatExtension));
|
||||
|
|
|
|||
|
|
@ -1,15 +1,16 @@
|
|||
#pragma once
|
||||
|
||||
#ifdef PLATFORM_APPLE
|
||||
#if defined PLATFORM_APPLE
|
||||
#define XPLATAPPX_API
|
||||
|
||||
#else /*PLATFORM_MAC*/
|
||||
#ifdef XPLATAPPX_API
|
||||
#define XPLATAPPX_API __declspec(dllexport)
|
||||
#else /*XPLATAPPX_API*/
|
||||
#define XPLATAPPX_API __declspec(dllimport)
|
||||
#endif /*XPLATAPPX_API*/
|
||||
#endif /*PLATFORM_MAC*/
|
||||
#elif defined PLATFORM_ANDROID
|
||||
#define XPLATAPPX_API
|
||||
#elif defined PLATFORM_LINUX
|
||||
#define XPLATAPPX_API
|
||||
#elif defined XPLATAPPX_API
|
||||
#define XPLATAPPX_API __declspec(dllexport)
|
||||
#else
|
||||
#define XPLATAPPX_API __declspec(dllexport)
|
||||
#endif
|
||||
|
||||
// TODO: add #defs to cover platform-specific differences?
|
||||
XPLATAPPX_API unsigned int UnpackAppx (char* source, char* destination);
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ namespace xPlat {
|
|||
class Zip64EndOfCentralDirectoryRecord : public Meta::StructuredObject
|
||||
{
|
||||
public:
|
||||
Zip64EndOfCentralDirectoryRecord(StreamBase* s) : m_stream(s), Meta::StructuredObject(
|
||||
Zip64EndOfCentralDirectoryRecord(StreamBase* s) : Meta::StructuredObject(
|
||||
{
|
||||
// 0 - zip64 end of central dir signature 4 bytes(0x06064b50)
|
||||
std::make_shared<Meta::Field4Bytes>([](std::uint32_t& v)
|
||||
|
|
@ -219,7 +219,7 @@ namespace xPlat {
|
|||
{ throw ZipException("unsupported extensible data", ZipException::Error::InvalidZip64CentralDirectoryRecord);
|
||||
}
|
||||
})
|
||||
})
|
||||
}), m_stream(s)
|
||||
{
|
||||
SetSignature(static_cast<std::uint32_t>(Signatures::Zip64EndOfCD));
|
||||
SetGetSizeOfZip64CDRecord(this->Size() - 12);
|
||||
|
|
@ -259,7 +259,7 @@ namespace xPlat {
|
|||
class Zip64EndOfCentralDirectoryLocator : public Meta::StructuredObject
|
||||
{
|
||||
public:
|
||||
Zip64EndOfCentralDirectoryLocator(StreamBase* s) : m_stream(s), Meta::StructuredObject(
|
||||
Zip64EndOfCentralDirectoryLocator(StreamBase* s) : Meta::StructuredObject(
|
||||
{
|
||||
// 0 - zip64 end of central dir locator signature 4 bytes(0x07064b50)
|
||||
std::make_shared<Meta::Field4Bytes>([](std::uint32_t& v)
|
||||
|
|
@ -286,7 +286,7 @@ namespace xPlat {
|
|||
{ throw ZipException("Invalid total number of disks", ZipException::Error::InvalidZip64CentralDirectoryLocator);
|
||||
}
|
||||
})
|
||||
})
|
||||
}), m_stream(s)
|
||||
{/*constructor*/
|
||||
SetSignature(static_cast<std::uint32_t>(Signatures::Zip64EndOfCDLocator));
|
||||
SetNumberOfDisk(0);
|
||||
|
|
|
|||
|
|
@ -53,9 +53,9 @@ XPLATAPPX_API unsigned int UnpackAppx(char* source, char* destination)
|
|||
{
|
||||
return ResultOf(source, destination, [&]() {
|
||||
std::string appxFileName(source);
|
||||
xPlat::ZipObject zip(std::move(std::make_unique<xPlat::FileStream>(
|
||||
xPlat::ZipObject zip(std::make_unique<xPlat::FileStream>(
|
||||
std::move(appxFileName),
|
||||
xPlat::FileStream::Mode::READ)));
|
||||
xPlat::FileStream::Mode::READ));
|
||||
zip.Read();
|
||||
});
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче