Fix build

cielavenir · Feb 9, 2025 · baf691b · baf691b
1 parent ede5242
commit baf691b
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 76 deletions.
diff --git a/CPP/7zip/7zip_gcc_additional.mak b/CPP/7zip/7zip_gcc_additional.mak
@@ -38,16 +38,10 @@ $O/libzstd.a: ../../../../Codecs/zstd/lib/zstd.h
 	cp zstd_build/lib/libzstd.a $O
 
 # Compile zstd method and Handler
-$O/ZstdDecoder.o: ../../Compress/ZstdDecoder.cpp
-	$(CXX) $(CXXFLAGS) $<
 $O/ZstdEncoder.o: ../../Compress/ZstdEncoder.cpp
 	$(CXX) $(CXXFLAGS) $<
-$O/ZstdRegister.o: ../../Compress/ZstdRegister.cpp
-	$(CXX) $(CXXFLAGS) $<
 $O/ZstdZipRegister.o: ../../Compress/ZstdZipRegister.cpp
 	$(CXX) $(CXXFLAGS) $<
-$O/ZstdHandler.o: ../../Archive/ZstdHandler.cpp
-	$(CXX) $(CXXFLAGS) $<
 
 # Build lz4 lib static
 $O/liblz4.a: ../../../../Codecs/lz4/lib/lz4.h
@@ -202,10 +196,6 @@ $O/md2.o: ../../../../Codecs/hashes/md2.c
 	$(CC) $(CFLAGS) $<
 $O/md4.o: ../../../../Codecs/hashes/md4.c
 	$(CC) $(CFLAGS) $<
-$O/md5.o: ../../../../Codecs/hashes/md5.c
-	$(CC) $(CFLAGS) $<
-$O/sha512.o: ../../../../Codecs/hashes/sha512.c
-	$(CC) $(CFLAGS) $<
 $O/blake3.o: ../../../../Codecs/hashes/blake3.c
 	$(CC) $(CFLAGS) $<
 
@@ -214,12 +204,6 @@ $O/Md2Reg.o: ../../../Common/Md2Reg.cpp
 	$(CXX) $(CXXFLAGS) $<
 $O/Md4Reg.o: ../../../Common/Md4Reg.cpp
 	$(CXX) $(CXXFLAGS) $<
-$O/Md5Reg.o: ../../../Common/Md5Reg.cpp
-	$(CXX) $(CXXFLAGS) $<
-$O/Sha384Reg.o: ../../../Common/Sha384Reg.cpp
-	$(CXX) $(CXXFLAGS) $<
-$O/Sha512Reg.o: ../../../Common/Sha512Reg.cpp
-	$(CXX) $(CXXFLAGS) $<
 $O/XXH32Reg.o: ../../../Common/XXH32Reg.cpp
 	$(CXX) $(CXXFLAGS) $<
 $O/Blake3Reg.o: ../../../Common/Blake3Reg.cpp

diff --git a/CPP/7zip/Bundles/Format7zF/Arc_gcc.mak b/CPP/7zip/Bundles/Format7zF/Arc_gcc.mak
@@ -371,14 +371,11 @@ endif
 HASHES_OBJS = \
   $O/Md2Reg.o \
   $O/Md4Reg.o \
-  $O/Md5Reg.o \
   $O/Sha384Reg.o \
-  $O/Sha512Reg.o \
   $O/XXH32Reg.o \
   $O/Blake3Reg.o \
   $O/md2.o \
   $O/md4.o \
-  $O/md5.o \
   $O/sha512.o \
   $O/blake3.o \
 

diff --git a/CPP/7zip/Compress/Md5/makefile.gcc b/CPP/7zip/Compress/Md5/makefile.gcc
@@ -33,11 +33,12 @@ COMPRESS_OBJS_2 = \
   $O/Md5Reg.o \
   $O/md2.o \
   $O/md4.o \
-  $O/md5.o \
+  $O/Md5.o \
 
 OBJS = \
   $(COMPRESS_OBJS_2) \
   $(SYS_OBJS) \
   $(COMMON_OBJS) \
+  $O/Alloc.o \
 
 include ../../7zip_gcc.mak
diff --git a/CPP/7zip/Compress/Sha512/makefile.gcc b/CPP/7zip/Compress/Sha512/makefile.gcc
@@ -28,13 +28,13 @@ LOCAL_FLAGS = \
 COMPRESS_OBJS_2 = \
   $O/CodecExports.o \
   $O/DllExportsCompress.o \
-  $O/Sha384Reg.o \
   $O/Sha512Reg.o \
-  $O/sha512.o \
+  $O/Sha512.o \
 
 OBJS = \
   $(COMPRESS_OBJS_2) \
   $(SYS_OBJS) \
   $(COMMON_OBJS) \
+  $O/Alloc.o \
 
 include ../../7zip_gcc.mak
diff --git a/CPP/Common/Sha384Reg.cpp b/CPP/Common/Sha384Reg.cpp