Updated layout of project files.

.vscode/c_cpp_properties.json

@@ -9,14 +9,15 @@
                 "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
                 "/usr/include",
                 "${workspaceRoot}",
+                "${workspaceRoot}/lib/libfnd/include",
+                "${workspaceRoot}/lib/libpolarssl/include",
+                "${workspaceRoot}/lib/liblz4/include",
                 "${workspaceRoot}/lib/libcrypto/include",
-                "${workspaceRoot}/lib/libcrypto/source/polarssl/libinclude",
                 "${workspaceRoot}/lib/libcompress/include",
                 "${workspaceRoot}/lib/libes/include",
                 "${workspaceRoot}/lib/libpki/include",
-                "${workspaceRoot}/lib/libfnd/include",
-                "${workspaceRoot}/lib/libnx/include",
-                "${workspaceRoot}/lib/libnx-hb/include"
+                "${workspaceRoot}/lib/libhac/include",
+                "${workspaceRoot}/lib/libhac-hb/include"
             ],
             "defines": [],
             "intelliSenseMode": "clang-x64",

NXTools.sln

@@ -3,16 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27428.2015
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfnd", "lib\libfnd\fnd.vcxproj", "{4D27EDB9-5110-44FE-8CE2-D46C5AD3C55B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcrypto", "lib\libcrypto\crypto.vcxproj", "{6ADBB60D-DBA0-411D-BD2D-A355EF8E0FE1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnx", "lib\libnx\nx.vcxproj", "{91BA9E79-8242-4F7D-B997-0DFEC95EA22B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6ADBB60D-DBA0-411D-BD2D-A355EF8E0FE1} = {6ADBB60D-DBA0-411D-BD2D-A355EF8E0FE1}
-		{4D27EDB9-5110-44FE-8CE2-D46C5AD3C55B} = {4D27EDB9-5110-44FE-8CE2-D46C5AD3C55B}
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{170B4A09-1B67-4A62-93AB-116EBCFF4A8C}"
 	ProjectSection(SolutionItems) = preProject
 		lib\makefile = lib\makefile
@@ -26,26 +16,32 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8F6C846D-35E2-47FD-AF42-7A3FD036346E}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
-		KEYS.md = KEYS.md
-		LICENSE = LICENSE
 		makefile = makefile
 		README.md = README.md
+		SWITCH_KEYS.md = SWITCH_KEYS.md
+		LICENSE = LICENSE
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libes", "lib\libes\es.vcxproj", "{7BE99936-0D40-410D-944B-4513C2EFF8DC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfnd", "lib\libfnd\libfnd.vcxproj", "{4D27EDB9-5110-44FE-8CE2-D46C5AD3C55B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nstool", "programs\nstool\nstool.vcxproj", "{AF09FA96-4463-417D-8FE6-526063F41349}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CF01B5B7-730A-447F-9BB2-5EDA9B082177} = {CF01B5B7-730A-447F-9BB2-5EDA9B082177}
-		{738CB4FC-CD9E-4B81-A04B-DEADBFA71C63} = {738CB4FC-CD9E-4B81-A04B-DEADBFA71C63}
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpolarssl", "lib\libpolarssl\libpolarssl.vcxproj", "{394EFC16-BD3A-4538-B33D-7BA1EDB8DAC1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblz4", "lib\liblz4\liblz4.vcxproj", "{AB0C3362-63AB-480A-ADBC-2EF7D859778B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcrypto", "lib\libcrypto\libcrypto.vcxproj", "{6ADBB60D-DBA0-411D-BD2D-A355EF8E0FE1}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcompress", "lib\libcompress\libcompress.vcxproj", "{CF01B5B7-730A-447F-9BB2-5EDA9B082177}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnx-hb", "lib\libnx-hb\libnx-hb.vcxproj", "{738CB4FC-CD9E-4B81-A04B-DEADBFA71C63}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpki", "lib\libpki\libpki.vcxproj", "{B9113734-6E84-44FF-8CF7-58199AA815C5}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libes", "lib\libes\libes.vcxproj", "{7BE99936-0D40-410D-944B-4513C2EFF8DC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libhac", "lib\libhac\libhac.vcxproj", "{91BA9E79-8242-4F7D-B997-0DFEC95EA22B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libhac-hb", "lib\libhac-hb\libhac-hb.vcxproj", "{738CB4FC-CD9E-4B81-A04B-DEADBFA71C63}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nstool", "programs\nstool\nstool.vcxproj", "{AF09FA96-4463-417D-8FE6-526063F41349}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -62,6 +58,22 @@ Global
 		{4D27EDB9-5110-44FE-8CE2-D46C5AD3C55B}.Release|x64.Build.0 = Release|x64
 		{4D27EDB9-5110-44FE-8CE2-D46C5AD3C55B}.Release|x86.ActiveCfg = Release|Win32
 		{4D27EDB9-5110-44FE-8CE2-D46C5AD3C55B}.Release|x86.Build.0 = Release|Win32
+		{394EFC16-BD3A-4538-B33D-7BA1EDB8DAC1}.Debug|x64.ActiveCfg = Debug|x64
+		{394EFC16-BD3A-4538-B33D-7BA1EDB8DAC1}.Debug|x64.Build.0 = Debug|x64
+		{394EFC16-BD3A-4538-B33D-7BA1EDB8DAC1}.Debug|x86.ActiveCfg = Debug|Win32
+		{394EFC16-BD3A-4538-B33D-7BA1EDB8DAC1}.Debug|x86.Build.0 = Debug|Win32
+		{394EFC16-BD3A-4538-B33D-7BA1EDB8DAC1}.Release|x64.ActiveCfg = Release|x64
+		{394EFC16-BD3A-4538-B33D-7BA1EDB8DAC1}.Release|x64.Build.0 = Release|x64
+		{394EFC16-BD3A-4538-B33D-7BA1EDB8DAC1}.Release|x86.ActiveCfg = Release|Win32
+		{394EFC16-BD3A-4538-B33D-7BA1EDB8DAC1}.Release|x86.Build.0 = Release|Win32
+		{AB0C3362-63AB-480A-ADBC-2EF7D859778B}.Debug|x64.ActiveCfg = Debug|x64
+		{AB0C3362-63AB-480A-ADBC-2EF7D859778B}.Debug|x64.Build.0 = Debug|x64
+		{AB0C3362-63AB-480A-ADBC-2EF7D859778B}.Debug|x86.ActiveCfg = Debug|Win32
+		{AB0C3362-63AB-480A-ADBC-2EF7D859778B}.Debug|x86.Build.0 = Debug|Win32
+		{AB0C3362-63AB-480A-ADBC-2EF7D859778B}.Release|x64.ActiveCfg = Release|x64
+		{AB0C3362-63AB-480A-ADBC-2EF7D859778B}.Release|x64.Build.0 = Release|x64
+		{AB0C3362-63AB-480A-ADBC-2EF7D859778B}.Release|x86.ActiveCfg = Release|Win32
+		{AB0C3362-63AB-480A-ADBC-2EF7D859778B}.Release|x86.Build.0 = Release|Win32
 		{6ADBB60D-DBA0-411D-BD2D-A355EF8E0FE1}.Debug|x64.ActiveCfg = Debug|x64
 		{6ADBB60D-DBA0-411D-BD2D-A355EF8E0FE1}.Debug|x64.Build.0 = Debug|x64
 		{6ADBB60D-DBA0-411D-BD2D-A355EF8E0FE1}.Debug|x86.ActiveCfg = Debug|Win32
@@ -86,14 +98,6 @@ Global
 		{7BE99936-0D40-410D-944B-4513C2EFF8DC}.Release|x64.Build.0 = Release|x64
 		{7BE99936-0D40-410D-944B-4513C2EFF8DC}.Release|x86.ActiveCfg = Release|Win32
 		{7BE99936-0D40-410D-944B-4513C2EFF8DC}.Release|x86.Build.0 = Release|Win32
-		{AF09FA96-4463-417D-8FE6-526063F41349}.Debug|x64.ActiveCfg = Debug|x64
-		{AF09FA96-4463-417D-8FE6-526063F41349}.Debug|x64.Build.0 = Debug|x64
-		{AF09FA96-4463-417D-8FE6-526063F41349}.Debug|x86.ActiveCfg = Debug|Win32
-		{AF09FA96-4463-417D-8FE6-526063F41349}.Debug|x86.Build.0 = Debug|Win32
-		{AF09FA96-4463-417D-8FE6-526063F41349}.Release|x64.ActiveCfg = Release|x64
-		{AF09FA96-4463-417D-8FE6-526063F41349}.Release|x64.Build.0 = Release|x64
-		{AF09FA96-4463-417D-8FE6-526063F41349}.Release|x86.ActiveCfg = Release|Win32
-		{AF09FA96-4463-417D-8FE6-526063F41349}.Release|x86.Build.0 = Release|Win32
 		{CF01B5B7-730A-447F-9BB2-5EDA9B082177}.Debug|x64.ActiveCfg = Debug|x64
 		{CF01B5B7-730A-447F-9BB2-5EDA9B082177}.Debug|x64.Build.0 = Debug|x64
 		{CF01B5B7-730A-447F-9BB2-5EDA9B082177}.Debug|x86.ActiveCfg = Debug|Win32
@@ -118,19 +122,29 @@ Global
 		{B9113734-6E84-44FF-8CF7-58199AA815C5}.Release|x64.Build.0 = Release|x64
 		{B9113734-6E84-44FF-8CF7-58199AA815C5}.Release|x86.ActiveCfg = Release|Win32
 		{B9113734-6E84-44FF-8CF7-58199AA815C5}.Release|x86.Build.0 = Release|Win32
+		{AF09FA96-4463-417D-8FE6-526063F41349}.Debug|x64.ActiveCfg = Debug|x64
+		{AF09FA96-4463-417D-8FE6-526063F41349}.Debug|x64.Build.0 = Debug|x64
+		{AF09FA96-4463-417D-8FE6-526063F41349}.Debug|x86.ActiveCfg = Debug|Win32
+		{AF09FA96-4463-417D-8FE6-526063F41349}.Debug|x86.Build.0 = Debug|Win32
+		{AF09FA96-4463-417D-8FE6-526063F41349}.Release|x64.ActiveCfg = Release|x64
+		{AF09FA96-4463-417D-8FE6-526063F41349}.Release|x64.Build.0 = Release|x64
+		{AF09FA96-4463-417D-8FE6-526063F41349}.Release|x86.ActiveCfg = Release|Win32
+		{AF09FA96-4463-417D-8FE6-526063F41349}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{4D27EDB9-5110-44FE-8CE2-D46C5AD3C55B} = {170B4A09-1B67-4A62-93AB-116EBCFF4A8C}
+		{394EFC16-BD3A-4538-B33D-7BA1EDB8DAC1} = {170B4A09-1B67-4A62-93AB-116EBCFF4A8C}
+		{AB0C3362-63AB-480A-ADBC-2EF7D859778B} = {170B4A09-1B67-4A62-93AB-116EBCFF4A8C}
 		{6ADBB60D-DBA0-411D-BD2D-A355EF8E0FE1} = {170B4A09-1B67-4A62-93AB-116EBCFF4A8C}
 		{91BA9E79-8242-4F7D-B997-0DFEC95EA22B} = {170B4A09-1B67-4A62-93AB-116EBCFF4A8C}
 		{7BE99936-0D40-410D-944B-4513C2EFF8DC} = {170B4A09-1B67-4A62-93AB-116EBCFF4A8C}
-		{AF09FA96-4463-417D-8FE6-526063F41349} = {E0863FCC-8E72-490D-BE1B-458F12CA8298}
 		{CF01B5B7-730A-447F-9BB2-5EDA9B082177} = {170B4A09-1B67-4A62-93AB-116EBCFF4A8C}
 		{738CB4FC-CD9E-4B81-A04B-DEADBFA71C63} = {170B4A09-1B67-4A62-93AB-116EBCFF4A8C}
 		{B9113734-6E84-44FF-8CF7-58199AA815C5} = {170B4A09-1B67-4A62-93AB-116EBCFF4A8C}
+		{AF09FA96-4463-417D-8FE6-526063F41349} = {E0863FCC-8E72-490D-BE1B-458F12CA8298}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {07DCCACC-D10D-47C9-85AE-FB9C54DB7D62}

NXTools.vcxproj

@@ -21,9 +21,9 @@
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{0A4197A1-76AD-4BF7-A29D-5CED369B72FD}</ProjectGuid>
-    <RootNamespace>NXTools</RootNamespace>
+    <RootNamespace>NNTools</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
-    <ProjectName>libnx</ProjectName>
+    <ProjectName>NNTools</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

lib/libcompress/libcompress.vcxproj

@@ -76,7 +76,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\libcompress\include;..\libcompress\source\lz4;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libcompress\include;..\liblz4\include;</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -85,7 +85,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\libcompress\include;..\libcompress\source\lz4;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libcompress\include;..\liblz4\include;</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -96,7 +96,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\libcompress\include;..\libcompress\source\lz4;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libcompress\include;..\liblz4\include;</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -111,7 +111,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\libcompress\include;..\libcompress\source\lz4;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libcompress\include;..\liblz4\include;</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -120,11 +120,9 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="include\compress\lz4.h" />
-    <ClInclude Include="source\lz4\lz4.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="source\lz4_wrapper.cpp" />
-    <ClCompile Include="source\lz4\lz4.c" />
   </ItemGroup>
   <ItemGroup>
     <None Include="makefile" />

lib/libcompress/libcompress.vcxproj.filters

@@ -13,25 +13,13 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
-    <Filter Include="Header Files\compress">
-      <UniqueIdentifier>{8b967d21-0d8f-4bf9-aa1c-54d33abdcec6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\lz4">
-      <UniqueIdentifier>{73860001-f667-4a56-a6e3-9007611f7da7}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\compress\lz4.h">
-      <Filter>Header Files\compress</Filter>
-    </ClInclude>
-    <ClInclude Include="source\lz4\lz4.h">
-      <Filter>Source Files\lz4</Filter>
+      <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="source\lz4\lz4.c">
-      <Filter>Source Files\lz4</Filter>
-    </ClCompile>
     <ClCompile Include="source\lz4_wrapper.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

lib/libcompress/makefile

@@ -1,11 +1,11 @@
 # Sources
-SRC_DIR = source source/lz4
+SRC_DIR = source
 OBJS = $(foreach dir,$(SRC_DIR),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) $(foreach dir,$(SRC_DIR),$(subst .c,.o,$(wildcard $(dir)/*.c)))
 
 # External dependencies
-DEPENDS = 
+DEPENDS = lz4
 LIB_DIR = ..
-INCS = -I"include" -I"source/lz4" $(foreach dep,$(DEPENDS), -I"$(LIB_DIR)/lib$(dep)/include")
+INCS = -I"include" $(foreach dep,$(DEPENDS), -I"$(LIB_DIR)/lib$(dep)/include")
 
 
 # Compiler Settings

lib/libcrypto/crypto.vcxproj.filters

@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Header Files\crypto">
-      <UniqueIdentifier>{c24d0e3f-1a38-486c-9bad-b7db5b39eee2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\polarssl">
-      <UniqueIdentifier>{50821199-d06b-4e82-b424-3f17b60f1a9e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\polarssl">
-      <UniqueIdentifier>{012a6f22-d10a-4ca3-b7c3-4c31c6ff1cc1}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="include\crypto\aes.h">
-      <Filter>Header Files\crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="include\crypto\rsa.h">
-      <Filter>Header Files\crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="include\crypto\sha.h">
-      <Filter>Header Files\crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="source\libpolarssl\include\polarssl\aes.h">
-      <Filter>Header Files\polarssl</Filter>
-    </ClInclude>
-    <ClInclude Include="source\libpolarssl\include\polarssl\base64.h">
-      <Filter>Header Files\polarssl</Filter>
-    </ClInclude>
-    <ClInclude Include="source\libpolarssl\include\polarssl\bignum.h">
-      <Filter>Header Files\polarssl</Filter>
-    </ClInclude>
-    <ClInclude Include="source\libpolarssl\include\polarssl\bn_mul.h">
-      <Filter>Header Files\polarssl</Filter>
-    </ClInclude>
-    <ClInclude Include="source\libpolarssl\include\polarssl\config.h">
-      <Filter>Header Files\polarssl</Filter>
-    </ClInclude>
-    <ClInclude Include="source\libpolarssl\include\polarssl\rsa.h">
-      <Filter>Header Files\polarssl</Filter>
-    </ClInclude>
-    <ClInclude Include="source\libpolarssl\include\polarssl\sha1.h">
-      <Filter>Header Files\polarssl</Filter>
-    </ClInclude>
-    <ClInclude Include="source\libpolarssl\include\polarssl\sha2.h">
-      <Filter>Header Files\polarssl</Filter>
-    </ClInclude>
-    <ClInclude Include="source\libpolarssl\include\polarssl\md.h">
-      <Filter>Header Files\polarssl</Filter>
-    </ClInclude>
-    <ClInclude Include="source\libpolarssl\include\polarssl\md_wrap.h">
-      <Filter>Header Files\polarssl</Filter>
-    </ClInclude>
-    <ClInclude Include="include\crypto\ecdsa.h">
-      <Filter>Header Files\crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="include\crypto\base64.h">
-      <Filter>Header Files\crypto</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="source\aes_wrapper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="source\rsa_wrapper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="source\sha_wrapper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="source\libpolarssl\source\aes.c">
-      <Filter>Source Files\polarssl</Filter>
-    </ClCompile>
-    <ClCompile Include="source\libpolarssl\source\base64.c">
-      <Filter>Source Files\polarssl</Filter>
-    </ClCompile>
-    <ClCompile Include="source\libpolarssl\source\bignum.c">
-      <Filter>Source Files\polarssl</Filter>
-    </ClCompile>
-    <ClCompile Include="source\libpolarssl\source\md.c">
-      <Filter>Source Files\polarssl</Filter>
-    </ClCompile>
-    <ClCompile Include="source\libpolarssl\source\md_wrap.c">
-      <Filter>Source Files\polarssl</Filter>
-    </ClCompile>
-    <ClCompile Include="source\libpolarssl\source\rsa.c">
-      <Filter>Source Files\polarssl</Filter>
-    </ClCompile>
-    <ClCompile Include="source\libpolarssl\source\sha1.c">
-      <Filter>Source Files\polarssl</Filter>
-    </ClCompile>
-    <ClCompile Include="source\libpolarssl\source\sha2.c">
-      <Filter>Source Files\polarssl</Filter>
-    </ClCompile>
-    <ClCompile Include="source\base64_wrapper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="makefile" />
-  </ItemGroup>
-</Project>

lib/libcrypto/libcrypto.vcxproj

@@ -21,9 +21,7 @@
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{6ADBB60D-DBA0-411D-BD2D-A355EF8E0FE1}</ProjectGuid>
-    <RootNamespace>crypto</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
-    <ProjectName>libcrypto</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -76,7 +74,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libcrypto\source\libpolarssl\include;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libpolarssl\include;</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -85,7 +83,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libcrypto\source\libpolarssl\include;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libpolarssl\include;</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -96,7 +94,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libcrypto\source\libpolarssl\include;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libpolarssl\include;</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -111,7 +109,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libcrypto\source\libpolarssl\include;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libpolarssl\include;</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -125,28 +123,10 @@
     <ClInclude Include="include\crypto\ecdsa.h" />
     <ClInclude Include="include\crypto\rsa.h" />
     <ClInclude Include="include\crypto\sha.h" />
-    <ClInclude Include="source\libpolarssl\include\polarssl\aes.h" />
-    <ClInclude Include="source\libpolarssl\include\polarssl\base64.h" />
-    <ClInclude Include="source\libpolarssl\include\polarssl\bignum.h" />
-    <ClInclude Include="source\libpolarssl\include\polarssl\bn_mul.h" />
-    <ClInclude Include="source\libpolarssl\include\polarssl\config.h" />
-    <ClInclude Include="source\libpolarssl\include\polarssl\md.h" />
-    <ClInclude Include="source\libpolarssl\include\polarssl\md_wrap.h" />
-    <ClInclude Include="source\libpolarssl\include\polarssl\rsa.h" />
-    <ClInclude Include="source\libpolarssl\include\polarssl\sha1.h" />
-    <ClInclude Include="source\libpolarssl\include\polarssl\sha2.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="source\aes_wrapper.cpp" />
     <ClCompile Include="source\base64_wrapper.cpp" />
-    <ClCompile Include="source\libpolarssl\source\aes.c" />
-    <ClCompile Include="source\libpolarssl\source\base64.c" />
-    <ClCompile Include="source\libpolarssl\source\bignum.c" />
-    <ClCompile Include="source\libpolarssl\source\md.c" />
-    <ClCompile Include="source\libpolarssl\source\md_wrap.c" />
-    <ClCompile Include="source\libpolarssl\source\rsa.c" />
-    <ClCompile Include="source\libpolarssl\source\sha1.c" />
-    <ClCompile Include="source\libpolarssl\source\sha2.c" />
     <ClCompile Include="source\rsa_wrapper.cpp" />
     <ClCompile Include="source\sha_wrapper.cpp" />
   </ItemGroup>

lib/libcrypto/libcrypto.vcxproj.filters

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="include\crypto\aes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\crypto\rsa.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\crypto\sha.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\crypto\ecdsa.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\crypto\base64.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="source\aes_wrapper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="source\rsa_wrapper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="source\sha_wrapper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="source\base64_wrapper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="makefile" />
+  </ItemGroup>
+</Project>

lib/libcrypto/makefile

@@ -1,16 +1,15 @@
 # Sources
-SRC_DIR = source source/libpolarssl/source
-OBJS = $(foreach dir,$(SRC_DIR),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) $(foreach dir,$(SRC_DIR),$(subst .c,.o,$(wildcard $(dir)/*.c)))
+SRC_DIR = source
+OBJS = $(foreach dir,$(SRC_DIR),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp)))
 
 # External dependencies
-DEPENDS = fnd
+DEPENDS = fnd polarssl
 LIB_DIR = ..
-INCS = -I"include" -I"source/libpolarssl/include" $(foreach dep,$(DEPENDS), -I"$(LIB_DIR)/lib$(dep)/include")
+INCS = -I"include" $(foreach dep,$(DEPENDS), -I"$(LIB_DIR)/lib$(dep)/include")
 
 
 # Compiler Settings
 CXXFLAGS = -std=c++11 $(INCS) -D__STDC_FORMAT_MACROS -Wall -Wno-unused-value
-CFLAGS = -std=c11 $(INCS) -Wall -Wno-unused-value
 ARFLAGS = cr -o
 ifeq ($(OS),Windows_NT)
 	# Windows Only Flags/Libs
@@ -30,7 +29,6 @@ else
 		CFLAGS += -Wno-unused-but-set-variable
 		CXXFLAGS += -Wno-unused-but-set-variable
 	endif
-
 endif
 
 # Output

lib/libcrypto/source/libpolarssl/makefile

@@ -1,37 +0,0 @@
-# Sources
-SRC_DIR = source
-OBJS = $(foreach dir,$(SRC_DIR),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) $(foreach dir,$(SRC_DIR),$(subst .c,.o,$(wildcard $(dir)/*.c)))
-
-# External dependencies
-DEPENDS = 
-LIB_DIR = ..
-INCS = -I"include" $(foreach dep,$(DEPENDS), -I"$(LIB_DIR)/lib$(dep)/include")
-
-
-# Compiler Settings
-CXXFLAGS = -std=c++11 $(INCS) -D__STDC_FORMAT_MACROS -Wall -Wno-unused-but-set-variable -Wno-unused-value
-CFLAGS = -std=c11 $(INCS) -Wall -Wno-unused-but-set-variable -Wno-unused-value
-ifeq ($(OS),Windows_NT)
-	# Windows Only Flags/Libs
-	CC = x86_64-w64-mingw32-gcc
-	CXX = x86_64-w64-mingw32-g++
-	CFLAGS += 
-	CXXFLAGS += 
-else
-	# *nix Only Flags/Libs
-	CFLAGS += 
-	CXXFLAGS += 
-endif
-
-# Output
-OUTPUT = $(shell basename $(CURDIR)).a
-
-main: build
-
-rebuild: clean build
-
-build: $(OBJS)
-	ar cr -o $(OUTPUT) $(OBJS)
-
-clean:
-	rm -rf $(OUTPUT) $(OBJS)

lib/libes/libes.vcxproj

@@ -20,9 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{7BE99936-0D40-410D-944B-4513C2EFF8DC}</ProjectGuid>
-    <RootNamespace>es</RootNamespace>
     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-    <ProjectName>libes</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

lib/libfnd/libfnd.vcxproj

@@ -21,9 +21,7 @@
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{4D27EDB9-5110-44FE-8CE2-D46C5AD3C55B}</ProjectGuid>
-    <RootNamespace>fnd</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
-    <ProjectName>libfnd</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

lib/libhac-hb/libhac-hb.vcxproj

@@ -21,7 +21,6 @@
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{738CB4FC-CD9E-4B81-A04B-DEADBFA71C63}</ProjectGuid>
-    <RootNamespace>libnxhb</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -78,7 +77,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libnx\include;..\libnx-hb\include;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libhac\include;..\libhac-hb\include;</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -91,7 +90,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libnx\include;..\libnx-hb\include;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libhac\include;..\libhac-hb\include;</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -100,7 +99,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libnx\include;..\libnx-hb\include;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libhac\include;..\libhac-hb\include;</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -111,7 +110,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libnx\include;..\libnx-hb\include;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libhac\include;..\libhac-hb\include;</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -119,9 +118,9 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="include\nx\aset.h" />
-    <ClInclude Include="include\nx\AssetHeader.h" />
-    <ClInclude Include="include\nx\nro-hb.h" />
+    <ClInclude Include="include\nn\hac\aset.h" />
+    <ClInclude Include="include\nn\hac\AssetHeader.h" />
+    <ClInclude Include="include\nn\hac\nro-hb.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="source\AssetHeader.cpp" />

lib/libhac-hb/libhac-hb.vcxproj.filters

@@ -15,13 +15,13 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="include\nx\aset.h">
+    <ClInclude Include="include\nn\hac\aset.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\AssetHeader.h">
+    <ClInclude Include="include\nn\hac\AssetHeader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\nro-hb.h">
+    <ClInclude Include="include\nn\hac\nro-hb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

lib/libhac/libhac.vcxproj

@@ -22,61 +22,61 @@
     <None Include="makefile" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="include\nx\AccessControlInfoBinary.h" />
-    <ClInclude Include="include\nx\AccessControlInfoDescBinary.h" />
-    <ClInclude Include="include\nx\aci.h" />
-    <ClInclude Include="include\nx\AesKeygen.h" />
-    <ClInclude Include="include\nx\ApplicationControlPropertyBinary.h" />
-    <ClInclude Include="include\nx\ApplicationControlPropertyUtils.h" />
-    <ClInclude Include="include\nx\cnmt.h" />
-    <ClInclude Include="include\nx\ContentMetaBinary.h" />
-    <ClInclude Include="include\nx\elf.h" />
-    <ClInclude Include="include\nx\fac.h" />
-    <ClInclude Include="include\nx\FileSystemAccessControlBinary.h" />
-    <ClInclude Include="include\nx\HandleTableSizeEntry.h" />
-    <ClInclude Include="include\nx\HandleTableSizeHandler.h" />
-    <ClInclude Include="include\nx\hierarchicalintegrity.h" />
-    <ClInclude Include="include\nx\HierarchicalIntegrityHeader.h" />
-    <ClInclude Include="include\nx\hierarchicalsha256.h" />
-    <ClInclude Include="include\nx\HierarchicalSha256Header.h" />
-    <ClInclude Include="include\nx\IKernelCapabilityHandler.h" />
-    <ClInclude Include="include\nx\InteruptEntry.h" />
-    <ClInclude Include="include\nx\InteruptHandler.h" />
-    <ClInclude Include="include\nx\kc.h" />
-    <ClInclude Include="include\nx\KernelCapabilityBinary.h" />
-    <ClInclude Include="include\nx\KernelCapabilityEntry.h" />
-    <ClInclude Include="include\nx\KernelVersionEntry.h" />
-    <ClInclude Include="include\nx\KernelVersionHandler.h" />
-    <ClInclude Include="include\nx\macro.h" />
-    <ClInclude Include="include\nx\MemoryMappingHandler.h" />
-    <ClInclude Include="include\nx\MemoryPageEntry.h" />
-    <ClInclude Include="include\nx\MiscFlagsEntry.h" />
-    <ClInclude Include="include\nx\MiscFlagsHandler.h" />
-    <ClInclude Include="include\nx\MiscParamsEntry.h" />
-    <ClInclude Include="include\nx\MiscParamsHandler.h" />
-    <ClInclude Include="include\nx\nacp.h" />
-    <ClInclude Include="include\nx\nca.h" />
-    <ClInclude Include="include\nx\NcaHeader.h" />
-    <ClInclude Include="include\nx\NcaUtils.h" />
-    <ClInclude Include="include\nx\npdm.h" />
-    <ClInclude Include="include\nx\NpdmBinary.h" />
-    <ClInclude Include="include\nx\nro.h" />
-    <ClInclude Include="include\nx\NroHeader.h" />
-    <ClInclude Include="include\nx\nrr.h" />
-    <ClInclude Include="include\nx\nso.h" />
-    <ClInclude Include="include\nx\NsoHeader.h" />
-    <ClInclude Include="include\nx\pfs.h" />
-    <ClInclude Include="include\nx\PfsHeader.h" />
-    <ClInclude Include="include\nx\romfs.h" />
-    <ClInclude Include="include\nx\ServiceAccessControlBinary.h" />
-    <ClInclude Include="include\nx\ServiceAccessControlEntry.h" />
-    <ClInclude Include="include\nx\SystemCallEntry.h" />
-    <ClInclude Include="include\nx\SystemCallHandler.h" />
-    <ClInclude Include="include\nx\ThreadInfoEntry.h" />
-    <ClInclude Include="include\nx\ThreadInfoHandler.h" />
-    <ClInclude Include="include\nx\xci.h" />
-    <ClInclude Include="include\nx\XciHeader.h" />
-    <ClInclude Include="include\nx\XciUtils.h" />
+    <ClInclude Include="include\nn\hac\AccessControlInfoBinary.h" />
+    <ClInclude Include="include\nn\hac\AccessControlInfoDescBinary.h" />
+    <ClInclude Include="include\nn\hac\aci.h" />
+    <ClInclude Include="include\nn\hac\AesKeygen.h" />
+    <ClInclude Include="include\nn\hac\ApplicationControlPropertyBinary.h" />
+    <ClInclude Include="include\nn\hac\ApplicationControlPropertyUtils.h" />
+    <ClInclude Include="include\nn\hac\cnmt.h" />
+    <ClInclude Include="include\nn\hac\ContentMetaBinary.h" />
+    <ClInclude Include="include\nn\hac\elf.h" />
+    <ClInclude Include="include\nn\hac\fac.h" />
+    <ClInclude Include="include\nn\hac\FileSystemAccessControlBinary.h" />
+    <ClInclude Include="include\nn\hac\HandleTableSizeEntry.h" />
+    <ClInclude Include="include\nn\hac\HandleTableSizeHandler.h" />
+    <ClInclude Include="include\nn\hac\hierarchicalintegrity.h" />
+    <ClInclude Include="include\nn\hac\HierarchicalIntegrityHeader.h" />
+    <ClInclude Include="include\nn\hac\hierarchicalsha256.h" />
+    <ClInclude Include="include\nn\hac\HierarchicalSha256Header.h" />
+    <ClInclude Include="include\nn\hac\IKernelCapabilityHandler.h" />
+    <ClInclude Include="include\nn\hac\InteruptEntry.h" />
+    <ClInclude Include="include\nn\hac\InteruptHandler.h" />
+    <ClInclude Include="include\nn\hac\kc.h" />
+    <ClInclude Include="include\nn\hac\KernelCapabilityBinary.h" />
+    <ClInclude Include="include\nn\hac\KernelCapabilityEntry.h" />
+    <ClInclude Include="include\nn\hac\KernelVersionEntry.h" />
+    <ClInclude Include="include\nn\hac\KernelVersionHandler.h" />
+    <ClInclude Include="include\nn\hac\macro.h" />
+    <ClInclude Include="include\nn\hac\MemoryMappingHandler.h" />
+    <ClInclude Include="include\nn\hac\MemoryPageEntry.h" />
+    <ClInclude Include="include\nn\hac\MiscFlagsEntry.h" />
+    <ClInclude Include="include\nn\hac\MiscFlagsHandler.h" />
+    <ClInclude Include="include\nn\hac\MiscParamsEntry.h" />
+    <ClInclude Include="include\nn\hac\MiscParamsHandler.h" />
+    <ClInclude Include="include\nn\hac\nacp.h" />
+    <ClInclude Include="include\nn\hac\nca.h" />
+    <ClInclude Include="include\nn\hac\NcaHeader.h" />
+    <ClInclude Include="include\nn\hac\NcaUtils.h" />
+    <ClInclude Include="include\nn\hac\npdm.h" />
+    <ClInclude Include="include\nn\hac\NpdmBinary.h" />
+    <ClInclude Include="include\nn\hac\nro.h" />
+    <ClInclude Include="include\nn\hac\NroHeader.h" />
+    <ClInclude Include="include\nn\hac\nrr.h" />
+    <ClInclude Include="include\nn\hac\nso.h" />
+    <ClInclude Include="include\nn\hac\NsoHeader.h" />
+    <ClInclude Include="include\nn\hac\pfs.h" />
+    <ClInclude Include="include\nn\hac\PfsHeader.h" />
+    <ClInclude Include="include\nn\hac\romfs.h" />
+    <ClInclude Include="include\nn\hac\ServiceAccessControlBinary.h" />
+    <ClInclude Include="include\nn\hac\ServiceAccessControlEntry.h" />
+    <ClInclude Include="include\nn\hac\SystemCallEntry.h" />
+    <ClInclude Include="include\nn\hac\SystemCallHandler.h" />
+    <ClInclude Include="include\nn\hac\ThreadInfoEntry.h" />
+    <ClInclude Include="include\nn\hac\ThreadInfoHandler.h" />
+    <ClInclude Include="include\nn\hac\xci.h" />
+    <ClInclude Include="include\nn\hac\XciHeader.h" />
+    <ClInclude Include="include\nn\hac\XciUtils.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="source\AccessControlInfoBinary.cpp" />
@@ -120,9 +120,9 @@
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{91BA9E79-8242-4F7D-B997-0DFEC95EA22B}</ProjectGuid>
-    <RootNamespace>nx</RootNamespace>
+    <RootNamespace>hac</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
-    <ProjectName>libnx</ProjectName>
+    <ProjectName>libhac</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -175,7 +175,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libnx\include;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libhac\include;</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -184,7 +184,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libnx\include;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libhac\include;</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -195,7 +195,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libnx\include;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libhac\include;</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -210,7 +210,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libnx\include;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libfnd\include;..\libcrypto\include;..\libhac\include;</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>

lib/libhac/libhac.vcxproj.filters

@@ -18,169 +18,169 @@
     <None Include="makefile" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="include\nx\AccessControlInfoBinary.h">
+    <ClInclude Include="include\nn\hac\AccessControlInfoBinary.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\AccessControlInfoDescBinary.h">
+    <ClInclude Include="include\nn\hac\AccessControlInfoDescBinary.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\aci.h">
+    <ClInclude Include="include\nn\hac\aci.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\AesKeygen.h">
+    <ClInclude Include="include\nn\hac\AesKeygen.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\ApplicationControlPropertyBinary.h">
+    <ClInclude Include="include\nn\hac\ApplicationControlPropertyBinary.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\ApplicationControlPropertyUtils.h">
+    <ClInclude Include="include\nn\hac\ApplicationControlPropertyUtils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\cnmt.h">
+    <ClInclude Include="include\nn\hac\cnmt.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\ContentMetaBinary.h">
+    <ClInclude Include="include\nn\hac\ContentMetaBinary.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\elf.h">
+    <ClInclude Include="include\nn\hac\elf.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\fac.h">
+    <ClInclude Include="include\nn\hac\fac.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\FileSystemAccessControlBinary.h">
+    <ClInclude Include="include\nn\hac\FileSystemAccessControlBinary.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\HandleTableSizeEntry.h">
+    <ClInclude Include="include\nn\hac\HandleTableSizeEntry.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\HandleTableSizeHandler.h">
+    <ClInclude Include="include\nn\hac\HandleTableSizeHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\hierarchicalintegrity.h">
+    <ClInclude Include="include\nn\hac\hierarchicalintegrity.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\HierarchicalIntegrityHeader.h">
+    <ClInclude Include="include\nn\hac\HierarchicalIntegrityHeader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\hierarchicalsha256.h">
+    <ClInclude Include="include\nn\hac\hierarchicalsha256.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\HierarchicalSha256Header.h">
+    <ClInclude Include="include\nn\hac\HierarchicalSha256Header.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\IKernelCapabilityHandler.h">
+    <ClInclude Include="include\nn\hac\IKernelCapabilityHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\InteruptEntry.h">
+    <ClInclude Include="include\nn\hac\InteruptEntry.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\InteruptHandler.h">
+    <ClInclude Include="include\nn\hac\InteruptHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\kc.h">
+    <ClInclude Include="include\nn\hac\kc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\KernelCapabilityBinary.h">
+    <ClInclude Include="include\nn\hac\KernelCapabilityBinary.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\KernelCapabilityEntry.h">
+    <ClInclude Include="include\nn\hac\KernelCapabilityEntry.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\KernelVersionEntry.h">
+    <ClInclude Include="include\nn\hac\KernelVersionEntry.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\KernelVersionHandler.h">
+    <ClInclude Include="include\nn\hac\KernelVersionHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\macro.h">
+    <ClInclude Include="include\nn\hac\macro.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\MemoryMappingHandler.h">
+    <ClInclude Include="include\nn\hac\MemoryMappingHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\MemoryPageEntry.h">
+    <ClInclude Include="include\nn\hac\MemoryPageEntry.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\MiscFlagsEntry.h">
+    <ClInclude Include="include\nn\hac\MiscFlagsEntry.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\MiscFlagsHandler.h">
+    <ClInclude Include="include\nn\hac\MiscFlagsHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\MiscParamsEntry.h">
+    <ClInclude Include="include\nn\hac\MiscParamsEntry.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\MiscParamsHandler.h">
+    <ClInclude Include="include\nn\hac\MiscParamsHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\nacp.h">
+    <ClInclude Include="include\nn\hac\nacp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\nca.h">
+    <ClInclude Include="include\nn\hac\nca.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\NcaHeader.h">
+    <ClInclude Include="include\nn\hac\NcaHeader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\NcaUtils.h">
+    <ClInclude Include="include\nn\hac\NcaUtils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\npdm.h">
+    <ClInclude Include="include\nn\hac\npdm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\NpdmBinary.h">
+    <ClInclude Include="include\nn\hac\NpdmBinary.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\nro.h">
+    <ClInclude Include="include\nn\hac\nro.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\NroHeader.h">
+    <ClInclude Include="include\nn\hac\NroHeader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\nrr.h">
+    <ClInclude Include="include\nn\hac\nrr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\nso.h">
+    <ClInclude Include="include\nn\hac\nso.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\NsoHeader.h">
+    <ClInclude Include="include\nn\hac\NsoHeader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\pfs.h">
+    <ClInclude Include="include\nn\hac\pfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\PfsHeader.h">
+    <ClInclude Include="include\nn\hac\PfsHeader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\romfs.h">
+    <ClInclude Include="include\nn\hac\romfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\ServiceAccessControlBinary.h">
+    <ClInclude Include="include\nn\hac\ServiceAccessControlBinary.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\ServiceAccessControlEntry.h">
+    <ClInclude Include="include\nn\hac\ServiceAccessControlEntry.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\SystemCallEntry.h">
+    <ClInclude Include="include\nn\hac\SystemCallEntry.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\SystemCallHandler.h">
+    <ClInclude Include="include\nn\hac\SystemCallHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\ThreadInfoEntry.h">
+    <ClInclude Include="include\nn\hac\ThreadInfoEntry.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\ThreadInfoHandler.h">
+    <ClInclude Include="include\nn\hac\ThreadInfoHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\xci.h">
+    <ClInclude Include="include\nn\hac\xci.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\XciHeader.h">
+    <ClInclude Include="include\nn\hac\XciHeader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\nx\XciUtils.h">
+    <ClInclude Include="include\nn\hac\XciUtils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>