Skip to content

Add support for ARM platform. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
madewokherd wants to merge 1 commit into
base: CoApp
Choose a base branch
from
Open

Add support for ARM platform. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/coapp/.buildinfo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ default {
Projects=${ProjectFiles};
};
};
("V110,V120", Architectures, ReleaseOrDebug, Linkage, "cdecl,stdcall", "MultiByte, Unicode", "App, Desktop","NoASM") => {
("V110,V120", "Win32,x64,ARM", ReleaseOrDebug, Linkage, "cdecl,stdcall", "MultiByte, Unicode", "App, Desktop","NoASM") => {
.MsBuildEx {
MaxThreads = $(MaxThreads);
LoadEnvironmentFromTargets = VC_${0}_${1};
Expand Down
2 changes: 1 addition & 1 deletion contrib/coapp/version.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#define { package-version : 1.2.8.6; }
#define { package-version : 1.2.8.7; }
4 changes: 2 additions & 2 deletions contrib/coapp/zlib.autopkg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ nuget {
"..\minizip\unzip.c",
"..\minizip\zip.c",
};
("v100,v110", "Win32,x64", "release,debug", "Dynamic", "cdecl,stdcall") => {
("v100,v110", "Win32,x64,ARM", "release,debug", "Dynamic", "cdecl,stdcall") => {
[${0},${1},${2},${3},${4}] {
lib: { .\output\${0}\${1}\${2}\${3}\${4}\*.lib };
bin: { .\output\${0}\${1}\${2}\${3}\${4}\*.dll };
symbols: { .\output\${0}\${1}\${2}\${3}\${4}\*.pdb };
};
};
("v100,v110", "Win32,x64", "release,debug", "Static,ltcg", "cdecl,stdcall") => {
("v100,v110", "Win32,x64,ARM", "release,debug", "Static,ltcg", "cdecl,stdcall") => {
[${0},${1},${2},${3},${4}] {
lib: { .\output\${0}\${1}\${2}\${3}\${4}\*.lib };
};
Expand Down
322 changes: 167 additions & 155 deletions contrib/coapp/zlib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,155 +1,167 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="PreBuildCmds;PreBuildTargets;Build;PostBuildCmds;PostBuildTargets" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="CoApp" >
<CoAppEtcDirectory>$(registry:HKEY_LOCAL_MACHINE\Software\Outercurve\CoApp.Powershell\etc)</CoAppEtcDirectory>

<!-- Set to true to make visual studio use PTK when building.-->
<UsePTKFromVisualStudio>false</UsePTKFromVisualStudio>
</PropertyGroup>

<PropertyGroup Label="Configuration" >
<!-- This lets Visual Studio see this as a VC11 project by default -->
<PlatformToolset Condition="'$(PlatformToolset)' == ''">v110</PlatformToolset>
</PropertyGroup>

<Import Condition="Exists('$(CoAppEtcDirectory)\common-variables.vcxproj')" Project="$(CoAppEtcDirectory)\common-variables.vcxproj" />

<PropertyGroup Label="CustomSettings" />

<PropertyGroup Label="Globals">
<ProjectGuid>{63BED288-E8C3-4345-B84D-2E64598DCF3A}</ProjectGuid>
<RootNamespace>$(MSBuildProjectName)</RootNamespace>

<OutNameSuffix Condition="$(IS_CDECL) AND $(IS_DYNAMIC)">1</OutNameSuffix>

<!-- set to Application or DynamicLibrary (DynamicLibrary can get altered to StaticLibrary by PTK -->
<ConfigurationType>DynamicLibrary</ConfigurationType>

<!-- Common Compiler Defines (semicolon delimited) -->
<Defines>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;</Defines>
<Defines Condition="$(IS_STDCALL)">$(Defines);ZLIB_WINAPI;</Defines>
<Defines Condition="$(IS_DYNAMIC)">$(Defines);ZLIB_DLL;</Defines>
<Defines Condition="'$(AppContainer)' == 'App'">$(Defines);IOWIN32_USING_WINRT_API=1;</Defines>
<Defines Condition="'$(AppContainer)' != 'App'">$(Defines);IOWIN32_USING_WINRT_API=0;</Defines>
<Defines Condition="'$(UseASM)' == 'ASM'">$(Defines);ASMV;ASMINF;</Defines>
<Defines Condition="$(IS_X64)">$(Defines);WIN64;</Defines>

<!-- Additional Include folders (semicolon delimited) -->
<IncludeDirectories>..\..;</IncludeDirectories>

<!-- Additional Library folders (semicolon delimited) -->
<LibraryDirectories></LibraryDirectories>

<!-- Libraries to Link with -->
<Libraries></Libraries>

<!-- Batch script to run before Build-->
<PreBuild></PreBuild>

<!-- Batch script to run after Build-->
<PostBuild></PostBuild>

<!-- Batch script to run before Link step-->
<PreLink></PreLink>

<!-- Batch script to run after Link-->
<PostLink></PostLink>

<!-- Batch script to run before Lib step-->
<PreLib></PreLib>

<!-- Batch script to run after Lib-->
<PostLib></PostLib>

<!-- Targets to run before Build (semcolon delimited)-->
<PreBuildTargets></PreBuildTargets>

<!-- Targets to run before Build (semcolon delimited)-->
<PostBuildTargets></PostBuildTargets>

<!-- for Dynamic libs, you can specify the Module .DEF file path -->
<ModuleDefinitionFile></ModuleDefinitionFile>
</PropertyGroup>

<Import Condition="Exists('$(CoAppEtcDirectory)\common-header.vcxproj')" Project="$(CoAppEtcDirectory)\common-header.vcxproj" />
<Import Condition="'$(UseASM)' == 'ASM'" Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />

<PropertyGroup>
<OutDir>$(ProjectRootDir)Output/$(PlatformToolset)/$(Platform)/$(Configuration)/$(UsesConfigurationType)/$(CallingConvention)/$(CharacterSet)/$(AppContainer)/$(UseASM)/</OutDir>
<IntDir>$(ProjectRootDir)Intermediate/$(TargetName)/$(PlatformToolset)/$(Platform)/$(Configuration)/$(UsesConfigurationType)/$(CallingConvention)/$(CharacterSet)/$(AppContainer)/$(UseASM)/</IntDir>
</PropertyGroup>

<ItemDefinitionGroup>
<ClCompile>
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<BaseAddress>0x5A4C0000</BaseAddress>
</Link>
</ItemDefinitionGroup>

<ItemGroup Condition="'$(UseASM)' == 'ASM'">
<MASM Include="..\masmx64\gvmat64.asm" Condition="$(IS_X64)">
<AssembledCodeListingFile>$(IntDir)gvmat64.lst</AssembledCodeListingFile>
<MASMBeforeTargets>Build</MASMBeforeTargets>
<ObjectFileName>$(IntDir)gvmat64.obj</ObjectFileName>
</MASM>
<MASM Include="..\masmx64\inffasx64.asm" Condition="$(IS_X64)">
<AssembledCodeListingFile>$(IntDir)inffasx64.lst</AssembledCodeListingFile>
<MASMBeforeTargets>Build</MASMBeforeTargets>
<ObjectFileName>$(IntDir)inffasx64.obj</ObjectFileName>
</MASM>
<MASM Include="..\masmx86\inffas32.asm" Condition="$(IS_X86) AND $(IS_STDCALL)">
<AssembledCodeListingFile>$(IntDir)inffas32.lst</AssembledCodeListingFile>
<MASMBeforeTargets>Build</MASMBeforeTargets>
<UseSafeExceptionHandlers>true</UseSafeExceptionHandlers>
<AdditionalOptions>/coff %(AdditionalOptions)</AdditionalOptions>
<ObjectFileName>$(IntDir)inffas32.obj</ObjectFileName>
</MASM>
<MASM Include="..\masmx86\match686.asm" Condition="$(IS_X86) AND $(IS_STDCALL)">
<AssembledCodeListingFile>$(IntDir)match686.lst</AssembledCodeListingFile>
<MASMBeforeTargets>Build</MASMBeforeTargets>
<UseSafeExceptionHandlers>true</UseSafeExceptionHandlers>
<AdditionalOptions>/coff %(AdditionalOptions)</AdditionalOptions>
<ObjectFileName>$(IntDir)match686.obj</ObjectFileName>
</MASM>
</ItemGroup>

<ItemGroup Label="C Source Files">
<!-- Include the source files to compile here -->
<!-- <ClCompile Include="..\src\foo.c" /> -->
<ClCompile Include="..\..\adler32.c" />
<ClCompile Include="..\..\compress.c" />
<ClCompile Include="..\..\crc32.c" />
<ClCompile Include="..\..\deflate.c" />
<ClCompile Include="..\..\gzclose.c" />
<ClCompile Include="..\..\gzlib.c" />
<ClCompile Include="..\..\gzread.c" />
<ClCompile Include="..\..\gzwrite.c" />
<ClCompile Include="..\..\infback.c" />
<ClCompile Include="..\masmx64\inffas8664.c" Condition="$(IS_X64)" />
<ClCompile Include="..\..\inffast.c" />
<ClCompile Include="..\..\inflate.c" />
<ClCompile Include="..\..\inftrees.c" />
<ClCompile Include="..\..\trees.c" />
<ClCompile Include="..\..\uncompr.c" />
<ClCompile Include="..\minizip\ioapi.c" />
<ClCompile Include="..\minizip\iowin32.c" />
<ClCompile Include="..\minizip\unzip.c">
<PreprocessorDefinitions Condition="$(IS_RELEASE)">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\minizip\zip.c">
<PreprocessorDefinitions Condition="$(IS_RELEASE)">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\zutil.c" />
</ItemGroup>

<ItemGroup Label="Resource Files">
<!-- Include the source files to compile here -->
<!-- <ResourceCompile Include="..\src\foo.rc" /> -->
<ResourceCompile Include="..\..\win32\zlib1.rc" />
</ItemGroup>

<Import Condition="'$(UseASM)' == 'ASM'" Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
<Import Condition="Exists('$(CoAppEtcDirectory)\common-footer.vcxproj')" Project="$(CoAppEtcDirectory)\common-footer.vcxproj" />
</Project>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="PreBuildCmds;PreBuildTargets;Build;PostBuildCmds;PostBuildTargets" ToolsVersion="4.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>
</ItemGroup>
<PropertyGroup Label="CoApp" >
<CoAppEtcDirectory>$(registry:HKEY_LOCAL_MACHINE\Software\Outercurve\CoApp.Powershell\etc)</CoAppEtcDirectory>

<!-- Set to true to make visual studio use PTK when building.-->
<UsePTKFromVisualStudio>false</UsePTKFromVisualStudio>
</PropertyGroup>

<PropertyGroup Label="Configuration" >
<!-- This lets Visual Studio see this as a VC11 project by default -->
<PlatformToolset Condition="'$(PlatformToolset)' == ''">v110</PlatformToolset>
</PropertyGroup>

<Import Condition="Exists('$(CoAppEtcDirectory)\common-variables.vcxproj')" Project="$(CoAppEtcDirectory)\common-variables.vcxproj" />

<PropertyGroup Label="CustomSettings" />

<PropertyGroup Label="Globals">
<ProjectGuid>{63BED288-E8C3-4345-B84D-2E64598DCF3A}</ProjectGuid>
<RootNamespace>$(MSBuildProjectName)</RootNamespace>

<OutNameSuffix Condition="$(IS_CDECL) AND $(IS_DYNAMIC)">1</OutNameSuffix>

<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>

<!-- set to Application or DynamicLibrary (DynamicLibrary can get altered to StaticLibrary by PTK -->
<ConfigurationType>DynamicLibrary</ConfigurationType>

<!-- Common Compiler Defines (semicolon delimited) -->
<Defines>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;</Defines>
<Defines Condition="$(IS_STDCALL)">$(Defines);ZLIB_WINAPI;</Defines>
<Defines Condition="$(IS_DYNAMIC)">$(Defines);ZLIB_DLL;</Defines>
<Defines Condition="'$(AppContainer)' == 'App'">$(Defines);IOWIN32_USING_WINRT_API=1;</Defines>
<Defines Condition="'$(AppContainer)' != 'App'">$(Defines);IOWIN32_USING_WINRT_API=0;</Defines>
<Defines Condition="'$(UseASM)' == 'ASM'">$(Defines);ASMV;ASMINF;</Defines>
<Defines Condition="$(IS_X64)">$(Defines);WIN64;</Defines>

<!-- Additional Include folders (semicolon delimited) -->
<IncludeDirectories>..\..;</IncludeDirectories>

<!-- Additional Library folders (semicolon delimited) -->
<LibraryDirectories></LibraryDirectories>

<!-- Libraries to Link with -->
<Libraries></Libraries>

<!-- Batch script to run before Build-->
<PreBuild></PreBuild>

<!-- Batch script to run after Build-->
<PostBuild></PostBuild>

<!-- Batch script to run before Link step-->
<PreLink></PreLink>

<!-- Batch script to run after Link-->
<PostLink></PostLink>

<!-- Batch script to run before Lib step-->
<PreLib></PreLib>

<!-- Batch script to run after Lib-->
<PostLib></PostLib>

<!-- Targets to run before Build (semcolon delimited)-->
<PreBuildTargets></PreBuildTargets>

<!-- Targets to run before Build (semcolon delimited)-->
<PostBuildTargets></PostBuildTargets>

<!-- for Dynamic libs, you can specify the Module .DEF file path -->
<ModuleDefinitionFile></ModuleDefinitionFile>
</PropertyGroup>

<Import Condition="Exists('$(CoAppEtcDirectory)\common-header.vcxproj')" Project="$(CoAppEtcDirectory)\common-header.vcxproj" />
<Import Condition="'$(UseASM)' == 'ASM'" Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />

<PropertyGroup>
<OutDir>$(ProjectRootDir)Output/$(PlatformToolset)/$(Platform)/$(Configuration)/$(UsesConfigurationType)/$(CallingConvention)/$(CharacterSet)/$(AppContainer)/$(UseASM)/</OutDir>
<IntDir>$(ProjectRootDir)Intermediate/$(TargetName)/$(PlatformToolset)/$(Platform)/$(Configuration)/$(UsesConfigurationType)/$(CallingConvention)/$(CharacterSet)/$(AppContainer)/$(UseASM)/</IntDir>
</PropertyGroup>

<ItemDefinitionGroup>
<ClCompile>
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<BaseAddress>0x5A4C0000</BaseAddress>
</Link>
</ItemDefinitionGroup>

<ItemGroup Condition="'$(UseASM)' == 'ASM'">
<MASM Include="..\masmx64\gvmat64.asm" Condition="$(IS_X64)">
<AssembledCodeListingFile>$(IntDir)gvmat64.lst</AssembledCodeListingFile>
<MASMBeforeTargets>Build</MASMBeforeTargets>
<ObjectFileName>$(IntDir)gvmat64.obj</ObjectFileName>
</MASM>
<MASM Include="..\masmx64\inffasx64.asm" Condition="$(IS_X64)">
<AssembledCodeListingFile>$(IntDir)inffasx64.lst</AssembledCodeListingFile>
<MASMBeforeTargets>Build</MASMBeforeTargets>
<ObjectFileName>$(IntDir)inffasx64.obj</ObjectFileName>
</MASM>
<MASM Include="..\masmx86\inffas32.asm" Condition="$(IS_X86) AND $(IS_STDCALL)">
<AssembledCodeListingFile>$(IntDir)inffas32.lst</AssembledCodeListingFile>
<MASMBeforeTargets>Build</MASMBeforeTargets>
<UseSafeExceptionHandlers>true</UseSafeExceptionHandlers>
<AdditionalOptions>/coff %(AdditionalOptions)</AdditionalOptions>
<ObjectFileName>$(IntDir)inffas32.obj</ObjectFileName>
</MASM>
<MASM Include="..\masmx86\match686.asm" Condition="$(IS_X86) AND $(IS_STDCALL)">
<AssembledCodeListingFile>$(IntDir)match686.lst</AssembledCodeListingFile>
<MASMBeforeTargets>Build</MASMBeforeTargets>
<UseSafeExceptionHandlers>true</UseSafeExceptionHandlers>
<AdditionalOptions>/coff %(AdditionalOptions)</AdditionalOptions>
<ObjectFileName>$(IntDir)match686.obj</ObjectFileName>
</MASM>
</ItemGroup>

<ItemGroup Label="C Source Files">
<!-- Include the source files to compile here -->
<!-- <ClCompile Include="..\src\foo.c" /> -->
<ClCompile Include="..\..\adler32.c" />
<ClCompile Include="..\..\compress.c" />
<ClCompile Include="..\..\crc32.c" />
<ClCompile Include="..\..\deflate.c" />
<ClCompile Include="..\..\gzclose.c" />
<ClCompile Include="..\..\gzlib.c" />
<ClCompile Include="..\..\gzread.c" />
<ClCompile Include="..\..\gzwrite.c" />
<ClCompile Include="..\..\infback.c" />
<ClCompile Include="..\masmx64\inffas8664.c" Condition="$(IS_X64)" />
<ClCompile Include="..\..\inffast.c" />
<ClCompile Include="..\..\inflate.c" />
<ClCompile Include="..\..\inftrees.c" />
<ClCompile Include="..\..\trees.c" />
<ClCompile Include="..\..\uncompr.c" />
<ClCompile Include="..\minizip\ioapi.c" />
<ClCompile Include="..\minizip\iowin32.c" />
<ClCompile Include="..\minizip\unzip.c">
<PreprocessorDefinitions Condition="$(IS_RELEASE)">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\minizip\zip.c">
<PreprocessorDefinitions Condition="$(IS_RELEASE)">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\zutil.c" />
</ItemGroup>

<ItemGroup Label="Resource Files">
<!-- Include the source files to compile here -->
<!-- <ResourceCompile Include="..\src\foo.rc" /> -->
<ResourceCompile Include="..\..\win32\zlib1.rc" />
</ItemGroup>

<Import Condition="'$(UseASM)' == 'ASM'" Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
<Import Condition="Exists('$(CoAppEtcDirectory)\common-footer.vcxproj')" Project="$(CoAppEtcDirectory)\common-footer.vcxproj" />
</Project>