From 43996ceac27bc1a0a20252a2bdef61ae023dac6c Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Fri, 25 Nov 2022 16:58:37 +0100 Subject: [PATCH] Added ARM64 configurations. --- hashset.sln | 15 ++++ hashset/Makefile | 2 +- hashset/hashset.vcxproj | 137 ++++++++++++++++++++++++++++++++++ libhashset/libhashset.vcxproj | 134 +++++++++++++++++++++++++++++++++ make.cmd | 2 +- 5 files changed, 288 insertions(+), 2 deletions(-) diff --git a/hashset.sln b/hashset.sln index f72c424..88f825a 100644 --- a/hashset.sln +++ b/hashset.sln @@ -9,34 +9,49 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libhashset", "libhashset\li EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Shared|ARM64 = Shared|ARM64 Shared|x64 = Shared|x64 Shared|x86 = Shared|x86 + Static|ARM64 = Static|ARM64 Static|x64 = Static|x64 Static|x86 = Static|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0B7ABB95-B60F-418B-8386-930B1629058F}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {0B7ABB95-B60F-418B-8386-930B1629058F}.Debug|ARM64.Build.0 = Debug|ARM64 {0B7ABB95-B60F-418B-8386-930B1629058F}.Debug|x64.ActiveCfg = Debug|x64 {0B7ABB95-B60F-418B-8386-930B1629058F}.Debug|x64.Build.0 = Debug|x64 {0B7ABB95-B60F-418B-8386-930B1629058F}.Debug|x86.ActiveCfg = Debug|Win32 {0B7ABB95-B60F-418B-8386-930B1629058F}.Debug|x86.Build.0 = Debug|Win32 + {0B7ABB95-B60F-418B-8386-930B1629058F}.Shared|ARM64.ActiveCfg = Shared|ARM64 + {0B7ABB95-B60F-418B-8386-930B1629058F}.Shared|ARM64.Build.0 = Shared|ARM64 {0B7ABB95-B60F-418B-8386-930B1629058F}.Shared|x64.ActiveCfg = Shared|x64 {0B7ABB95-B60F-418B-8386-930B1629058F}.Shared|x64.Build.0 = Shared|x64 {0B7ABB95-B60F-418B-8386-930B1629058F}.Shared|x86.ActiveCfg = Shared|Win32 {0B7ABB95-B60F-418B-8386-930B1629058F}.Shared|x86.Build.0 = Shared|Win32 + {0B7ABB95-B60F-418B-8386-930B1629058F}.Static|ARM64.ActiveCfg = Static|ARM64 + {0B7ABB95-B60F-418B-8386-930B1629058F}.Static|ARM64.Build.0 = Static|ARM64 {0B7ABB95-B60F-418B-8386-930B1629058F}.Static|x64.ActiveCfg = Static|x64 {0B7ABB95-B60F-418B-8386-930B1629058F}.Static|x64.Build.0 = Static|x64 {0B7ABB95-B60F-418B-8386-930B1629058F}.Static|x86.ActiveCfg = Static|Win32 {0B7ABB95-B60F-418B-8386-930B1629058F}.Static|x86.Build.0 = Static|Win32 + {8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Debug|ARM64.Build.0 = Debug|ARM64 {8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Debug|x64.ActiveCfg = Debug|x64 {8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Debug|x64.Build.0 = Debug|x64 {8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Debug|x86.ActiveCfg = Debug|Win32 {8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Debug|x86.Build.0 = Debug|Win32 + {8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Shared|ARM64.ActiveCfg = Shared|ARM64 + {8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Shared|ARM64.Build.0 = Shared|ARM64 {8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Shared|x64.ActiveCfg = Shared|x64 {8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Shared|x64.Build.0 = Shared|x64 {8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Shared|x86.ActiveCfg = Shared|Win32 {8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Shared|x86.Build.0 = Shared|Win32 + {8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Static|ARM64.ActiveCfg = Static|ARM64 + {8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Static|ARM64.Build.0 = Static|ARM64 {8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Static|x64.ActiveCfg = Static|x64 {8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Static|x64.Build.0 = Static|x64 {8CF3BD19-28B1-435D-B719-E00B052DFC3A}.Static|x86.ActiveCfg = Static|Win32 diff --git a/hashset/Makefile b/hashset/Makefile index 1da7b70..b80712e 100644 --- a/hashset/Makefile +++ b/hashset/Makefile @@ -23,7 +23,7 @@ CFLAGS = -std=c99 -D_DEFAULT_SOURCE -Wpedantic -I../libhashset/include $(XCFLAGS SRC_PATH := src BIN_PATH := bin -BIN_FILE := $(BIN_PATH)/hashset$(EXE_SUFFIX) +BIN_FILE := $(BIN_PATH)/hashset-test$(EXE_SUFFIX) SRC_FILE := $(SRC_PATH)/main.c LIB_FILE := ../libhashset/lib/libhashset-1.a diff --git a/hashset/hashset.vcxproj b/hashset/hashset.vcxproj index 112b214..21ae887 100644 --- a/hashset/hashset.vcxproj +++ b/hashset/hashset.vcxproj @@ -1,10 +1,18 @@ + + Debug + ARM64 + Debug Win32 + + Shared + ARM64 + Shared Win32 @@ -13,6 +21,10 @@ Shared x64 + + Static + ARM64 + Static Win32 @@ -69,6 +81,12 @@ v142 Unicode + + Application + true + v142 + Unicode + Application false @@ -76,6 +94,13 @@ true Unicode + + Application + false + v142 + true + Unicode + Application false @@ -83,6 +108,13 @@ true Unicode + + Application + false + v142 + true + Unicode + @@ -100,12 +132,21 @@ + + + + + + + + + true @@ -131,18 +172,36 @@ $(ProjectDir)\obj\$(PlatformToolset)\$(Platform)\$(Configuration)\ hashset-test + + true + $(SolutionDir)\bin\$(PlatformToolset)\$(Platform)\$(Configuration)\ + $(ProjectDir)\obj\$(PlatformToolset)\$(Platform)\$(Configuration)\ + hashset-test + false $(SolutionDir)\bin\$(PlatformToolset)\$(Platform)\$(Configuration)\ $(ProjectDir)\obj\$(PlatformToolset)\$(Platform)\$(Configuration)\ hashset-test + + false + $(SolutionDir)\bin\$(PlatformToolset)\$(Platform)\$(Configuration)\ + $(ProjectDir)\obj\$(PlatformToolset)\$(Platform)\$(Configuration)\ + hashset-test + false $(SolutionDir)\bin\$(PlatformToolset)\$(Platform)\$(Configuration)\ $(ProjectDir)\obj\$(PlatformToolset)\$(Platform)\$(Configuration)\ hashset-test + + false + $(SolutionDir)\bin\$(PlatformToolset)\$(Platform)\$(Configuration)\ + $(ProjectDir)\obj\$(PlatformToolset)\$(Platform)\$(Configuration)\ + hashset-test + Level3 @@ -244,6 +303,20 @@ + + + Level3 + false + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(SolutionDir)\libhashset\include + + + Console + true + + + Level4 @@ -274,6 +347,35 @@ + + + Level4 + true + true + false + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + AnySuitable + true + MultiThreaded + false + false + MaxSpeed + Speed + true + $(SolutionDir)\libhashset\include + + + Console + true + true + false + UseLinkTimeCodeGeneration + advapi32.dll + delayimp.lib;%(AdditionalDependencies) + + + Level4 @@ -310,6 +412,41 @@ cp "$(SolutionDir)lib\$(PlatformToolset)\$(Platform)\$(Configuration)\libhashset-1.dll" -> "$(TargetDir)libhashset-1.dll" + + + Level4 + true + true + false + NDEBUG;_CONSOLE;HASHSET_DLL;%(PreprocessorDefinitions) + true + AnySuitable + true + MultiThreadedDLL + false + false + MaxSpeed + Speed + true + $(SolutionDir)\libhashset\include + + + Console + true + true + false + UseLinkTimeCodeGeneration + advapi32.dll + delayimp.lib;%(AdditionalDependencies) + + + + copy /B /Y /N "$(SolutionDir)lib\$(PlatformToolset)\$(Platform)\$(Configuration)\libhashset-1.dll" "$(TargetDir)libhashset-1.dll" + + + cp "$(SolutionDir)lib\$(PlatformToolset)\$(Platform)\$(Configuration)\libhashset-1.dll" -> "$(TargetDir)libhashset-1.dll" + + diff --git a/libhashset/libhashset.vcxproj b/libhashset/libhashset.vcxproj index 5ce52fa..61aa097 100644 --- a/libhashset/libhashset.vcxproj +++ b/libhashset/libhashset.vcxproj @@ -1,10 +1,18 @@ + + Debug + ARM64 + Debug Win32 + + Shared + ARM64 + Shared Win32 @@ -13,6 +21,10 @@ Shared x64 + + Static + ARM64 + Static Win32 @@ -66,6 +78,12 @@ v142 Unicode + + StaticLibrary + true + v142 + Unicode + StaticLibrary false @@ -73,6 +91,13 @@ true Unicode + + StaticLibrary + false + v142 + true + Unicode + DynamicLibrary false @@ -80,6 +105,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + @@ -97,12 +129,21 @@ + + + + + + + + + true @@ -128,18 +169,36 @@ $(ProjectDir)\obj\$(PlatformToolset)\$(Platform)\$(Configuration)\ libhashset-1 + + true + $(SolutionDir)\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\ + $(ProjectDir)\obj\$(PlatformToolset)\$(Platform)\$(Configuration)\ + libhashset-1 + false $(SolutionDir)\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\ $(ProjectDir)\obj\$(PlatformToolset)\$(Platform)\$(Configuration)\ libhashset-1 + + false + $(SolutionDir)\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\ + $(ProjectDir)\obj\$(PlatformToolset)\$(Platform)\$(Configuration)\ + libhashset-1 + false $(SolutionDir)\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\ $(ProjectDir)\obj\$(PlatformToolset)\$(Platform)\$(Configuration)\ libhashset-1 + + false + $(SolutionDir)\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\ + $(ProjectDir)\obj\$(PlatformToolset)\$(Platform)\$(Configuration)\ + libhashset-1 + Level3 @@ -233,6 +292,21 @@ true + + + Level3 + false + _DEBUG;_LIB;%(PreprocessorDefinitions) + true + NotUsing + $(ProjectDir)\include + + + + + true + + Level3 @@ -263,6 +337,36 @@ true + + + Level3 + true + true + false + NDEBUG;_LIB;%(PreprocessorDefinitions) + true + NotUsing + MaxSpeed + AnySuitable + Speed + true + true + MultiThreaded + false + false + $(ProjectDir)\include + + + + + true + true + true + + + true + + Level3 @@ -294,6 +398,36 @@ true + + + Level3 + true + true + false + NDEBUG;_DLL;HASHSET_DLL;_HASHSET_EXPORTS;%(PreprocessorDefinitions) + true + NotUsing + MaxSpeed + AnySuitable + Speed + true + true + MultiThreadedDLL + false + false + $(ProjectDir)\include + + + Console + true + true + false + UseLinkTimeCodeGeneration + + + true + + diff --git a/make.cmd b/make.cmd index 8e713b3..4ad6e36 100644 --- a/make.cmd +++ b/make.cmd @@ -12,7 +12,7 @@ if not exist "%MSVC_PATH%\Auxiliary\Build\vcvarsall.bat" ( goto:eof ) -for %%p in (x86,x64) do ( +for %%p in (x86,x64,ARM64) do ( call "%MSVC_PATH%\Auxiliary\Build\vcvarsall.bat" %%p for %%c in (Static,Shared,Debug) do ( echo.