Skip to content
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

Jump to bottom

Additional Fixes for ARM64 #311

Merged
merged 6 commits into from
Sep 13, 2023
Merged

Additional Fixes for ARM64 #311

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cfb831c
Additional Fixes for ARM64
bpulliam Sep 13, 2023
8105f60
missed one
bpulliam Sep 13, 2023
10d7ddb
more casing
bpulliam Sep 13, 2023
4609d55
more casing
bpulliam Sep 13, 2023
e60a51e
last?
bpulliam Sep 13, 2023
a55306b
copy paste error
bpulliam Sep 13, 2023
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
Next Next commit
Additional Fixes for ARM64
  • Loading branch information
@bpulliam
bpulliam committed Sep 13, 2023
commit cfb831c03ae3ee12651fd8a17b72f7769996ce8b
6 changes: 6 additions & 0 deletions Samples/AppLifecycle/Activation/cs-wpf-unpackaged/CsWpfActivation.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,27 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Debug|Any CPU.ActiveCfg = Debug|x64
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Debug|Any CPU.Build.0 = Debug|x64
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Debug|ARM64.ActiveCfg = Debug|ARM64
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Debug|ARM64.Build.0 = Debug|ARM64
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Debug|x64.ActiveCfg = Debug|x64
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Debug|x64.Build.0 = Debug|x64
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Debug|x86.ActiveCfg = Debug|x86
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Debug|x86.Build.0 = Debug|x86
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Release|Any CPU.ActiveCfg = Release|Any CPU
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Release|Any CPU.Build.0 = Release|Any CPU
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Release|ARM64.ActiveCfg = Release|ARM64
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Release|ARM64.Build.0 = Release|ARM64
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Release|x64.ActiveCfg = Release|x64
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Release|x64.Build.0 = Release|x64
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Release|x86.ActiveCfg = Release|x86
Expand Down
16 changes: 8 additions & 8 deletions ...ppLifecycle/EnvironmentVariables/cpp-win32-unpackaged/CppWinMainEnv/CppWinMainEnv.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
Expand All @@ -75,7 +75,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
Expand All @@ -96,13 +96,13 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" 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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" 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" />
Expand All @@ -115,13 +115,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
Expand Down Expand Up @@ -167,7 +167,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
Expand Down Expand Up @@ -197,7 +197,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
Expand Down
6 changes: 6 additions & 0 deletions Samples/AppLifecycle/Instancing/cs-winforms-unpackaged/CsWinFormsInstancing.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,27 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5C920660-0255-4E53-AE59-004A3AD01E87}.Debug|Any CPU.ActiveCfg = Debug|x64
{5C920660-0255-4E53-AE59-004A3AD01E87}.Debug|Any CPU.Build.0 = Debug|x64
{5C920660-0255-4E53-AE59-004A3AD01E87}.Debug|ARM64.ActiveCfg = Debug|ARM64
{5C920660-0255-4E53-AE59-004A3AD01E87}.Debug|ARM64.Build.0 = Debug|ARM64
{5C920660-0255-4E53-AE59-004A3AD01E87}.Debug|x64.ActiveCfg = Debug|x64
{5C920660-0255-4E53-AE59-004A3AD01E87}.Debug|x64.Build.0 = Debug|x64
{5C920660-0255-4E53-AE59-004A3AD01E87}.Debug|x86.ActiveCfg = Debug|x86
{5C920660-0255-4E53-AE59-004A3AD01E87}.Debug|x86.Build.0 = Debug|x86
{5C920660-0255-4E53-AE59-004A3AD01E87}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5C920660-0255-4E53-AE59-004A3AD01E87}.Release|Any CPU.Build.0 = Release|Any CPU
{5C920660-0255-4E53-AE59-004A3AD01E87}.Release|ARM64.ActiveCfg = Release|ARM64
{5C920660-0255-4E53-AE59-004A3AD01E87}.Release|ARM64.Build.0 = Release|ARM64
{5C920660-0255-4E53-AE59-004A3AD01E87}.Release|x64.ActiveCfg = Release|x64
{5C920660-0255-4E53-AE59-004A3AD01E87}.Release|x64.Build.0 = Release|x64
{5C920660-0255-4E53-AE59-004A3AD01E87}.Release|x86.ActiveCfg = Release|x86
Expand Down
6 changes: 6 additions & 0 deletions Samples/AppLifecycle/Instancing/cs-wpf-unpackaged/CsWpfInstancing.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,27 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{88DDB983-A494-4DDC-90AA-222628AA71F4}.Debug|Any CPU.ActiveCfg = Debug|x64
{88DDB983-A494-4DDC-90AA-222628AA71F4}.Debug|Any CPU.Build.0 = Debug|x64
{88DDB983-A494-4DDC-90AA-222628AA71F4}.Debug|ARM64.ActiveCfg = Debug|ARM64
{88DDB983-A494-4DDC-90AA-222628AA71F4}.Debug|ARM64.Build.0 = Debug|ARM64
{88DDB983-A494-4DDC-90AA-222628AA71F4}.Debug|x64.ActiveCfg = Debug|x64
{88DDB983-A494-4DDC-90AA-222628AA71F4}.Debug|x64.Build.0 = Debug|x64
{88DDB983-A494-4DDC-90AA-222628AA71F4}.Debug|x86.ActiveCfg = Debug|x86
{88DDB983-A494-4DDC-90AA-222628AA71F4}.Debug|x86.Build.0 = Debug|x86
{88DDB983-A494-4DDC-90AA-222628AA71F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{88DDB983-A494-4DDC-90AA-222628AA71F4}.Release|Any CPU.Build.0 = Release|Any CPU
{88DDB983-A494-4DDC-90AA-222628AA71F4}.Release|ARM64.ActiveCfg = Release|ARM64
{88DDB983-A494-4DDC-90AA-222628AA71F4}.Release|ARM64.Build.0 = Release|ARM64
{88DDB983-A494-4DDC-90AA-222628AA71F4}.Release|x64.ActiveCfg = Release|x64
{88DDB983-A494-4DDC-90AA-222628AA71F4}.Release|x64.Build.0 = Release|x64
{88DDB983-A494-4DDC-90AA-222628AA71F4}.Release|x86.ActiveCfg = Release|x86
Expand Down
5 changes: 5 additions & 0 deletions Samples/AppLifecycle/StateNotifications/cs-wpf-unpackaged/CsWpfState.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Expand All @@ -17,12 +18,16 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{6D2E5BF1-6D9D-4A99-90D6-E983F595961B}.Debug|Any CPU.ActiveCfg = Debug|x64
{6D2E5BF1-6D9D-4A99-90D6-E983F595961B}.Debug|Any CPU.Build.0 = Debug|x64
{6D2E5BF1-6D9D-4A99-90D6-E983F595961B}.Debug|ARM64.ActiveCfg = Debug|ARM64
{6D2E5BF1-6D9D-4A99-90D6-E983F595961B}.Debug|ARM64.Build.0 = Debug|ARM64
{6D2E5BF1-6D9D-4A99-90D6-E983F595961B}.Debug|x64.ActiveCfg = Debug|x64
{6D2E5BF1-6D9D-4A99-90D6-E983F595961B}.Debug|x64.Build.0 = Debug|x64
{6D2E5BF1-6D9D-4A99-90D6-E983F595961B}.Debug|x86.ActiveCfg = Debug|x86
{6D2E5BF1-6D9D-4A99-90D6-E983F595961B}.Debug|x86.Build.0 = Debug|x86
{6D2E5BF1-6D9D-4A99-90D6-E983F595961B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6D2E5BF1-6D9D-4A99-90D6-E983F595961B}.Release|Any CPU.Build.0 = Release|Any CPU
{6D2E5BF1-6D9D-4A99-90D6-E983F595961B}.Release|ARM64.ActiveCfg = Release|ARM64
{6D2E5BF1-6D9D-4A99-90D6-E983F595961B}.Release|ARM64.Build.0 = Release|ARM64
{6D2E5BF1-6D9D-4A99-90D6-E983F595961B}.Release|x64.ActiveCfg = Release|x64
{6D2E5BF1-6D9D-4A99-90D6-E983F595961B}.Release|x64.Build.0 = Release|x64
{6D2E5BF1-6D9D-4A99-90D6-E983F595961B}.Release|x86.ActiveCfg = Release|x86
Expand Down
69 changes: 69 additions & 0 deletions Samples/TextRendering/cpp-win32/DWriteCoreGallery/DWriteCoreGallery.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM64">
<Configuration>Release</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
Expand Down Expand Up @@ -55,6 +63,17 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
Expand All @@ -72,6 +91,12 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
Expand All @@ -85,6 +110,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Expand Down Expand Up @@ -153,6 +184,44 @@
</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpplatest</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Manifest>
<AdditionalManifestFiles>
</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpplatest</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Manifest>
<AdditionalManifestFiles>
</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="CustomFontCollection.h" />
<ClInclude Include="FontCollectionWindow.h" />
Expand Down