Skip to content
This repository has been archived by the owner on May 31, 2022. It is now read-only.

Commit

Permalink
- Re-add ARM64 support.
Browse files Browse the repository at this point in the history 
- Update OpenSSL static binaries.
- Modify documents.
- Sync the version number.
- Nagisa 0.3 Final.
  • Loading branch information
@MouriNaruto
MouriNaruto committed Jun 1, 2018
1 parent 0c166e0 commit 6230483
Show file tree
Hide file tree
Showing 14 changed files with 51 additions and 24 deletions.
24 changes: 16 additions & 8 deletions Assassin/Assassin.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
Expand All @@ -17,6 +21,10 @@
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<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 @@ -67,33 +75,33 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<PropertyGroup>
<OutDir>$(SolutionDir)Output\$(Configuration)\$(Platform)\$(MSBuildProjectName)\</OutDir>
<OutDir>$(SolutionDir)Output\$(Configuration)\$(Platform)\$(MSBuildProjectName)\</OutDir>
<IntDir>$(SolutionDir)Output\$(Configuration)\$(Platform)\$(MSBuildProjectName)\Temp\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
<WarningLevel>Level4</WarningLevel>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp17</LanguageStandard>
<ConformanceMode>true</ConformanceMode>
<AdditionalOptions>%(AdditionalOptions) /bigobj</AdditionalOptions>
<DisableSpecificWarnings>28204</DisableSpecificWarnings>
<DisableSpecificWarnings>28204</DisableSpecificWarnings>
<PreprocessorDefinitions>_WINRT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateWindowsMetadata>true</GenerateWindowsMetadata>
<GenerateWindowsMetadata>true</GenerateWindowsMetadata>
<ModuleDefinitionFile>Assassin.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
<ClCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization>MinSpace</Optimization>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
</ClCompile>
</ItemDefinitionGroup>
Expand Down
13 changes: 6 additions & 7 deletions Changelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,26 @@
## Changelog

**Nagisa 0.3 [Build *Current*]**
[Full Changelog](https://github.com/Project-Nagisa/Nagisa/compare/0.2...master)
[Full Changelog](https://github.com/Project-Nagisa/Nagisa/compare/0.3...master)
- Modify documents.
- Sync the version number.
- Start to add the BackgroundWorker.
- Update to Windows 10 SDK Build 17134.
- Update to C++17 standard.
- Refactor the whole project with C++/WinRT.

### Nagisa 0.3 [Build 50]
### Nagisa 0.3 [Build 62]
[Full Changelog](https://github.com/Project-Nagisa/Nagisa/compare/0.2...0.3)
- Add Multi-language Support: Spanish. (Contributed by Jhovany200.)
- Fix a bug that could cause the app to crash.
- Adjust the MainPage UI. (Thanks to suwakowww.)
- Fix a bug that you need to click the "File Name" TextBox before you download
a file. (Thanks to 桥月梦.)
- According to system requirements for Windows 8, 8.1 and 10, re-enable the SSE
and SSE2 optimization in the x86 binaries.
- Remove ARM64 support because the Microsoft don't provide the ARM64 Visual C++
Runtime for UWP.
- Add OpenSSL for implementing SSL support for the future builtin transfer
engine.
- Improve several implementations and add AppVeyor CI support.
- Update to Windows 10 SDK Build 17134.
- Update to C++ 17 standard.
- Refactor the Assassin with C++/WinRT.

### Nagisa 0.2 [Build 22]
[Full Changelog](https://github.com/Project-Nagisa/Nagisa/compare/0.1...0.2)
Expand Down
12 changes: 12 additions & 0 deletions Nagisa.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,21 @@ Global
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{CD858CAD-04D9-4A81-8C75-26CB74323398}.Debug|ARM.ActiveCfg = Debug|ARM
{CD858CAD-04D9-4A81-8C75-26CB74323398}.Debug|ARM.Build.0 = Debug|ARM
{CD858CAD-04D9-4A81-8C75-26CB74323398}.Debug|ARM.Deploy.0 = Debug|ARM
{CD858CAD-04D9-4A81-8C75-26CB74323398}.Debug|ARM64.ActiveCfg = Debug|ARM64
{CD858CAD-04D9-4A81-8C75-26CB74323398}.Debug|ARM64.Build.0 = Debug|ARM64
{CD858CAD-04D9-4A81-8C75-26CB74323398}.Debug|ARM64.Deploy.0 = Debug|ARM64
{CD858CAD-04D9-4A81-8C75-26CB74323398}.Debug|x64.ActiveCfg = Debug|x64
{CD858CAD-04D9-4A81-8C75-26CB74323398}.Debug|x64.Build.0 = Debug|x64
{CD858CAD-04D9-4A81-8C75-26CB74323398}.Debug|x64.Deploy.0 = Debug|x64
Expand All @@ -56,6 +61,9 @@ Global
{CD858CAD-04D9-4A81-8C75-26CB74323398}.Release|ARM.ActiveCfg = Release|ARM
{CD858CAD-04D9-4A81-8C75-26CB74323398}.Release|ARM.Build.0 = Release|ARM
{CD858CAD-04D9-4A81-8C75-26CB74323398}.Release|ARM.Deploy.0 = Release|ARM
{CD858CAD-04D9-4A81-8C75-26CB74323398}.Release|ARM64.ActiveCfg = Release|ARM64
{CD858CAD-04D9-4A81-8C75-26CB74323398}.Release|ARM64.Build.0 = Release|ARM64
{CD858CAD-04D9-4A81-8C75-26CB74323398}.Release|ARM64.Deploy.0 = Release|ARM64
{CD858CAD-04D9-4A81-8C75-26CB74323398}.Release|x64.ActiveCfg = Release|x64
{CD858CAD-04D9-4A81-8C75-26CB74323398}.Release|x64.Build.0 = Release|x64
{CD858CAD-04D9-4A81-8C75-26CB74323398}.Release|x64.Deploy.0 = Release|x64
Expand All @@ -64,12 +72,16 @@ Global
{CD858CAD-04D9-4A81-8C75-26CB74323398}.Release|x86.Deploy.0 = Release|Win32
{7DB6FE7F-0281-49B3-92F9-497EE9CBCF6C}.Debug|ARM.ActiveCfg = Debug|ARM
{7DB6FE7F-0281-49B3-92F9-497EE9CBCF6C}.Debug|ARM.Build.0 = Debug|ARM
{7DB6FE7F-0281-49B3-92F9-497EE9CBCF6C}.Debug|ARM64.ActiveCfg = Debug|ARM64
{7DB6FE7F-0281-49B3-92F9-497EE9CBCF6C}.Debug|ARM64.Build.0 = Debug|ARM64
{7DB6FE7F-0281-49B3-92F9-497EE9CBCF6C}.Debug|x64.ActiveCfg = Debug|x64
{7DB6FE7F-0281-49B3-92F9-497EE9CBCF6C}.Debug|x64.Build.0 = Debug|x64
{7DB6FE7F-0281-49B3-92F9-497EE9CBCF6C}.Debug|x86.ActiveCfg = Debug|Win32
{7DB6FE7F-0281-49B3-92F9-497EE9CBCF6C}.Debug|x86.Build.0 = Debug|Win32
{7DB6FE7F-0281-49B3-92F9-497EE9CBCF6C}.Release|ARM.ActiveCfg = Release|ARM
{7DB6FE7F-0281-49B3-92F9-497EE9CBCF6C}.Release|ARM.Build.0 = Release|ARM
{7DB6FE7F-0281-49B3-92F9-497EE9CBCF6C}.Release|ARM64.ActiveCfg = Release|ARM64
{7DB6FE7F-0281-49B3-92F9-497EE9CBCF6C}.Release|ARM64.Build.0 = Release|ARM64
{7DB6FE7F-0281-49B3-92F9-497EE9CBCF6C}.Release|x64.ActiveCfg = Release|x64
{7DB6FE7F-0281-49B3-92F9-497EE9CBCF6C}.Release|x64.Build.0 = Release|x64
{7DB6FE7F-0281-49B3-92F9-497EE9CBCF6C}.Release|x86.ActiveCfg = Release|Win32
Expand Down
22 changes: 15 additions & 7 deletions Nagisa/Nagisa.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
Expand All @@ -29,6 +33,10 @@
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM64">
<Configuration>Release</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
Expand All @@ -40,15 +48,15 @@
</ItemGroup>
<PropertyGroup Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
<UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
<UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand All @@ -67,25 +75,25 @@
<AppxBundle>Always</AppxBundle>
<AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
<AppxPackageDir>$(SolutionDir)Output\AppPackage</AppxPackageDir>
<OutDir>$(SolutionDir)Output\$(Configuration)\$(Platform)\$(MSBuildProjectName)\</OutDir>
<OutDir>$(SolutionDir)Output\$(Configuration)\$(Platform)\$(MSBuildProjectName)\</OutDir>
<IntDir>$(SolutionDir)Output\$(Configuration)\$(Platform)\$(MSBuildProjectName)\Temp\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
<LanguageStandard>stdcpp17</LanguageStandard>
<ConformanceMode>true</ConformanceMode>
<AdditionalOptions>%(AdditionalOptions) /bigobj /Zc:twoPhase-</AdditionalOptions>
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
<ClCompile>
<Optimization>MinSpace</Optimization>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
</ClCompile>
</ItemDefinitionGroup>
Expand Down
2 changes: 1 addition & 1 deletion Nagisa/Package.appxmanifest
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
<Identity Name="40174MouriNaruto.Nagisa" Publisher="CN=E310A153-74A9-4D81-800B-857A8D58408A" Version="0.3.50.0" />
<Identity Name="40174MouriNaruto.Nagisa" Publisher="CN=E310A153-74A9-4D81-800B-857A8D58408A" Version="0.3.62.0" />
<mp:PhoneIdentity PhoneProductId="eac382d2-e582-49fb-83ec-61dc13250420" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>Nagisa</DisplayName>
Expand Down
2 changes: 1 addition & 1 deletion Shared/NagisaVersion.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ License: The MIT License

#define NAGISA_VER_MAJOR 0
#define NAGISA_VER_MINOR 3
#define NAGISA_VER_BUILD 50
#define NAGISA_VER_BUILD 62
#define NAGISA_VER_REV 0
#endif

Expand Down
Binary file modified ThirdParty/OpenSSL/ARM/libeay32.lib
View file
Binary file not shown.
Binary file modified ThirdParty/OpenSSL/ARM/ssleay32.lib
View file
Binary file not shown.
Binary file added ThirdParty/OpenSSL/ARM64/libeay32.lib
View file
Binary file not shown.
Binary file added ThirdParty/OpenSSL/ARM64/ssleay32.lib
View file
Binary file not shown.
Binary file modified ThirdParty/OpenSSL/Win32/libeay32.lib
View file
Binary file not shown.
Binary file modified ThirdParty/OpenSSL/Win32/ssleay32.lib
View file
Binary file not shown.
Binary file modified ThirdParty/OpenSSL/x64/libeay32.lib
View file
Binary file not shown.
Binary file modified ThirdParty/OpenSSL/x64/ssleay32.lib
View file
Binary file not shown.

0 comments on commit 6230483

Please sign in to comment.