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

include arm64 config in WinEmbed solution #5

Merged
merged 1 commit into from
Sep 16, 2022
Merged

include arm64 config in WinEmbed solution #5

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/WinEmbed/WinEmbed.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinEmbed", "WinEmbed\WinEmb
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{13A3DB89-BAD4-A631-553D-82AF6A110DE4}.Debug|x64.ActiveCfg = Release|x64
{13A3DB89-BAD4-A631-553D-82AF6A110DE4}.Debug|x64.Build.0 = Release|x64
{13A3DB89-BAD4-A631-553D-82AF6A110DE4}.Debug|x86.ActiveCfg = Release|Win32
{13A3DB89-BAD4-A631-553D-82AF6A110DE4}.Debug|x86.Build.0 = Release|Win32
{13A3DB89-BAD4-A631-553D-82AF6A110DE4}.Release|ARM64.ActiveCfg = Release|ARM64
{13A3DB89-BAD4-A631-553D-82AF6A110DE4}.Release|ARM64.Build.0 = Release|ARM64
{13A3DB89-BAD4-A631-553D-82AF6A110DE4}.Release|x64.ActiveCfg = Release|x64
{13A3DB89-BAD4-A631-553D-82AF6A110DE4}.Release|x64.Build.0 = Release|x64
{13A3DB89-BAD4-A631-553D-82AF6A110DE4}.Release|x86.ActiveCfg = Release|Win32
Expand All @@ -26,6 +23,7 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {70E8939B-BBD6-4EE9-8C21-A060CC5D783D}
SolutionGuid = {5DBA3B6F-8CAF-48A2-8A17-742E87FADF25}
SolutionGuid = {70E8939B-BBD6-4EE9-8C21-A060CC5D783D}
EndGlobalSection
EndGlobal
22 changes: 19 additions & 3 deletions src/WinEmbed/WinEmbed/WinEmbed.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Release|ARM64">
<Configuration>Release</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
Expand Down Expand Up @@ -42,15 +46,24 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)\.output\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\.output\tmp\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>$(ProjectName).x64</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<OutDir>$(SolutionDir)\.output\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\.output\tmp\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>$(ProjectName).arm64</TargetName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<WarningLevel>Level4</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization>MaxSpeed</Optimization>
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdcpp20</LanguageStandard>
<LanguageStandard_C Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdc17</LanguageStandard_C>
<StringPooling Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</StringPooling>
<ExceptionHandling Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</ExceptionHandling>
<BufferSecurityCheck Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</BufferSecurityCheck>
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">stdcpplatest</LanguageStandard>
<ConformanceMode Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -59,13 +72,16 @@
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
<EntryPointSymbol>DllMain</EntryPointSymbol>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>kernel32.lib;advapi32.lib;user32.lib;comctl32.lib;ntdllp.lib</AdditionalDependencies>
<AdditionalOptions>/EMITPOGOPHASEINFO %(AdditionalOptions)</AdditionalOptions>
<ModuleDefinitionFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">exports.def</ModuleDefinitionFile>
<ModuleDefinitionFile Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">exports.def</ModuleDefinitionFile>
<ForceSymbolReferences Condition="'$(Configuration)|$(Platform)'=='Release|x64'">__imp_InitCommonControls</ForceSymbolReferences>
<ForceSymbolReferences Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">__imp_InitCommonControls</ForceSymbolReferences>
<ForceSymbolReferences Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">__imp__InitCommonControls@0</ForceSymbolReferences>
<ShowProgress Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotSet</ShowProgress>
<ModuleDefinitionFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">exports.def</ModuleDefinitionFile>
<IgnoreAllDefaultLibraries Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</IgnoreAllDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/WinEmbed/WinEmbed/internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ struct FOCUS_INFO;
EXTERN_C {
extern IMAGE_DOS_HEADER __ImageBase;

#ifndef DbgPrint

DECLSPEC_IMPORT
ULONG
__cdecl
DbgPrint (
_In_z_ _Printf_format_string_ PCSTR Format,
...
);

#endif // !DbgPrint
};

class ShellWnd
Expand Down
3 changes: 2 additions & 1 deletion src/WinEmbed/WinEmbed/stdafx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
#include <windows.h>
#include <windows.h>
#define DbgPrint /##/