diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index e996876..263f098 100644 --- a/.vscode/c_cpp_properties.json +++ b/.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", diff --git a/NXTools.sln b/NXTools.sln index 2305e4c..d196221 100644 --- a/NXTools.sln +++ b/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} diff --git a/NXTools.vcxproj b/NXTools.vcxproj index 647aa09..d764e1b 100644 --- a/NXTools.vcxproj +++ b/NXTools.vcxproj @@ -21,9 +21,9 @@ 15.0 {0A4197A1-76AD-4BF7-A29D-5CED369B72FD} - NXTools + NNTools 10.0.15063.0 - libnx + NNTools diff --git a/lib/libcompress/libcompress.vcxproj b/lib/libcompress/libcompress.vcxproj index 820d6cf..56a6671 100644 --- a/lib/libcompress/libcompress.vcxproj +++ b/lib/libcompress/libcompress.vcxproj @@ -76,7 +76,7 @@ Disabled true true - ..\libcompress\include;..\libcompress\source\lz4; + ..\libcompress\include;..\liblz4\include; @@ -85,7 +85,7 @@ Disabled true true - ..\libcompress\include;..\libcompress\source\lz4; + ..\libcompress\include;..\liblz4\include; @@ -96,7 +96,7 @@ true true true - ..\libcompress\include;..\libcompress\source\lz4; + ..\libcompress\include;..\liblz4\include; true @@ -111,7 +111,7 @@ true true true - ..\libcompress\include;..\libcompress\source\lz4; + ..\libcompress\include;..\liblz4\include; true @@ -120,11 +120,9 @@ - - diff --git a/lib/libcompress/libcompress.vcxproj.filters b/lib/libcompress/libcompress.vcxproj.filters index 2967ba3..ef951e4 100644 --- a/lib/libcompress/libcompress.vcxproj.filters +++ b/lib/libcompress/libcompress.vcxproj.filters @@ -13,25 +13,13 @@ {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 + Header Files - - Source Files\lz4 - Source Files diff --git a/lib/libcompress/makefile b/lib/libcompress/makefile index d639e86..931617a 100644 --- a/lib/libcompress/makefile +++ b/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 diff --git a/lib/libcrypto/crypto.vcxproj.filters b/lib/libcrypto/crypto.vcxproj.filters deleted file mode 100644 index 0110282..0000000 --- a/lib/libcrypto/crypto.vcxproj.filters +++ /dev/null @@ -1,114 +0,0 @@ - - - - - {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;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 - - - {c24d0e3f-1a38-486c-9bad-b7db5b39eee2} - - - {50821199-d06b-4e82-b424-3f17b60f1a9e} - - - {012a6f22-d10a-4ca3-b7c3-4c31c6ff1cc1} - - - - - Header Files\crypto - - - Header Files\crypto - - - Header Files\crypto - - - Header Files\polarssl - - - Header Files\polarssl - - - Header Files\polarssl - - - Header Files\polarssl - - - Header Files\polarssl - - - Header Files\polarssl - - - Header Files\polarssl - - - Header Files\polarssl - - - Header Files\polarssl - - - Header Files\polarssl - - - Header Files\crypto - - - Header Files\crypto - - - - - 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 - - - Source Files - - - - - - \ No newline at end of file diff --git a/lib/libcrypto/crypto.vcxproj b/lib/libcrypto/libcrypto.vcxproj similarity index 80% rename from lib/libcrypto/crypto.vcxproj rename to lib/libcrypto/libcrypto.vcxproj index 06dfa98..c401526 100644 --- a/lib/libcrypto/crypto.vcxproj +++ b/lib/libcrypto/libcrypto.vcxproj @@ -21,9 +21,7 @@ 15.0 {6ADBB60D-DBA0-411D-BD2D-A355EF8E0FE1} - crypto 10.0.15063.0 - libcrypto @@ -76,7 +74,7 @@ Level3 Disabled true - ..\libfnd\include;..\libcrypto\include;..\libcrypto\source\libpolarssl\include; + ..\libfnd\include;..\libcrypto\include;..\libpolarssl\include; _MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -85,7 +83,7 @@ Level3 Disabled true - ..\libfnd\include;..\libcrypto\include;..\libcrypto\source\libpolarssl\include; + ..\libfnd\include;..\libcrypto\include;..\libpolarssl\include; _MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -96,7 +94,7 @@ true true true - ..\libfnd\include;..\libcrypto\include;..\libcrypto\source\libpolarssl\include; + ..\libfnd\include;..\libcrypto\include;..\libpolarssl\include; _MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -111,7 +109,7 @@ true true true - ..\libfnd\include;..\libcrypto\include;..\libcrypto\source\libpolarssl\include; + ..\libfnd\include;..\libcrypto\include;..\libpolarssl\include; _MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -125,28 +123,10 @@ - - - - - - - - - - - - - - - - - - diff --git a/lib/libcrypto/libcrypto.vcxproj.filters b/lib/libcrypto/libcrypto.vcxproj.filters new file mode 100644 index 0000000..3c65bd5 --- /dev/null +++ b/lib/libcrypto/libcrypto.vcxproj.filters @@ -0,0 +1,51 @@ + + + + + {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;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 + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + + \ No newline at end of file diff --git a/lib/libcrypto/crypto.vcxproj.user b/lib/libcrypto/libcrypto.vcxproj.user similarity index 100% rename from lib/libcrypto/crypto.vcxproj.user rename to lib/libcrypto/libcrypto.vcxproj.user diff --git a/lib/libcrypto/makefile b/lib/libcrypto/makefile index 07909d3..d1bf049 100644 --- a/lib/libcrypto/makefile +++ b/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 diff --git a/lib/libcrypto/source/libpolarssl/makefile b/lib/libcrypto/source/libpolarssl/makefile deleted file mode 100644 index f2d86c3..0000000 --- a/lib/libcrypto/source/libpolarssl/makefile +++ /dev/null @@ -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) \ No newline at end of file diff --git a/lib/libes/include/es/SectionHeader_V2.h b/lib/libes/include/nn/es/SectionHeader_V2.h similarity index 100% rename from lib/libes/include/es/SectionHeader_V2.h rename to lib/libes/include/nn/es/SectionHeader_V2.h diff --git a/lib/libes/include/es/TicketBody_V2.h b/lib/libes/include/nn/es/TicketBody_V2.h similarity index 100% rename from lib/libes/include/es/TicketBody_V2.h rename to lib/libes/include/nn/es/TicketBody_V2.h diff --git a/lib/libes/include/es/ticket.h b/lib/libes/include/nn/es/ticket.h similarity index 100% rename from lib/libes/include/es/ticket.h rename to lib/libes/include/nn/es/ticket.h diff --git a/lib/libes/es.vcxproj b/lib/libes/libes.vcxproj similarity index 98% rename from lib/libes/es.vcxproj rename to lib/libes/libes.vcxproj index ae9f9c3..2373da0 100644 --- a/lib/libes/es.vcxproj +++ b/lib/libes/libes.vcxproj @@ -20,9 +20,7 @@ {7BE99936-0D40-410D-944B-4513C2EFF8DC} - es 8.1 - libes diff --git a/lib/libes/es.vcxproj.filters b/lib/libes/libes.vcxproj.filters similarity index 100% rename from lib/libes/es.vcxproj.filters rename to lib/libes/libes.vcxproj.filters diff --git a/lib/libes/es.vcxproj.user b/lib/libes/libes.vcxproj.user similarity index 100% rename from lib/libes/es.vcxproj.user rename to lib/libes/libes.vcxproj.user diff --git a/lib/libfnd/fnd.vcxproj b/lib/libfnd/libfnd.vcxproj similarity index 98% rename from lib/libfnd/fnd.vcxproj rename to lib/libfnd/libfnd.vcxproj index 703f93b..ae0fc8a 100644 --- a/lib/libfnd/fnd.vcxproj +++ b/lib/libfnd/libfnd.vcxproj @@ -21,9 +21,7 @@ 15.0 {4D27EDB9-5110-44FE-8CE2-D46C5AD3C55B} - fnd 10.0.15063.0 - libfnd diff --git a/lib/libfnd/fnd.vcxproj.filters b/lib/libfnd/libfnd.vcxproj.filters similarity index 100% rename from lib/libfnd/fnd.vcxproj.filters rename to lib/libfnd/libfnd.vcxproj.filters diff --git a/lib/libfnd/fnd.vcxproj.user b/lib/libfnd/libfnd.vcxproj.user similarity index 100% rename from lib/libfnd/fnd.vcxproj.user rename to lib/libfnd/libfnd.vcxproj.user diff --git a/lib/libnx-hb/include/nx/AssetHeader.h b/lib/libhac-hb/include/nn/hac/AssetHeader.h similarity index 100% rename from lib/libnx-hb/include/nx/AssetHeader.h rename to lib/libhac-hb/include/nn/hac/AssetHeader.h diff --git a/lib/libnx-hb/include/nx/aset.h b/lib/libhac-hb/include/nn/hac/aset.h similarity index 100% rename from lib/libnx-hb/include/nx/aset.h rename to lib/libhac-hb/include/nn/hac/aset.h diff --git a/lib/libnx-hb/include/nx/nro-hb.h b/lib/libhac-hb/include/nn/hac/nro-hb.h similarity index 100% rename from lib/libnx-hb/include/nx/nro-hb.h rename to lib/libhac-hb/include/nn/hac/nro-hb.h diff --git a/lib/libnx-hb/libnx-hb.vcxproj b/lib/libhac-hb/libhac-hb.vcxproj similarity index 92% rename from lib/libnx-hb/libnx-hb.vcxproj rename to lib/libhac-hb/libhac-hb.vcxproj index 927d5d9..06ec389 100644 --- a/lib/libnx-hb/libnx-hb.vcxproj +++ b/lib/libhac-hb/libhac-hb.vcxproj @@ -21,7 +21,6 @@ 15.0 {738CB4FC-CD9E-4B81-A04B-DEADBFA71C63} - libnxhb 10.0.16299.0 @@ -78,7 +77,7 @@ true true true - ..\libfnd\include;..\libcrypto\include;..\libnx\include;..\libnx-hb\include; + ..\libfnd\include;..\libcrypto\include;..\libhac\include;..\libhac-hb\include; true @@ -91,7 +90,7 @@ Disabled true true - ..\libfnd\include;..\libcrypto\include;..\libnx\include;..\libnx-hb\include; + ..\libfnd\include;..\libcrypto\include;..\libhac\include;..\libhac-hb\include; @@ -100,7 +99,7 @@ Disabled true true - ..\libfnd\include;..\libcrypto\include;..\libnx\include;..\libnx-hb\include; + ..\libfnd\include;..\libcrypto\include;..\libhac\include;..\libhac-hb\include; @@ -111,7 +110,7 @@ true true true - ..\libfnd\include;..\libcrypto\include;..\libnx\include;..\libnx-hb\include; + ..\libfnd\include;..\libcrypto\include;..\libhac\include;..\libhac-hb\include; true @@ -119,9 +118,9 @@ - - - + + + diff --git a/lib/libnx-hb/libnx-hb.vcxproj.filters b/lib/libhac-hb/libhac-hb.vcxproj.filters similarity index 88% rename from lib/libnx-hb/libnx-hb.vcxproj.filters rename to lib/libhac-hb/libhac-hb.vcxproj.filters index 01df9d5..02e64c2 100644 --- a/lib/libnx-hb/libnx-hb.vcxproj.filters +++ b/lib/libhac-hb/libhac-hb.vcxproj.filters @@ -15,13 +15,13 @@ - + Header Files - + Header Files - + Header Files diff --git a/lib/libnx-hb/libnx-hb.vcxproj.user b/lib/libhac-hb/libhac-hb.vcxproj.user similarity index 100% rename from lib/libnx-hb/libnx-hb.vcxproj.user rename to lib/libhac-hb/libhac-hb.vcxproj.user diff --git a/lib/libnx-hb/makefile b/lib/libhac-hb/makefile similarity index 100% rename from lib/libnx-hb/makefile rename to lib/libhac-hb/makefile diff --git a/lib/libnx-hb/source/AssetHeader.cpp b/lib/libhac-hb/source/AssetHeader.cpp similarity index 100% rename from lib/libnx-hb/source/AssetHeader.cpp rename to lib/libhac-hb/source/AssetHeader.cpp diff --git a/lib/libnx/include/nx/AccessControlInfoBinary.h b/lib/libhac/include/nn/hac/AccessControlInfoBinary.h similarity index 100% rename from lib/libnx/include/nx/AccessControlInfoBinary.h rename to lib/libhac/include/nn/hac/AccessControlInfoBinary.h diff --git a/lib/libnx/include/nx/AccessControlInfoDescBinary.h b/lib/libhac/include/nn/hac/AccessControlInfoDescBinary.h similarity index 100% rename from lib/libnx/include/nx/AccessControlInfoDescBinary.h rename to lib/libhac/include/nn/hac/AccessControlInfoDescBinary.h diff --git a/lib/libnx/include/nx/AesKeygen.h b/lib/libhac/include/nn/hac/AesKeygen.h similarity index 100% rename from lib/libnx/include/nx/AesKeygen.h rename to lib/libhac/include/nn/hac/AesKeygen.h diff --git a/lib/libnx/include/nx/ApplicationControlPropertyBinary.h b/lib/libhac/include/nn/hac/ApplicationControlPropertyBinary.h similarity index 100% rename from lib/libnx/include/nx/ApplicationControlPropertyBinary.h rename to lib/libhac/include/nn/hac/ApplicationControlPropertyBinary.h diff --git a/lib/libnx/include/nx/ApplicationControlPropertyUtils.h b/lib/libhac/include/nn/hac/ApplicationControlPropertyUtils.h similarity index 100% rename from lib/libnx/include/nx/ApplicationControlPropertyUtils.h rename to lib/libhac/include/nn/hac/ApplicationControlPropertyUtils.h diff --git a/lib/libnx/include/nx/ContentMetaBinary.h b/lib/libhac/include/nn/hac/ContentMetaBinary.h similarity index 100% rename from lib/libnx/include/nx/ContentMetaBinary.h rename to lib/libhac/include/nn/hac/ContentMetaBinary.h diff --git a/lib/libnx/include/nx/FileSystemAccessControlBinary.h b/lib/libhac/include/nn/hac/FileSystemAccessControlBinary.h similarity index 100% rename from lib/libnx/include/nx/FileSystemAccessControlBinary.h rename to lib/libhac/include/nn/hac/FileSystemAccessControlBinary.h diff --git a/lib/libnx/include/nx/HandleTableSizeEntry.h b/lib/libhac/include/nn/hac/HandleTableSizeEntry.h similarity index 100% rename from lib/libnx/include/nx/HandleTableSizeEntry.h rename to lib/libhac/include/nn/hac/HandleTableSizeEntry.h diff --git a/lib/libnx/include/nx/HandleTableSizeHandler.h b/lib/libhac/include/nn/hac/HandleTableSizeHandler.h similarity index 100% rename from lib/libnx/include/nx/HandleTableSizeHandler.h rename to lib/libhac/include/nn/hac/HandleTableSizeHandler.h diff --git a/lib/libnx/include/nx/HierarchicalIntegrityHeader.h b/lib/libhac/include/nn/hac/HierarchicalIntegrityHeader.h similarity index 100% rename from lib/libnx/include/nx/HierarchicalIntegrityHeader.h rename to lib/libhac/include/nn/hac/HierarchicalIntegrityHeader.h diff --git a/lib/libnx/include/nx/HierarchicalSha256Header.h b/lib/libhac/include/nn/hac/HierarchicalSha256Header.h similarity index 100% rename from lib/libnx/include/nx/HierarchicalSha256Header.h rename to lib/libhac/include/nn/hac/HierarchicalSha256Header.h diff --git a/lib/libnx/include/nx/IKernelCapabilityHandler.h b/lib/libhac/include/nn/hac/IKernelCapabilityHandler.h similarity index 100% rename from lib/libnx/include/nx/IKernelCapabilityHandler.h rename to lib/libhac/include/nn/hac/IKernelCapabilityHandler.h diff --git a/lib/libnx/include/nx/InteruptEntry.h b/lib/libhac/include/nn/hac/InteruptEntry.h similarity index 100% rename from lib/libnx/include/nx/InteruptEntry.h rename to lib/libhac/include/nn/hac/InteruptEntry.h diff --git a/lib/libnx/include/nx/InteruptHandler.h b/lib/libhac/include/nn/hac/InteruptHandler.h similarity index 100% rename from lib/libnx/include/nx/InteruptHandler.h rename to lib/libhac/include/nn/hac/InteruptHandler.h diff --git a/lib/libnx/include/nx/KernelCapabilityBinary.h b/lib/libhac/include/nn/hac/KernelCapabilityBinary.h similarity index 100% rename from lib/libnx/include/nx/KernelCapabilityBinary.h rename to lib/libhac/include/nn/hac/KernelCapabilityBinary.h diff --git a/lib/libnx/include/nx/KernelCapabilityEntry.h b/lib/libhac/include/nn/hac/KernelCapabilityEntry.h similarity index 100% rename from lib/libnx/include/nx/KernelCapabilityEntry.h rename to lib/libhac/include/nn/hac/KernelCapabilityEntry.h diff --git a/lib/libnx/include/nx/KernelVersionEntry.h b/lib/libhac/include/nn/hac/KernelVersionEntry.h similarity index 100% rename from lib/libnx/include/nx/KernelVersionEntry.h rename to lib/libhac/include/nn/hac/KernelVersionEntry.h diff --git a/lib/libnx/include/nx/KernelVersionHandler.h b/lib/libhac/include/nn/hac/KernelVersionHandler.h similarity index 100% rename from lib/libnx/include/nx/KernelVersionHandler.h rename to lib/libhac/include/nn/hac/KernelVersionHandler.h diff --git a/lib/libnx/include/nx/MemoryMappingHandler.h b/lib/libhac/include/nn/hac/MemoryMappingHandler.h similarity index 100% rename from lib/libnx/include/nx/MemoryMappingHandler.h rename to lib/libhac/include/nn/hac/MemoryMappingHandler.h diff --git a/lib/libnx/include/nx/MemoryPageEntry.h b/lib/libhac/include/nn/hac/MemoryPageEntry.h similarity index 100% rename from lib/libnx/include/nx/MemoryPageEntry.h rename to lib/libhac/include/nn/hac/MemoryPageEntry.h diff --git a/lib/libnx/include/nx/MiscFlagsEntry.h b/lib/libhac/include/nn/hac/MiscFlagsEntry.h similarity index 100% rename from lib/libnx/include/nx/MiscFlagsEntry.h rename to lib/libhac/include/nn/hac/MiscFlagsEntry.h diff --git a/lib/libnx/include/nx/MiscFlagsHandler.h b/lib/libhac/include/nn/hac/MiscFlagsHandler.h similarity index 100% rename from lib/libnx/include/nx/MiscFlagsHandler.h rename to lib/libhac/include/nn/hac/MiscFlagsHandler.h diff --git a/lib/libnx/include/nx/MiscParamsEntry.h b/lib/libhac/include/nn/hac/MiscParamsEntry.h similarity index 100% rename from lib/libnx/include/nx/MiscParamsEntry.h rename to lib/libhac/include/nn/hac/MiscParamsEntry.h diff --git a/lib/libnx/include/nx/MiscParamsHandler.h b/lib/libhac/include/nn/hac/MiscParamsHandler.h similarity index 100% rename from lib/libnx/include/nx/MiscParamsHandler.h rename to lib/libhac/include/nn/hac/MiscParamsHandler.h diff --git a/lib/libnx/include/nx/NcaHeader.h b/lib/libhac/include/nn/hac/NcaHeader.h similarity index 100% rename from lib/libnx/include/nx/NcaHeader.h rename to lib/libhac/include/nn/hac/NcaHeader.h diff --git a/lib/libnx/include/nx/NcaUtils.h b/lib/libhac/include/nn/hac/NcaUtils.h similarity index 100% rename from lib/libnx/include/nx/NcaUtils.h rename to lib/libhac/include/nn/hac/NcaUtils.h diff --git a/lib/libnx/include/nx/NpdmBinary.h b/lib/libhac/include/nn/hac/NpdmBinary.h similarity index 100% rename from lib/libnx/include/nx/NpdmBinary.h rename to lib/libhac/include/nn/hac/NpdmBinary.h diff --git a/lib/libnx/include/nx/NroHeader.h b/lib/libhac/include/nn/hac/NroHeader.h similarity index 100% rename from lib/libnx/include/nx/NroHeader.h rename to lib/libhac/include/nn/hac/NroHeader.h diff --git a/lib/libnx/include/nx/NsoHeader.h b/lib/libhac/include/nn/hac/NsoHeader.h similarity index 100% rename from lib/libnx/include/nx/NsoHeader.h rename to lib/libhac/include/nn/hac/NsoHeader.h diff --git a/lib/libnx/include/nx/PfsHeader.h b/lib/libhac/include/nn/hac/PfsHeader.h similarity index 100% rename from lib/libnx/include/nx/PfsHeader.h rename to lib/libhac/include/nn/hac/PfsHeader.h diff --git a/lib/libnx/include/nx/ServiceAccessControlBinary.h b/lib/libhac/include/nn/hac/ServiceAccessControlBinary.h similarity index 100% rename from lib/libnx/include/nx/ServiceAccessControlBinary.h rename to lib/libhac/include/nn/hac/ServiceAccessControlBinary.h diff --git a/lib/libnx/include/nx/ServiceAccessControlEntry.h b/lib/libhac/include/nn/hac/ServiceAccessControlEntry.h similarity index 100% rename from lib/libnx/include/nx/ServiceAccessControlEntry.h rename to lib/libhac/include/nn/hac/ServiceAccessControlEntry.h diff --git a/lib/libnx/include/nx/SystemCallEntry.h b/lib/libhac/include/nn/hac/SystemCallEntry.h similarity index 100% rename from lib/libnx/include/nx/SystemCallEntry.h rename to lib/libhac/include/nn/hac/SystemCallEntry.h diff --git a/lib/libnx/include/nx/SystemCallHandler.h b/lib/libhac/include/nn/hac/SystemCallHandler.h similarity index 100% rename from lib/libnx/include/nx/SystemCallHandler.h rename to lib/libhac/include/nn/hac/SystemCallHandler.h diff --git a/lib/libnx/include/nx/ThreadInfoEntry.h b/lib/libhac/include/nn/hac/ThreadInfoEntry.h similarity index 100% rename from lib/libnx/include/nx/ThreadInfoEntry.h rename to lib/libhac/include/nn/hac/ThreadInfoEntry.h diff --git a/lib/libnx/include/nx/ThreadInfoHandler.h b/lib/libhac/include/nn/hac/ThreadInfoHandler.h similarity index 100% rename from lib/libnx/include/nx/ThreadInfoHandler.h rename to lib/libhac/include/nn/hac/ThreadInfoHandler.h diff --git a/lib/libnx/include/nx/XciHeader.h b/lib/libhac/include/nn/hac/XciHeader.h similarity index 100% rename from lib/libnx/include/nx/XciHeader.h rename to lib/libhac/include/nn/hac/XciHeader.h diff --git a/lib/libnx/include/nx/XciUtils.h b/lib/libhac/include/nn/hac/XciUtils.h similarity index 100% rename from lib/libnx/include/nx/XciUtils.h rename to lib/libhac/include/nn/hac/XciUtils.h diff --git a/lib/libnx/include/nx/aci.h b/lib/libhac/include/nn/hac/aci.h similarity index 100% rename from lib/libnx/include/nx/aci.h rename to lib/libhac/include/nn/hac/aci.h diff --git a/lib/libnx/include/nx/cnmt.h b/lib/libhac/include/nn/hac/cnmt.h similarity index 100% rename from lib/libnx/include/nx/cnmt.h rename to lib/libhac/include/nn/hac/cnmt.h diff --git a/lib/libnx/include/nx/elf.h b/lib/libhac/include/nn/hac/elf.h similarity index 100% rename from lib/libnx/include/nx/elf.h rename to lib/libhac/include/nn/hac/elf.h diff --git a/lib/libnx/include/nx/fac.h b/lib/libhac/include/nn/hac/fac.h similarity index 100% rename from lib/libnx/include/nx/fac.h rename to lib/libhac/include/nn/hac/fac.h diff --git a/lib/libnx/include/nx/hierarchicalintegrity.h b/lib/libhac/include/nn/hac/hierarchicalintegrity.h similarity index 100% rename from lib/libnx/include/nx/hierarchicalintegrity.h rename to lib/libhac/include/nn/hac/hierarchicalintegrity.h diff --git a/lib/libnx/include/nx/hierarchicalsha256.h b/lib/libhac/include/nn/hac/hierarchicalsha256.h similarity index 100% rename from lib/libnx/include/nx/hierarchicalsha256.h rename to lib/libhac/include/nn/hac/hierarchicalsha256.h diff --git a/lib/libnx/include/nx/kc.h b/lib/libhac/include/nn/hac/kc.h similarity index 100% rename from lib/libnx/include/nx/kc.h rename to lib/libhac/include/nn/hac/kc.h diff --git a/lib/libnx/include/nx/macro.h b/lib/libhac/include/nn/hac/macro.h similarity index 100% rename from lib/libnx/include/nx/macro.h rename to lib/libhac/include/nn/hac/macro.h diff --git a/lib/libnx/include/nx/nacp.h b/lib/libhac/include/nn/hac/nacp.h similarity index 100% rename from lib/libnx/include/nx/nacp.h rename to lib/libhac/include/nn/hac/nacp.h diff --git a/lib/libnx/include/nx/nca.h b/lib/libhac/include/nn/hac/nca.h similarity index 100% rename from lib/libnx/include/nx/nca.h rename to lib/libhac/include/nn/hac/nca.h diff --git a/lib/libnx/include/nx/npdm.h b/lib/libhac/include/nn/hac/npdm.h similarity index 100% rename from lib/libnx/include/nx/npdm.h rename to lib/libhac/include/nn/hac/npdm.h diff --git a/lib/libnx/include/nx/nro.h b/lib/libhac/include/nn/hac/nro.h similarity index 100% rename from lib/libnx/include/nx/nro.h rename to lib/libhac/include/nn/hac/nro.h diff --git a/lib/libnx/include/nx/nrr.h b/lib/libhac/include/nn/hac/nrr.h similarity index 100% rename from lib/libnx/include/nx/nrr.h rename to lib/libhac/include/nn/hac/nrr.h diff --git a/lib/libnx/include/nx/nso.h b/lib/libhac/include/nn/hac/nso.h similarity index 100% rename from lib/libnx/include/nx/nso.h rename to lib/libhac/include/nn/hac/nso.h diff --git a/lib/libnx/include/nx/pfs.h b/lib/libhac/include/nn/hac/pfs.h similarity index 100% rename from lib/libnx/include/nx/pfs.h rename to lib/libhac/include/nn/hac/pfs.h diff --git a/lib/libnx/include/nx/romfs.h b/lib/libhac/include/nn/hac/romfs.h similarity index 100% rename from lib/libnx/include/nx/romfs.h rename to lib/libhac/include/nn/hac/romfs.h diff --git a/lib/libnx/include/nx/xci.h b/lib/libhac/include/nn/hac/xci.h similarity index 100% rename from lib/libnx/include/nx/xci.h rename to lib/libhac/include/nn/hac/xci.h diff --git a/lib/libnx/nx.vcxproj b/lib/libhac/libhac.vcxproj similarity index 70% rename from lib/libnx/nx.vcxproj rename to lib/libhac/libhac.vcxproj index 9d72230..3ea2410 100644 --- a/lib/libnx/nx.vcxproj +++ b/lib/libhac/libhac.vcxproj @@ -22,61 +22,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -120,9 +120,9 @@ 15.0 {91BA9E79-8242-4F7D-B997-0DFEC95EA22B} - nx + hac 10.0.15063.0 - libnx + libhac @@ -175,7 +175,7 @@ Level3 Disabled true - ..\libfnd\include;..\libcrypto\include;..\libnx\include; + ..\libfnd\include;..\libcrypto\include;..\libhac\include; _MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -184,7 +184,7 @@ Level3 Disabled true - ..\libfnd\include;..\libcrypto\include;..\libnx\include; + ..\libfnd\include;..\libcrypto\include;..\libhac\include; _MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -195,7 +195,7 @@ true true true - ..\libfnd\include;..\libcrypto\include;..\libnx\include; + ..\libfnd\include;..\libcrypto\include;..\libhac\include; _MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -210,7 +210,7 @@ true true true - ..\libfnd\include;..\libcrypto\include;..\libnx\include; + ..\libfnd\include;..\libcrypto\include;..\libhac\include; _MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) diff --git a/lib/libnx/nx.vcxproj.filters b/lib/libhac/libhac.vcxproj.filters similarity index 71% rename from lib/libnx/nx.vcxproj.filters rename to lib/libhac/libhac.vcxproj.filters index 5147ede..3c44384 100644 --- a/lib/libnx/nx.vcxproj.filters +++ b/lib/libhac/libhac.vcxproj.filters @@ -18,169 +18,169 @@ - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files diff --git a/lib/libnx/nx.vcxproj.user b/lib/libhac/libhac.vcxproj.user similarity index 100% rename from lib/libnx/nx.vcxproj.user rename to lib/libhac/libhac.vcxproj.user diff --git a/lib/libnx/makefile b/lib/libhac/makefile similarity index 100% rename from lib/libnx/makefile rename to lib/libhac/makefile diff --git a/lib/libnx/source/AccessControlInfoBinary.cpp b/lib/libhac/source/AccessControlInfoBinary.cpp similarity index 100% rename from lib/libnx/source/AccessControlInfoBinary.cpp rename to lib/libhac/source/AccessControlInfoBinary.cpp diff --git a/lib/libnx/source/AccessControlInfoDescBinary.cpp b/lib/libhac/source/AccessControlInfoDescBinary.cpp similarity index 100% rename from lib/libnx/source/AccessControlInfoDescBinary.cpp rename to lib/libhac/source/AccessControlInfoDescBinary.cpp diff --git a/lib/libnx/source/AesKeygen.cpp b/lib/libhac/source/AesKeygen.cpp similarity index 100% rename from lib/libnx/source/AesKeygen.cpp rename to lib/libhac/source/AesKeygen.cpp diff --git a/lib/libnx/source/ApplicationControlPropertyBinary.cpp b/lib/libhac/source/ApplicationControlPropertyBinary.cpp similarity index 100% rename from lib/libnx/source/ApplicationControlPropertyBinary.cpp rename to lib/libhac/source/ApplicationControlPropertyBinary.cpp diff --git a/lib/libnx/source/ApplicationControlPropertyUtils.cpp b/lib/libhac/source/ApplicationControlPropertyUtils.cpp similarity index 100% rename from lib/libnx/source/ApplicationControlPropertyUtils.cpp rename to lib/libhac/source/ApplicationControlPropertyUtils.cpp diff --git a/lib/libnx/source/ContentMetaBinary.cpp b/lib/libhac/source/ContentMetaBinary.cpp similarity index 100% rename from lib/libnx/source/ContentMetaBinary.cpp rename to lib/libhac/source/ContentMetaBinary.cpp diff --git a/lib/libnx/source/FileSystemAccessControlBinary.cpp b/lib/libhac/source/FileSystemAccessControlBinary.cpp similarity index 100% rename from lib/libnx/source/FileSystemAccessControlBinary.cpp rename to lib/libhac/source/FileSystemAccessControlBinary.cpp diff --git a/lib/libnx/source/HandleTableSizeEntry.cpp b/lib/libhac/source/HandleTableSizeEntry.cpp similarity index 100% rename from lib/libnx/source/HandleTableSizeEntry.cpp rename to lib/libhac/source/HandleTableSizeEntry.cpp diff --git a/lib/libnx/source/HandleTableSizeHandler.cpp b/lib/libhac/source/HandleTableSizeHandler.cpp similarity index 100% rename from lib/libnx/source/HandleTableSizeHandler.cpp rename to lib/libhac/source/HandleTableSizeHandler.cpp diff --git a/lib/libnx/source/HierarchicalIntegrityHeader.cpp b/lib/libhac/source/HierarchicalIntegrityHeader.cpp similarity index 100% rename from lib/libnx/source/HierarchicalIntegrityHeader.cpp rename to lib/libhac/source/HierarchicalIntegrityHeader.cpp diff --git a/lib/libnx/source/HierarchicalSha256Header.cpp b/lib/libhac/source/HierarchicalSha256Header.cpp similarity index 100% rename from lib/libnx/source/HierarchicalSha256Header.cpp rename to lib/libhac/source/HierarchicalSha256Header.cpp diff --git a/lib/libnx/source/InteruptEntry.cpp b/lib/libhac/source/InteruptEntry.cpp similarity index 100% rename from lib/libnx/source/InteruptEntry.cpp rename to lib/libhac/source/InteruptEntry.cpp diff --git a/lib/libnx/source/InteruptHandler.cpp b/lib/libhac/source/InteruptHandler.cpp similarity index 100% rename from lib/libnx/source/InteruptHandler.cpp rename to lib/libhac/source/InteruptHandler.cpp diff --git a/lib/libnx/source/KernelCapabilityBinary.cpp b/lib/libhac/source/KernelCapabilityBinary.cpp similarity index 100% rename from lib/libnx/source/KernelCapabilityBinary.cpp rename to lib/libhac/source/KernelCapabilityBinary.cpp diff --git a/lib/libnx/source/KernelCapabilityEntry.cpp b/lib/libhac/source/KernelCapabilityEntry.cpp similarity index 100% rename from lib/libnx/source/KernelCapabilityEntry.cpp rename to lib/libhac/source/KernelCapabilityEntry.cpp diff --git a/lib/libnx/source/KernelVersionEntry.cpp b/lib/libhac/source/KernelVersionEntry.cpp similarity index 100% rename from lib/libnx/source/KernelVersionEntry.cpp rename to lib/libhac/source/KernelVersionEntry.cpp diff --git a/lib/libnx/source/KernelVersionHandler.cpp b/lib/libhac/source/KernelVersionHandler.cpp similarity index 100% rename from lib/libnx/source/KernelVersionHandler.cpp rename to lib/libhac/source/KernelVersionHandler.cpp diff --git a/lib/libnx/source/MemoryMappingHandler.cpp b/lib/libhac/source/MemoryMappingHandler.cpp similarity index 100% rename from lib/libnx/source/MemoryMappingHandler.cpp rename to lib/libhac/source/MemoryMappingHandler.cpp diff --git a/lib/libnx/source/MemoryPageEntry.cpp b/lib/libhac/source/MemoryPageEntry.cpp similarity index 100% rename from lib/libnx/source/MemoryPageEntry.cpp rename to lib/libhac/source/MemoryPageEntry.cpp diff --git a/lib/libnx/source/MiscFlagsEntry.cpp b/lib/libhac/source/MiscFlagsEntry.cpp similarity index 100% rename from lib/libnx/source/MiscFlagsEntry.cpp rename to lib/libhac/source/MiscFlagsEntry.cpp diff --git a/lib/libnx/source/MiscFlagsHandler.cpp b/lib/libhac/source/MiscFlagsHandler.cpp similarity index 100% rename from lib/libnx/source/MiscFlagsHandler.cpp rename to lib/libhac/source/MiscFlagsHandler.cpp diff --git a/lib/libnx/source/MiscParamsEntry.cpp b/lib/libhac/source/MiscParamsEntry.cpp similarity index 100% rename from lib/libnx/source/MiscParamsEntry.cpp rename to lib/libhac/source/MiscParamsEntry.cpp diff --git a/lib/libnx/source/MiscParamsHandler.cpp b/lib/libhac/source/MiscParamsHandler.cpp similarity index 100% rename from lib/libnx/source/MiscParamsHandler.cpp rename to lib/libhac/source/MiscParamsHandler.cpp diff --git a/lib/libnx/source/NcaHeader.cpp b/lib/libhac/source/NcaHeader.cpp similarity index 100% rename from lib/libnx/source/NcaHeader.cpp rename to lib/libhac/source/NcaHeader.cpp diff --git a/lib/libnx/source/NcaUtils.cpp b/lib/libhac/source/NcaUtils.cpp similarity index 100% rename from lib/libnx/source/NcaUtils.cpp rename to lib/libhac/source/NcaUtils.cpp diff --git a/lib/libnx/source/NpdmBinary.cpp b/lib/libhac/source/NpdmBinary.cpp similarity index 100% rename from lib/libnx/source/NpdmBinary.cpp rename to lib/libhac/source/NpdmBinary.cpp diff --git a/lib/libnx/source/NroHeader.cpp b/lib/libhac/source/NroHeader.cpp similarity index 100% rename from lib/libnx/source/NroHeader.cpp rename to lib/libhac/source/NroHeader.cpp diff --git a/lib/libnx/source/NsoHeader.cpp b/lib/libhac/source/NsoHeader.cpp similarity index 100% rename from lib/libnx/source/NsoHeader.cpp rename to lib/libhac/source/NsoHeader.cpp diff --git a/lib/libnx/source/PfsHeader.cpp b/lib/libhac/source/PfsHeader.cpp similarity index 100% rename from lib/libnx/source/PfsHeader.cpp rename to lib/libhac/source/PfsHeader.cpp diff --git a/lib/libnx/source/ServiceAccessControlBinary.cpp b/lib/libhac/source/ServiceAccessControlBinary.cpp similarity index 100% rename from lib/libnx/source/ServiceAccessControlBinary.cpp rename to lib/libhac/source/ServiceAccessControlBinary.cpp diff --git a/lib/libnx/source/ServiceAccessControlEntry.cpp b/lib/libhac/source/ServiceAccessControlEntry.cpp similarity index 100% rename from lib/libnx/source/ServiceAccessControlEntry.cpp rename to lib/libhac/source/ServiceAccessControlEntry.cpp diff --git a/lib/libnx/source/SystemCallEntry.cpp b/lib/libhac/source/SystemCallEntry.cpp similarity index 100% rename from lib/libnx/source/SystemCallEntry.cpp rename to lib/libhac/source/SystemCallEntry.cpp diff --git a/lib/libnx/source/SystemCallHandler.cpp b/lib/libhac/source/SystemCallHandler.cpp similarity index 100% rename from lib/libnx/source/SystemCallHandler.cpp rename to lib/libhac/source/SystemCallHandler.cpp diff --git a/lib/libnx/source/ThreadInfoEntry.cpp b/lib/libhac/source/ThreadInfoEntry.cpp similarity index 100% rename from lib/libnx/source/ThreadInfoEntry.cpp rename to lib/libhac/source/ThreadInfoEntry.cpp diff --git a/lib/libnx/source/ThreadInfoHandler.cpp b/lib/libhac/source/ThreadInfoHandler.cpp similarity index 100% rename from lib/libnx/source/ThreadInfoHandler.cpp rename to lib/libhac/source/ThreadInfoHandler.cpp diff --git a/lib/libnx/source/XciHeader.cpp b/lib/libhac/source/XciHeader.cpp similarity index 100% rename from lib/libnx/source/XciHeader.cpp rename to lib/libhac/source/XciHeader.cpp diff --git a/lib/libnx/source/XciUtils.cpp b/lib/libhac/source/XciUtils.cpp similarity index 100% rename from lib/libnx/source/XciUtils.cpp rename to lib/libhac/source/XciUtils.cpp diff --git a/lib/libcompress/source/lz4/lz4.h b/lib/liblz4/include/lz4.h similarity index 100% rename from lib/libcompress/source/lz4/lz4.h rename to lib/liblz4/include/lz4.h diff --git a/lib/liblz4/liblz4.vcxproj b/lib/liblz4/liblz4.vcxproj new file mode 100644 index 0000000..fc5c241 --- /dev/null +++ b/lib/liblz4/liblz4.vcxproj @@ -0,0 +1,132 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {AB0C3362-63AB-480A-ADBC-2EF7D859778B} + 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 + ..\liblz4\include; + + + + + Level3 + Disabled + true + true + ..\liblz4\include; + + + + + Level3 + MaxSpeed + true + true + true + true + ..\liblz4\include; + + + true + true + + + + + Level3 + MaxSpeed + true + true + true + true + ..\liblz4\include; + + + true + true + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/liblz4/liblz4.vcxproj.filters b/lib/liblz4/liblz4.vcxproj.filters new file mode 100644 index 0000000..054e80b --- /dev/null +++ b/lib/liblz4/liblz4.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {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 + + + + + Source Files + + + + + Source Files + + + + + + \ No newline at end of file diff --git a/lib/liblz4/liblz4.vcxproj.user b/lib/liblz4/liblz4.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/lib/liblz4/liblz4.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/lib/liblz4/makefile b/lib/liblz4/makefile new file mode 100644 index 0000000..6fac1e6 --- /dev/null +++ b/lib/liblz4/makefile @@ -0,0 +1,43 @@ +# Sources +SRC_DIR = source +OBJS = $(foreach dir,$(SRC_DIR), $(foreach dir,$(SRC_DIR),$(subst .c,.o,$(wildcard $(dir)/*.c))) + +# External dependencies +INCS = -I"include" + + +# Compiler Settings +CFLAGS = -std=c11 $(INCS) -Wall -Wno-unused-value +ARFLAGS = cr -o +ifeq ($(OS),Windows_NT) + # Windows Only Flags/Libs + CC = x86_64-w64-mingw32-gcc + CXX = x86_64-w64-mingw32-g++ + CFLAGS += -Wno-unused-but-set-variable + CXXFLAGS += -Wno-unused-but-set-variable +else + UNAME = $(shell uname -s) + ifeq ($(UNAME), Darwin) + # MacOS Only Flags/Libs + CFLAGS += -arch x86_64 -Wno-unused-private-field + CXXFLAGS += -arch x86_64 -Wno-unused-private-field + ARFLAGS = rc + else + # *nix Only Flags/Libs + CFLAGS += -Wno-unused-but-set-variable + CXXFLAGS += -Wno-unused-but-set-variable + endif +endif + +# Output +OUTPUT = $(shell basename $(CURDIR)).a + +main: build + +rebuild: clean build + +build: $(OBJS) + ar cr -o $(OUTPUT) $(OBJS) + +clean: + rm -rf $(OUTPUT) $(OBJS) \ No newline at end of file diff --git a/lib/libcompress/source/lz4/lz4.c b/lib/liblz4/source/lz4.c similarity index 100% rename from lib/libcompress/source/lz4/lz4.c rename to lib/liblz4/source/lz4.c diff --git a/lib/libpki/include/pki/CertificateBody.h b/lib/libpki/include/nn/pki/CertificateBody.h similarity index 100% rename from lib/libpki/include/pki/CertificateBody.h rename to lib/libpki/include/nn/pki/CertificateBody.h diff --git a/lib/libpki/include/pki/SignUtils.h b/lib/libpki/include/nn/pki/SignUtils.h similarity index 100% rename from lib/libpki/include/pki/SignUtils.h rename to lib/libpki/include/nn/pki/SignUtils.h diff --git a/lib/libpki/include/pki/SignatureBlock.h b/lib/libpki/include/nn/pki/SignatureBlock.h similarity index 100% rename from lib/libpki/include/pki/SignatureBlock.h rename to lib/libpki/include/nn/pki/SignatureBlock.h diff --git a/lib/libpki/include/pki/SignedData.h b/lib/libpki/include/nn/pki/SignedData.h similarity index 100% rename from lib/libpki/include/pki/SignedData.h rename to lib/libpki/include/nn/pki/SignedData.h diff --git a/lib/libpki/include/pki/cert.h b/lib/libpki/include/nn/pki/cert.h similarity index 100% rename from lib/libpki/include/pki/cert.h rename to lib/libpki/include/nn/pki/cert.h diff --git a/lib/libpki/include/pki/sign.h b/lib/libpki/include/nn/pki/sign.h similarity index 100% rename from lib/libpki/include/pki/sign.h rename to lib/libpki/include/nn/pki/sign.h diff --git a/lib/libpki/libpki.vcxproj b/lib/libpki/libpki.vcxproj index 7347aca..ef497f5 100644 --- a/lib/libpki/libpki.vcxproj +++ b/lib/libpki/libpki.vcxproj @@ -21,7 +21,6 @@ 15.0 {B9113734-6E84-44FF-8CF7-58199AA815C5} - libpki 10.0.16299.0 @@ -123,12 +122,12 @@ - - - - - - + + + + + + diff --git a/lib/libpki/libpki.vcxproj.filters b/lib/libpki/libpki.vcxproj.filters index ab6f249..2396670 100644 --- a/lib/libpki/libpki.vcxproj.filters +++ b/lib/libpki/libpki.vcxproj.filters @@ -15,22 +15,22 @@ - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files diff --git a/lib/libcrypto/source/libpolarssl/include/polarssl/aes.h b/lib/libpolarssl/include/polarssl/aes.h similarity index 100% rename from lib/libcrypto/source/libpolarssl/include/polarssl/aes.h rename to lib/libpolarssl/include/polarssl/aes.h diff --git a/lib/libcrypto/source/libpolarssl/include/polarssl/base64.h b/lib/libpolarssl/include/polarssl/base64.h similarity index 100% rename from lib/libcrypto/source/libpolarssl/include/polarssl/base64.h rename to lib/libpolarssl/include/polarssl/base64.h diff --git a/lib/libcrypto/source/libpolarssl/include/polarssl/bignum.h b/lib/libpolarssl/include/polarssl/bignum.h similarity index 100% rename from lib/libcrypto/source/libpolarssl/include/polarssl/bignum.h rename to lib/libpolarssl/include/polarssl/bignum.h diff --git a/lib/libcrypto/source/libpolarssl/include/polarssl/bn_mul.h b/lib/libpolarssl/include/polarssl/bn_mul.h similarity index 100% rename from lib/libcrypto/source/libpolarssl/include/polarssl/bn_mul.h rename to lib/libpolarssl/include/polarssl/bn_mul.h diff --git a/lib/libcrypto/source/libpolarssl/include/polarssl/config.h b/lib/libpolarssl/include/polarssl/config.h similarity index 100% rename from lib/libcrypto/source/libpolarssl/include/polarssl/config.h rename to lib/libpolarssl/include/polarssl/config.h diff --git a/lib/libcrypto/source/libpolarssl/include/polarssl/md.h b/lib/libpolarssl/include/polarssl/md.h similarity index 100% rename from lib/libcrypto/source/libpolarssl/include/polarssl/md.h rename to lib/libpolarssl/include/polarssl/md.h diff --git a/lib/libcrypto/source/libpolarssl/include/polarssl/md_wrap.h b/lib/libpolarssl/include/polarssl/md_wrap.h similarity index 100% rename from lib/libcrypto/source/libpolarssl/include/polarssl/md_wrap.h rename to lib/libpolarssl/include/polarssl/md_wrap.h diff --git a/lib/libcrypto/source/libpolarssl/include/polarssl/rsa.h b/lib/libpolarssl/include/polarssl/rsa.h similarity index 100% rename from lib/libcrypto/source/libpolarssl/include/polarssl/rsa.h rename to lib/libpolarssl/include/polarssl/rsa.h diff --git a/lib/libcrypto/source/libpolarssl/include/polarssl/sha1.h b/lib/libpolarssl/include/polarssl/sha1.h similarity index 100% rename from lib/libcrypto/source/libpolarssl/include/polarssl/sha1.h rename to lib/libpolarssl/include/polarssl/sha1.h diff --git a/lib/libcrypto/source/libpolarssl/include/polarssl/sha2.h b/lib/libpolarssl/include/polarssl/sha2.h similarity index 100% rename from lib/libcrypto/source/libpolarssl/include/polarssl/sha2.h rename to lib/libpolarssl/include/polarssl/sha2.h diff --git a/lib/libpolarssl/libpolarssl.vcxproj b/lib/libpolarssl/libpolarssl.vcxproj new file mode 100644 index 0000000..18336ba --- /dev/null +++ b/lib/libpolarssl/libpolarssl.vcxproj @@ -0,0 +1,148 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {394EFC16-BD3A-4538-B33D-7BA1EDB8DAC1} + 10.0.15063.0 + + + + StaticLibrary + true + v141 + MultiByte + + + StaticLibrary + false + v141 + true + MultiByte + + + StaticLibrary + true + v141 + MultiByte + + + StaticLibrary + false + v141 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + + + Level3 + Disabled + true + ..\libpolarssl\include; + _MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + + + Level3 + Disabled + true + ..\libpolarssl\include; + _MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + + + Level3 + MaxSpeed + true + true + true + ..\libpolarssl\include; + _MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + true + true + + + + + Level3 + MaxSpeed + true + true + true + ..\libpolarssl\include; + _MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/libpolarssl/libpolarssl.vcxproj.filters b/lib/libpolarssl/libpolarssl.vcxproj.filters new file mode 100644 index 0000000..1b4bf96 --- /dev/null +++ b/lib/libpolarssl/libpolarssl.vcxproj.filters @@ -0,0 +1,78 @@ + + + + + {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;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 + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + 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/lib/libpolarssl/libpolarssl.vcxproj.user b/lib/libpolarssl/libpolarssl.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/lib/libpolarssl/libpolarssl.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/lib/libpolarssl/makefile b/lib/libpolarssl/makefile new file mode 100644 index 0000000..6fac1e6 --- /dev/null +++ b/lib/libpolarssl/makefile @@ -0,0 +1,43 @@ +# Sources +SRC_DIR = source +OBJS = $(foreach dir,$(SRC_DIR), $(foreach dir,$(SRC_DIR),$(subst .c,.o,$(wildcard $(dir)/*.c))) + +# External dependencies +INCS = -I"include" + + +# Compiler Settings +CFLAGS = -std=c11 $(INCS) -Wall -Wno-unused-value +ARFLAGS = cr -o +ifeq ($(OS),Windows_NT) + # Windows Only Flags/Libs + CC = x86_64-w64-mingw32-gcc + CXX = x86_64-w64-mingw32-g++ + CFLAGS += -Wno-unused-but-set-variable + CXXFLAGS += -Wno-unused-but-set-variable +else + UNAME = $(shell uname -s) + ifeq ($(UNAME), Darwin) + # MacOS Only Flags/Libs + CFLAGS += -arch x86_64 -Wno-unused-private-field + CXXFLAGS += -arch x86_64 -Wno-unused-private-field + ARFLAGS = rc + else + # *nix Only Flags/Libs + CFLAGS += -Wno-unused-but-set-variable + CXXFLAGS += -Wno-unused-but-set-variable + endif +endif + +# Output +OUTPUT = $(shell basename $(CURDIR)).a + +main: build + +rebuild: clean build + +build: $(OBJS) + ar cr -o $(OUTPUT) $(OBJS) + +clean: + rm -rf $(OUTPUT) $(OBJS) \ No newline at end of file diff --git a/lib/libcrypto/source/libpolarssl/source/aes.c b/lib/libpolarssl/source/aes.c similarity index 100% rename from lib/libcrypto/source/libpolarssl/source/aes.c rename to lib/libpolarssl/source/aes.c diff --git a/lib/libcrypto/source/libpolarssl/source/base64.c b/lib/libpolarssl/source/base64.c similarity index 100% rename from lib/libcrypto/source/libpolarssl/source/base64.c rename to lib/libpolarssl/source/base64.c diff --git a/lib/libcrypto/source/libpolarssl/source/bignum.c b/lib/libpolarssl/source/bignum.c similarity index 100% rename from lib/libcrypto/source/libpolarssl/source/bignum.c rename to lib/libpolarssl/source/bignum.c diff --git a/lib/libcrypto/source/libpolarssl/source/md.c b/lib/libpolarssl/source/md.c similarity index 100% rename from lib/libcrypto/source/libpolarssl/source/md.c rename to lib/libpolarssl/source/md.c diff --git a/lib/libcrypto/source/libpolarssl/source/md_wrap.c b/lib/libpolarssl/source/md_wrap.c similarity index 100% rename from lib/libcrypto/source/libpolarssl/source/md_wrap.c rename to lib/libpolarssl/source/md_wrap.c diff --git a/lib/libcrypto/source/libpolarssl/source/rsa.c b/lib/libpolarssl/source/rsa.c similarity index 100% rename from lib/libcrypto/source/libpolarssl/source/rsa.c rename to lib/libpolarssl/source/rsa.c diff --git a/lib/libcrypto/source/libpolarssl/source/sha1.c b/lib/libpolarssl/source/sha1.c similarity index 100% rename from lib/libcrypto/source/libpolarssl/source/sha1.c rename to lib/libpolarssl/source/sha1.c diff --git a/lib/libcrypto/source/libpolarssl/source/sha2.c b/lib/libpolarssl/source/sha2.c similarity index 100% rename from lib/libcrypto/source/libpolarssl/source/sha2.c rename to lib/libpolarssl/source/sha2.c diff --git a/programs/nstool/nstool.vcxproj b/programs/nstool/nstool.vcxproj index 848e899..d9e7aed 100644 --- a/programs/nstool/nstool.vcxproj +++ b/programs/nstool/nstool.vcxproj @@ -151,22 +151,28 @@ + + {394EFC16-BD3A-4538-B33D-7BA1EDB8DAC1} + + + {AB0C3362-63AB-480A-ADBC-2EF7D859778B} + {cf01b5b7-730a-447f-9bb2-5eda9b082177} - + {6adbb60d-dba0-411d-bd2d-a355ef8e0fe1} - + {7be99936-0d40-410d-944b-4513c2eff8dc} - + {4d27edb9-5110-44fe-8ce2-d46c5ad3c55b} - + {738cb4fc-cd9e-4b81-a04b-deadbfa71c63} - + {91ba9e79-8242-4f7d-b997-0dfec95ea22b}