4 Commits

Author SHA1 Message Date
macintoshplus
454186e884 apply patch for VS 17 AARCH64 2024-11-17 18:09:34 +01:00
Jean-Baptiste Nahan
38e3683b04 Capitalize ARM64 2024-11-17 15:16:32 +01:00
Jean-Baptiste Nahan
5a0f3c3e41 Capitalize arm64 2024-11-17 15:14:26 +01:00
Jean-Baptiste Nahan
d1ff2e6e0c Change Win32 to ARM64;_M_ARM64; 2024-11-17 14:55:10 +01:00
4 changed files with 37 additions and 37 deletions

View File

@@ -15,20 +15,20 @@
<ProjectGuid>{115502C0-BE05-4767-BF19-5C87D805FAD6}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>FfistaticLib</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<ProjectName>Ffi_staticLib_arm64</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>

View File

@@ -15,43 +15,43 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\include\ffi.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\ffi_cfi.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\ffi_common.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\fficonfig.h">
<ClInclude Include=".\aarch64_include\ffi.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\ffitarget.h">
<ClInclude Include=".\aarch64_include\fficonfig.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\internal.h">
<ClInclude Include="..\..\src\aarch64\ffitarget.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\aarch64\internal.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\closures.c">
<ClCompile Include="..\..\src\closures.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\dlmalloc.c">
<ClCompile Include="..\..\src\dlmalloc.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\ffi.c">
<ClCompile Include="..\..\src\aarch64\ffi.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\prep_cif.c">
<ClCompile Include="..\..\src\prep_cif.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\types.c">
<ClCompile Include="..\..\src\types.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="src\win64_armasm.S" />
<CustomBuild Include="..\..\src\aarch64\win64_armasm.S" />
</ItemGroup>
</Project>

View File

@@ -7,14 +7,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libffi", "libffi\libffi.vcx
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|arm64 = Debug|arm64
Release|arm64 = Release|arm64
Debug|ARM64 = Debug|ARM64
Release|ARM64 = Release|ARM64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{793F0ABE-66E5-48C0-9690-3060FF08AFF5}.Debug|arm64.ActiveCfg = Debug|arm64
{793F0ABE-66E5-48C0-9690-3060FF08AFF5}.Debug|arm64.Build.0 = Debug|arm64
{793F0ABE-66E5-48C0-9690-3060FF08AFF5}.Release|arm64.ActiveCfg = Release|arm64
{793F0ABE-66E5-48C0-9690-3060FF08AFF5}.Release|arm64.Build.0 = Release|arm64
{793F0ABE-66E5-48C0-9690-3060FF08AFF5}.Debug|ARM64.ActiveCfg = Debug|ARM64
{793F0ABE-66E5-48C0-9690-3060FF08AFF5}.Debug|ARM64.Build.0 = Debug|ARM64
{793F0ABE-66E5-48C0-9690-3060FF08AFF5}.Release|ARM64.ActiveCfg = Release|ARM64
{793F0ABE-66E5-48C0-9690-3060FF08AFF5}.Release|ARM64.Build.0 = Release|ARM64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@@ -1,13 +1,13 @@
<?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|arm64">
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>arm64</Platform>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|arm64">
<ProjectConfiguration Include="Release|ARM64">
<Configuration>Release</Configuration>
<Platform>arm64</Platform>
<Platform>ARM64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
@@ -17,13 +17,13 @@
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'" Label="Configuration">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'" Label="Configuration">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
@@ -33,21 +33,21 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'" Label="PropertySheets">
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'" Label="PropertySheets">
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);FFI_BUILDING</PreprocessorDefinitions>
<PreprocessorDefinitions>ARM64;_M_ARM64;_DEBUG;_LIB;%(PreprocessorDefinitions);FFI_BUILDING</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)..\..\include;$(SolutionDir)..\..\src\aarch64;$(SolutionDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
@@ -55,7 +55,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
@@ -63,7 +63,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);FFI_BUILDING</PreprocessorDefinitions>
<PreprocessorDefinitions>ARM64;_M_ARM64;NDEBUG;_LIB;%(PreprocessorDefinitions);FFI_BUILDING</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)..\..\include;$(SolutionDir)..\..\src\aarch64;$(SolutionDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
@@ -76,17 +76,17 @@
<ItemGroup>
<CustomBuild Include="..\..\..\src\aarch64\win64_armasm.S">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
cl.exe /EP /I . /I $(SolutionDir)..\.. /I $(SolutionDir)..\..\include /I $(SolutionDir)..\..\src\aarch64 $(SolutionDir)..\..\src\aarch64\win64_armasm.S &gt; $(Configuration)/win64_plain.asm
ml64.exe /c /Cx /Fo $(Configuration)/win64.obj $(Configuration)/win64_plain.asm
</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">cl.exe /EP /I . /I $(SolutionDir)..\.. /I $(SolutionDir)..\..\include /I $(SolutionDir)..\..\src\aarch64 $(SolutionDir)..\..\src\aarch64\win64_armasm.S &gt; $(Configuration)/win64_plain.asm
<Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">cl.exe /EP /I . /I $(SolutionDir)..\.. /I $(SolutionDir)..\..\include /I $(SolutionDir)..\..\src\aarch64 $(SolutionDir)..\..\src\aarch64\win64_armasm.S &gt; $(Configuration)/win64_plain.asm
ml64.exe /c /Cx /Fo $(Configuration)/win64.obj $(Configuration)/win64_plain.asm
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">$(Configuration)/win64.obj</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">$(Configuration)/win64.obj</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(Configuration)/win64.obj</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(Configuration)/win64.obj</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>