Moved the SHA1 submodule to src/libTabCon/sha1

StevenSYS · StevenSYS · commit eebff8ffef07 · 2025-10-02T19:19:42.000Z
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "src/submodules/sha1"]
-	path = src/submodules/sha1
-	url = https://github.com/clibs/sha1
+[submodule "src/libTabCon/sha1"]
+	path = src/libTabCon/sha1
+	url = https://github.com/clibs/sha1
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,7 +44,6 @@ include_directories(
 	"src/libTabCon"
 )
 
-add_subdirectory(src/submodules)
 add_subdirectory(src/libTabCon)
 
 if(NOT BUILD_ONLY_LIBRARY)
diff --git a/src/libTabCon/CMakeLists.txt b/src/libTabCon/CMakeLists.txt
@@ -1,3 +1,4 @@
+add_library(SHA1 "sha1/sha1.c")
 add_library(TabCon "tabCon.c")
 
 target_link_libraries(TabCon SHA1)
diff --git a/src/libTabCon/sha1 b/src/libTabCon/sha1
diff --git a/src/libTabCon/tabCon.c b/src/libTabCon/tabCon.c
@@ -24,8 +24,8 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <sha1/sha1.h>
 
+#include "sha1/sha1.h"
 #include "tabCon.h"
 
 void tabCon_generate(
@@ -60,6 +60,7 @@ void tabCon_generate(
 		}
 	}
 	
+	/* Set image color */
 	for (unsigned char i = TABCON_PIXELS; i < TABCON_PIXELS + 3; i++) {
 		tabCon->color[i - TABCON_PIXELS] = tabCon->hash[i];
 	}
diff --git a/src/submodules/CMakeLists.txt b/src/submodules/CMakeLists.txt

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ include_directories(`
`44`	`44`	`"src/libTabCon"`
`45`	`45`	`)`
`46`	`46`
`47`		`-add_subdirectory(src/submodules)`
`48`	`47`	`add_subdirectory(src/libTabCon)`
`49`	`48`
`50`	`49`	`if(NOT BUILD_ONLY_LIBRARY)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+add_library(SHA1 "sha1/sha1.c")`
`1`	`2`	`add_library(TabCon "tabCon.c")`
`2`	`3`
`3`	`4`	`target_link_libraries(TabCon SHA1)`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@`
`24`	`24`
`25`	`25`	`#include <stdio.h>`
`26`	`26`	`#include <string.h>`
`27`		`-#include <sha1/sha1.h>`
`28`	`27`
	`28`	`+#include "sha1/sha1.h"`
`29`	`29`	`#include "tabCon.h"`
`30`	`30`
`31`	`31`	`void tabCon_generate(`
`@@ -60,6 +60,7 @@ void tabCon_generate(`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
	`63`	`+ /* Set image color */`
`63`	`64`	`for (unsigned char i = TABCON_PIXELS; i < TABCON_PIXELS + 3; i++) {`
`64`	`65`	`tabCon->color[i - TABCON_PIXELS] = tabCon->hash[i];`
`65`	`66`	`}`