diff --git a/NXTools.sln b/NXTools.sln
index 4ae6953..57de5b8 100644
--- a/NXTools.sln
+++ b/NXTools.sln
@@ -35,6 +35,11 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libes", "lib\libes\es.vcxproj", "{7BE99936-0D40-410D-944B-4513C2EFF8DC}"
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}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcompress", "lib\libcompress\libcompress.vcxproj", "{CF01B5B7-730A-447F-9BB2-5EDA9B082177}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -84,6 +89,14 @@ Global
{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
+ {CF01B5B7-730A-447F-9BB2-5EDA9B082177}.Debug|x86.Build.0 = Debug|Win32
+ {CF01B5B7-730A-447F-9BB2-5EDA9B082177}.Release|x64.ActiveCfg = Release|x64
+ {CF01B5B7-730A-447F-9BB2-5EDA9B082177}.Release|x64.Build.0 = Release|x64
+ {CF01B5B7-730A-447F-9BB2-5EDA9B082177}.Release|x86.ActiveCfg = Release|Win32
+ {CF01B5B7-730A-447F-9BB2-5EDA9B082177}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -94,6 +107,7 @@ Global
{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}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {07DCCACC-D10D-47C9-85AE-FB9C54DB7D62}
diff --git a/lib/libcompress/libcompress.vcxproj b/lib/libcompress/libcompress.vcxproj
new file mode 100644
index 0000000..820d6cf
--- /dev/null
+++ b/lib/libcompress/libcompress.vcxproj
@@ -0,0 +1,135 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ 15.0
+ {CF01B5B7-730A-447F-9BB2-5EDA9B082177}
+ libcompress
+ 10.0.16299.0
+
+
+
+ StaticLibrary
+ true
+ v141
+ MultiByte
+
+
+ StaticLibrary
+ false
+ v141
+ true
+ MultiByte
+
+
+ StaticLibrary
+ true
+ v141
+ MultiByte
+
+
+ StaticLibrary
+ false
+ v141
+ true
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Level3
+ Disabled
+ true
+ true
+ ..\libcompress\include;..\libcompress\source\lz4;
+
+
+
+
+ Level3
+ Disabled
+ true
+ true
+ ..\libcompress\include;..\libcompress\source\lz4;
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ true
+ ..\libcompress\include;..\libcompress\source\lz4;
+
+
+ true
+ true
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ true
+ ..\libcompress\include;..\libcompress\source\lz4;
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/lib/libcompress/libcompress.vcxproj.filters b/lib/libcompress/libcompress.vcxproj.filters
new file mode 100644
index 0000000..2967ba3
--- /dev/null
+++ b/lib/libcompress/libcompress.vcxproj.filters
@@ -0,0 +1,42 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hh;hpp;hxx;hm;inl;inc;ipp;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+ {8b967d21-0d8f-4bf9-aa1c-54d33abdcec6}
+
+
+ {73860001-f667-4a56-a6e3-9007611f7da7}
+
+
+
+
+ Header Files\compress
+
+
+ Source Files\lz4
+
+
+
+
+ Source Files\lz4
+
+
+ Source Files
+
+
+
+
+
+
\ No newline at end of file
diff --git a/lib/libcompress/libcompress.vcxproj.user b/lib/libcompress/libcompress.vcxproj.user
new file mode 100644
index 0000000..be25078
--- /dev/null
+++ b/lib/libcompress/libcompress.vcxproj.user
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/lib/libcompress/source/lz4.cpp b/lib/libcompress/source/lz4_wrapper.cpp
similarity index 100%
rename from lib/libcompress/source/lz4.cpp
rename to lib/libcompress/source/lz4_wrapper.cpp
diff --git a/lib/libcrypto/crypto.vcxproj b/lib/libcrypto/crypto.vcxproj
index 97b2a0e..ceebdc0 100644
--- a/lib/libcrypto/crypto.vcxproj
+++ b/lib/libcrypto/crypto.vcxproj
@@ -135,17 +135,17 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/libcrypto/crypto.vcxproj.filters b/lib/libcrypto/crypto.vcxproj.filters
index c8b57c0..1918510 100644
--- a/lib/libcrypto/crypto.vcxproj.filters
+++ b/lib/libcrypto/crypto.vcxproj.filters
@@ -65,37 +65,37 @@
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files\polarssl
-
+
Source Files\polarssl
-
+
Source Files\polarssl
-
+
Source Files\polarssl
-
+
Source Files\polarssl
-
+
Source Files\polarssl
-
+
Source Files\polarssl
-
+
Source Files\polarssl
diff --git a/lib/libcrypto/source/aes.cpp b/lib/libcrypto/source/aes_wrapper.cpp
similarity index 100%
rename from lib/libcrypto/source/aes.cpp
rename to lib/libcrypto/source/aes_wrapper.cpp
diff --git a/lib/libcrypto/source/libpolarssl/source/polar_aes.c b/lib/libcrypto/source/libpolarssl/source/aes.c
similarity index 100%
rename from lib/libcrypto/source/libpolarssl/source/polar_aes.c
rename to lib/libcrypto/source/libpolarssl/source/aes.c
diff --git a/lib/libcrypto/source/libpolarssl/source/polar_base64.c b/lib/libcrypto/source/libpolarssl/source/base64.c
similarity index 100%
rename from lib/libcrypto/source/libpolarssl/source/polar_base64.c
rename to lib/libcrypto/source/libpolarssl/source/base64.c
diff --git a/lib/libcrypto/source/libpolarssl/source/polar_bignum.c b/lib/libcrypto/source/libpolarssl/source/bignum.c
similarity index 100%
rename from lib/libcrypto/source/libpolarssl/source/polar_bignum.c
rename to lib/libcrypto/source/libpolarssl/source/bignum.c
diff --git a/lib/libcrypto/source/libpolarssl/source/polar_md.c b/lib/libcrypto/source/libpolarssl/source/md.c
similarity index 100%
rename from lib/libcrypto/source/libpolarssl/source/polar_md.c
rename to lib/libcrypto/source/libpolarssl/source/md.c
diff --git a/lib/libcrypto/source/libpolarssl/source/polar_md_wrap.c b/lib/libcrypto/source/libpolarssl/source/md_wrap.c
similarity index 100%
rename from lib/libcrypto/source/libpolarssl/source/polar_md_wrap.c
rename to lib/libcrypto/source/libpolarssl/source/md_wrap.c
diff --git a/lib/libcrypto/source/libpolarssl/source/polar_rsa.c b/lib/libcrypto/source/libpolarssl/source/rsa.c
similarity index 100%
rename from lib/libcrypto/source/libpolarssl/source/polar_rsa.c
rename to lib/libcrypto/source/libpolarssl/source/rsa.c
diff --git a/lib/libcrypto/source/libpolarssl/source/polar_sha1.c b/lib/libcrypto/source/libpolarssl/source/sha1.c
similarity index 100%
rename from lib/libcrypto/source/libpolarssl/source/polar_sha1.c
rename to lib/libcrypto/source/libpolarssl/source/sha1.c
diff --git a/lib/libcrypto/source/libpolarssl/source/polar_sha2.c b/lib/libcrypto/source/libpolarssl/source/sha2.c
similarity index 100%
rename from lib/libcrypto/source/libpolarssl/source/polar_sha2.c
rename to lib/libcrypto/source/libpolarssl/source/sha2.c
diff --git a/lib/libcrypto/source/rsa.cpp b/lib/libcrypto/source/rsa_wrapper.cpp
similarity index 100%
rename from lib/libcrypto/source/rsa.cpp
rename to lib/libcrypto/source/rsa_wrapper.cpp
diff --git a/lib/libcrypto/source/sha.cpp b/lib/libcrypto/source/sha_wrapper.cpp
similarity index 100%
rename from lib/libcrypto/source/sha.cpp
rename to lib/libcrypto/source/sha_wrapper.cpp
diff --git a/lib/libnx/nx.vcxproj b/lib/libnx/nx.vcxproj
index 1dd00bc..6c40e2a 100644
--- a/lib/libnx/nx.vcxproj
+++ b/lib/libnx/nx.vcxproj
@@ -53,6 +53,8 @@
+
+
@@ -67,6 +69,9 @@
+
+
+
@@ -91,10 +96,11 @@
+
-
+
@@ -105,9 +111,6 @@
-
-
-
15.0
{91BA9E79-8242-4F7D-B997-0DFEC95EA22B}
diff --git a/lib/libnx/nx.vcxproj.filters b/lib/libnx/nx.vcxproj.filters
index c817750..a2b3661 100644
--- a/lib/libnx/nx.vcxproj.filters
+++ b/lib/libnx/nx.vcxproj.filters
@@ -156,6 +156,15 @@
Header Files
+
+ Header Files
+
+
+ Header Files
+
+
+
+
@@ -167,6 +176,12 @@
Source Files
+
+ Source Files
+
+
+ Source Files
+
Source Files
@@ -179,6 +194,12 @@
Source Files
+
+ Source Files
+
+
+ Source Files
+
Source Files
@@ -215,13 +236,19 @@
Source Files
+
+ Source Files
+
+
+ Source Files
+
Source Files
Source Files
-
+
Source Files
@@ -245,29 +272,11 @@
Source Files
-
- Source Files
-
-
- Source Files
-
Source Files
Source Files
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
-
-
\ No newline at end of file
diff --git a/programs/nstool/nstool.vcxproj b/programs/nstool/nstool.vcxproj
index 04304c1..7a87ad3 100644
--- a/programs/nstool/nstool.vcxproj
+++ b/programs/nstool/nstool.vcxproj
@@ -90,7 +90,7 @@
true
_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ..\..\lib\libfnd\include;..\..\lib\libcrypto\include;..\..\lib\libnx\include;
+ ..\..\lib\libfnd\include;..\..\lib\libcompress\include;..\..\lib\libcrypto\include;..\..\lib\libnx\include
Console
@@ -105,7 +105,7 @@
true
WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ..\..\lib\libfnd\include;..\..\lib\libcrypto\include;..\..\lib\libnx\include;
+ ..\..\lib\libfnd\include;..\..\lib\libcompress\include;..\..\lib\libcrypto\include;..\..\lib\libnx\include
Console
@@ -122,7 +122,7 @@
true
WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ..\..\lib\libfnd\include;..\..\lib\libcrypto\include;..\..\lib\libnx\include;
+ ..\..\lib\libfnd\include;..\..\lib\libcompress\include;..\..\lib\libcrypto\include;..\..\lib\libnx\include
Console
@@ -141,7 +141,7 @@
true
NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ..\..\lib\libfnd\include;..\..\lib\libcrypto\include;..\..\lib\libnx\include;
+ ..\..\lib\libfnd\include;..\..\lib\libcompress\include;..\..\lib\libcrypto\include;..\..\lib\libnx\include
Console
@@ -151,6 +151,9 @@
+
+ {cf01b5b7-730a-447f-9bb2-5eda9b082177}
+
{6adbb60d-dba0-411d-bd2d-a355ef8e0fe1}
@@ -169,6 +172,7 @@
+
@@ -185,6 +189,7 @@
+
diff --git a/programs/nstool/nstool.vcxproj.filters b/programs/nstool/nstool.vcxproj.filters
index f4b0f20..f35bba6 100644
--- a/programs/nstool/nstool.vcxproj.filters
+++ b/programs/nstool/nstool.vcxproj.filters
@@ -57,6 +57,9 @@
Header Files
+
+ Header Files
+
@@ -95,6 +98,9 @@
Source Files
+
+ Source Files
+
diff --git a/programs/nstool/nstool.vcxproj.user b/programs/nstool/nstool.vcxproj.user
index be25078..50d33be 100644
--- a/programs/nstool/nstool.vcxproj.user
+++ b/programs/nstool/nstool.vcxproj.user
@@ -1,4 +1,23 @@
-
+
+ --titlekey F28921A36270C34B5476A384A212FC18 --part1 winromfsext test\nsp\nsout\32a23f30763ca916909399fc03c57bd2.nca
+ WindowsLocalDebugger
+ ..\..
+
+
+ --titlekey F28921A36270C34B5476A384A212FC18 --part1 winromfsext test\nsp\nsout\32a23f30763ca916909399fc03c57bd2.nca
+ WindowsLocalDebugger
+ ..\..
+
+
+ --titlekey F28921A36270C34B5476A384A212FC18 --part1 winromfsext test\nsp\nsout\32a23f30763ca916909399fc03c57bd2.nca
+ WindowsLocalDebugger
+ ..\..
+
+
+ --titlekey F28921A36270C34B5476A384A212FC18 --part1 winromfsext test\nsp\nsout\32a23f30763ca916909399fc03c57bd2.nca
+ WindowsLocalDebugger
+ ..\..
+
\ No newline at end of file