diff --git a/NppJSONViewer/NPPJSONViewer.sln b/NppJSONViewer/NPPJSONViewer.sln index 697034b..74bbaab 100644 --- a/NppJSONViewer/NPPJSONViewer.sln +++ b/NppJSONViewer/NPPJSONViewer.sln @@ -1,26 +1,32 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31205.134 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NPPJSONViewer", "NPPJSONViewer.vcxproj", "{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 + Debug|ARM64 = Debug|ARM64 Debug|Win32 = Debug|Win32 - Release|x64 = Release|x64 + Debug|x64 = Debug|x64 + Release|ARM64 = Release|ARM64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|x64.ActiveCfg = Debug|x64 - {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|x64.Build.0 = Debug|x64 + {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|ARM64.Build.0 = Debug|ARM64 {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|Win32.ActiveCfg = Debug|Win32 {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|Win32.Build.0 = Debug|Win32 - {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|x64.ActiveCfg = Release|x64 - {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|x64.Build.0 = Release|x64 + {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|x64.ActiveCfg = Debug|x64 + {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|x64.Build.0 = Debug|x64 + {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|ARM64.ActiveCfg = Release|ARM64 + {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|ARM64.Build.0 = Release|ARM64 {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|Win32.ActiveCfg = Release|Win32 {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|Win32.Build.0 = Release|Win32 + {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|x64.ActiveCfg = Release|x64 + {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/NppJSONViewer/NPPJSONViewer.vcxproj b/NppJSONViewer/NPPJSONViewer.vcxproj index e522fe7..305e3e1 100644 --- a/NppJSONViewer/NPPJSONViewer.vcxproj +++ b/NppJSONViewer/NPPJSONViewer.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -40,11 +48,21 @@ Unicode v142 + + DynamicLibrary + Unicode + v142 + DynamicLibrary Unicode v142 + + DynamicLibrary + Unicode + v142 + @@ -57,18 +75,30 @@ + + + + + + <_ProjectFileVersion>10.0.30319.1 $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ true + true $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false + false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false @@ -85,9 +115,15 @@ $(SolutionDir)external\rapidjson\include;$(IncludePath) + + $(SolutionDir)external\rapidjson\include;$(IncludePath) + $(SolutionDir)external\rapidjson\include;$(IncludePath) + + $(SolutionDir)external\rapidjson\include;$(IncludePath) + Disabled @@ -110,6 +146,27 @@ MachineX64 + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;NPPJSONVIEWER_EXPORTS;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Level4 + ProgramDatabase + true + true + true + + + shlwapi.lib;comctl32.lib;Version.lib;%(AdditionalDependencies) + true + Windows + $(TargetName).lib + + %(AdditionalIncludeDirectories) @@ -131,6 +188,26 @@ MachineX64 + + + %(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;NPPJSONVIEWER_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + Level4 + ProgramDatabase + true + true + true + + + shlwapi.lib;comctl32.lib;Version.lib;%(AdditionalDependencies) + false + Windows + true + true + $(TargetName).lib + + %(AdditionalIncludeDirectories) diff --git a/appveyor.yml b/appveyor.yml index 7a740df..f449385 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,6 +9,7 @@ environment: platform: - x64 - Win32 + - ARM64 configuration: - Release @@ -17,6 +18,7 @@ configuration: install: - if "%platform%"=="x64" set platform_input=x64 - if "%platform%"=="Win32" set platform_input=Win32 + - if "%platform%"=="ARM64" set platform_input=ARM64 build: parallel: true # enable MSBuild parallel builds @@ -33,3 +35,5 @@ artifacts: name: x64 - path: NppJSONViewer\Win32\Release\NPPJSONViewer.dll name: Win32 + - path: NppJSONViewer\ARM64\Release\NPPJSONViewer.dll + name: ARM64